Merge branch 'v2' into 961-hotkeys-get-stuck

2025-10-29 16:56:34 +00:00 · 2024-12-11 14:38:38 +01:00
parent a6e28e9064 da2152f0e3
commit e9896963ca
1450 changed files with 161303 additions and 159699 deletions
--- a/scripts/batch/build.bat
+++ b/scripts/batch/build.bat
@@ -7,21 +7,9 @@ cd ..

 cd frontend

-cd website
-call npm install
-call npm run emit-declarations
-call npm run build-release
-
-cd plugins\controltips
+cd react
 call npm install
 call npm run build-release
-cd ..\..
-
-cd plugins\databasemanager
-call npm install
-call npm run build-release
-cd ..\..
-
 cd ..

 cd server
--- a/scripts/lua/backend/OlympusCommand.lua
+++ b/scripts/lua/backend/OlympusCommand.lua
@@ -381,25 +381,50 @@ function Olympus.move(groupName, lat, lng, altitude, altitudeType, speed, speedT
 			end
 			Olympus.debug("Olympus.move executed successfully on Helicopter", 2)
 		elseif category == "GroundUnit" then
-			local startPoint = mist.getLeadPos(group)
 			local endPoint = coord.LLtoLO(lat, lng, 0) 
-			local bearing = math.atan2(endPoint.z - startPoint.z, endPoint.x - startPoint.x)
-
-			vars = {
-				group = group, 
-				point = endPoint,
-				heading = bearing,
-				speed = speed
-			}

+			local action = "Off Road"
+			local disableRoads = true
 			if taskOptions and taskOptions['id'] == 'FollowRoads' and taskOptions['value'] == true then
-				vars["disableRoads"] = false
-			else
-				vars["form"] = "Off Road"
-				vars["disableRoads"] = true
+				action = "On Road"
+				disableRoads = false
+			end
+			
+			missionTask = { 
+				id = 'Mission', 
+				params = { 
+					route = { 
+						points = { 
+							[1] = { 
+								type = "Turning Point",
+								action = action,
+								disableRoads = disableRoads,
+								x = endPoint.x, 
+								y = endPoint.z, 
+								speed = speed, 
+								speed_locked = false, 
+								ETA_locked = false, 
+								name = 'Mission1', 
+							},
+							[2] = { 
+								type = "Turning Point",
+								action = action,
+								disableRoads = disableRoads,
+								x = endPoint.x, 
+								y = endPoint.z, 
+								speed = speed, 
+								speed_locked = false, 
+								ETA_locked = false, 
+								name = 'Mission1', 
+							}, 
+						} 
+					}, 
+				} 
+			} 
+			local groupCon = group:getController()
+			if groupCon then
+				groupCon:setTask(missionTask)
 			end
-
-			mist.groupToRandomPoint(vars)
 			Olympus.debug("Olympus.move executed successfully on GroundUnit", 2)
 		elseif category == "NavyUnit" then
 			local startPoint = mist.getLeadPos(group)
--- a/scripts/python/addLoadouts.py
+++ b/scripts/python/addLoadouts.py
@@ -192,7 +192,7 @@ if len(sys.argv) > 1:
                }
                database[unit_name]["loadouts"].append(new_payload)
        except Exception as e:
-            print(f"Could not find data for unitof type {unit_name}: {e}, skipping...")
+            print(f"Could not find data for unit of type {unit_name}: {e}, skipping...")

    # Dump everything in the database
    with  open(filename, "w", encoding='utf8') as f:
--- a/scripts/python/addMissingUnits.py
+++ b/scripts/python/addMissingUnits.py
@@ -40,7 +40,8 @@ if len(sys.argv) > 1:
                "shortLabel": unit.livery_name if hasattr(unit, "livery_name") else unit.name,
                "type": unit.__qualname__.split(".")[0],
                "enabled": False,
-                "liveries": {}
+                "liveries": {},
+                "category": sys.argv[1] 
            }
            print("Added missing unit " + unit.id)

--- a/scripts/python/map_generator/.gitignore
+++ b/scripts/python/map_generator/.gitignore
@@ -1,3 +1,3 @@
 .venv
 tiles
-screenshots
+screenshots
--- a/scripts/python/payloadRoles.json
+++ b/scripts/python/payloadRoles.json
--- a/scripts/unitPayloads.lua
+++ b/scripts/unitPayloads.lua
@@ -3468,16 +3468,16 @@ Olympus.unitPayloads = {["A-10A"]={["MK-84*2 , LAU-68*2 , AGM-65K*2"]={[1] = {["
 [2] = {["CLSID"]="<CLEAN>"},
 [10] = {["CLSID"]="<CLEAN>"},
 [12] = {["CLSID"]="<CLEAN>"}},
- ["GUIDED: GBU-24*4, Aim-7E2*3, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fletcher Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{GBU-24}"},
+ ["GUIDED: GBU-24*4, Aim-7E2*3, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fletcher Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [9] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [8] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [7] = {["CLSID"]="{F4_SARGENT_TANK_600_GAL}"},
 [6] = {["CLSID"]="{HB_PAVE_SPIKE_FAST_ON_ADAPTER_IN_AERO7}"},
 [5] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
- [1] = {["CLSID"]="{GBU-24}"},
+ [1] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [14] = {["CLSID"]="{HB_ALE_40_30_60}"},
- [11] = {["CLSID"]="{GBU-24}"},
- [3] = {["CLSID"]="{GBU-24}"},
+ [11] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
+ [3] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [2] = {["CLSID"]="<CLEAN>"},
 [4] = {["CLSID"]="<CLEAN>"},
 [10] = {["CLSID"]="<CLEAN>"},
@@ -3608,13 +3608,13 @@ Olympus.unitPayloads = {["A-10A"]={["MK-84*2 , LAU-68*2 , AGM-65K*2"]={[1] = {["
 [13] = {["CLSID"]="{F4_SARGENT_TANK_370_GAL_R}"},
 [1] = {["CLSID"]="{F4_SARGENT_TANK_370_GAL}"},
 [14] = {["CLSID"]="{HB_ALE_40_30_60}"}},
- ["ATGM + GUIDED: AGM-62 Walleye I*2, GBU-24*2, Aim-7E2*3, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fletcher Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{GBU-24}"},
+ ["ATGM + GUIDED: AGM-62 Walleye I*2, GBU-24*2, Aim-7E2*3, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fletcher Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [9] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [8] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [7] = {["CLSID"]="{F4_SARGENT_TANK_600_GAL}"},
 [6] = {["CLSID"]="{HB_PAVE_SPIKE_FAST_ON_ADAPTER_IN_AERO7}"},
 [5] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
- [1] = {["CLSID"]="{GBU-24}"},
+ [1] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [11] = {["CLSID"]="{AGM_62_I}"},
 [3] = {["CLSID"]="{AGM_62_I}"},
 [14] = {["CLSID"]="{HB_ALE_40_30_60}"},
@@ -3774,13 +3774,13 @@ Olympus.unitPayloads = {["A-10A"]={["MK-84*2 , LAU-68*2 , AGM-65K*2"]={[1] = {["
 [13] = {["CLSID"]="{F4_SARGENT_TANK_370_GAL_R}"},
 [1] = {["CLSID"]="{F4_SARGENT_TANK_370_GAL}"},
 [14] = {["CLSID"]="{HB_ALE_40_30_60}"}},
- ["ATGM + GUIDED: AGM-62 Walleye II*2, GBU-24*2, Aim-7E2*3, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fletcher Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{GBU-24}"},
+ ["ATGM + GUIDED: AGM-62 Walleye II*2, GBU-24*2, Aim-7E2*3, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fletcher Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [9] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [8] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [7] = {["CLSID"]="{F4_SARGENT_TANK_600_GAL}"},
 [6] = {["CLSID"]="{HB_PAVE_SPIKE_FAST_ON_ADAPTER_IN_AERO7}"},
 [5] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
- [1] = {["CLSID"]="{GBU-24}"},
+ [1] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [11] = {["CLSID"]="{C40A1E3A-DD05-40D9-85A4-217729E37FAE}"},
 [14] = {["CLSID"]="{HB_ALE_40_30_60}"},
 [12] = {["CLSID"]="<CLEAN>"},
@@ -4150,13 +4150,13 @@ Olympus.unitPayloads = {["A-10A"]={["MK-84*2 , LAU-68*2 , AGM-65K*2"]={[1] = {["
 [4] = {["CLSID"]="{AIM-9L}"},
 [2] = {["CLSID"]="{AIM-9L}"},
 [14] = {["CLSID"]="{HB_ALE_40_30_60}"}},
- ["GUIDED: GBU-24*2, Aim-7E2*3, Aim-9L*4, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fletcher Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{GBU-24}"},
+ ["GUIDED: GBU-24*2, Aim-7E2*3, Aim-9L*4, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fletcher Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [9] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [8] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [7] = {["CLSID"]="{F4_SARGENT_TANK_600_GAL}"},
 [6] = {["CLSID"]="{HB_PAVE_SPIKE_FAST_ON_ADAPTER_IN_AERO7}"},
 [5] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
- [1] = {["CLSID"]="{GBU-24}"},
+ [1] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [14] = {["CLSID"]="{HB_ALE_40_30_60}"},
 [12] = {["CLSID"]="{AIM-9L}"},
 [10] = {["CLSID"]="{AIM-9L}"},
@@ -4472,13 +4472,13 @@ Olympus.unitPayloads = {["A-10A"]={["MK-84*2 , LAU-68*2 , AGM-65K*2"]={[1] = {["
 [13] = {["CLSID"]="{F4_SARGENT_TANK_370_GAL_R}"},
 [1] = {["CLSID"]="{F4_SARGENT_TANK_370_GAL}"},
 [14] = {["CLSID"]="{HB_ALE_40_30_60}"}},
- ["GUIDED: GBU-24*2, GBU-12*4, Aim-7E2*3, Aim-9L*4, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fletcher Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{GBU-24}"},
+ ["GUIDED: GBU-24*2, GBU-12*4, Aim-7E2*3, Aim-9L*4, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fletcher Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [9] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [8] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [7] = {["CLSID"]="{F4_SARGENT_TANK_600_GAL}"},
 [6] = {["CLSID"]="{HB_PAVE_SPIKE_FAST_ON_ADAPTER_IN_AERO7}"},
 [5] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
- [1] = {["CLSID"]="{GBU-24}"},
+ [1] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [14] = {["CLSID"]="{HB_ALE_40_30_60}"},
 [11] = {["CLSID"]="{HB_F4E_GBU-12_2x_SWA}"},
 [3] = {["CLSID"]="{HB_F4E_GBU-12_2x_SWA}"},
@@ -4577,13 +4577,13 @@ Olympus.unitPayloads = {["A-10A"]={["MK-84*2 , LAU-68*2 , AGM-65K*2"]={[1] = {["
 [14] = {["CLSID"]="{HB_ALE_40_30_60}"},
 [13] = {["CLSID"]="<CLEAN>"},
 [1] = {["CLSID"]="<CLEAN>"}},
- ["ATGM + GUIDED: AGM-65B*2, GBU-24*2, Aim-7E2*3, AIM-9L*4, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fletcher Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{GBU-24}"},
+ ["ATGM + GUIDED: AGM-65B*2, GBU-24*2, Aim-7E2*3, AIM-9L*4, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fletcher Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [9] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [8] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [7] = {["CLSID"]="{F4_SARGENT_TANK_600_GAL}"},
 [6] = {["CLSID"]="{HB_PAVE_SPIKE_FAST_ON_ADAPTER_IN_AERO7}"},
 [5] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
- [1] = {["CLSID"]="{GBU-24}"},
+ [1] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [11] = {["CLSID"]="{HB_F4E_AGM-65B_LAU117_SWA}"},
 [3] = {["CLSID"]="{HB_F4E_AGM-65B_LAU117_SWA}"},
 [14] = {["CLSID"]="{HB_ALE_40_30_60}"},
@@ -4811,13 +4811,13 @@ Olympus.unitPayloads = {["A-10A"]={["MK-84*2 , LAU-68*2 , AGM-65K*2"]={[1] = {["
 [10] = {["CLSID"]="<CLEAN>"},
 [4] = {["CLSID"]="<CLEAN>"},
 [2] = {["CLSID"]="<CLEAN>"}},
- ["ATGM + GUIDED: AGM-65A*2, GBU-24*2, Aim-7E2*3, AIM-9L*4, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fletcher Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{GBU-24}"},
+ ["ATGM + GUIDED: AGM-65A*2, GBU-24*2, Aim-7E2*3, AIM-9L*4, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fletcher Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [9] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [8] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [7] = {["CLSID"]="{F4_SARGENT_TANK_600_GAL}"},
 [6] = {["CLSID"]="{HB_PAVE_SPIKE_FAST_ON_ADAPTER_IN_AERO7}"},
 [5] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
- [1] = {["CLSID"]="{GBU-24}"},
+ [1] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [11] = {["CLSID"]="{HB_F4E_AGM-65A_LAU117_SWA}"},
 [3] = {["CLSID"]="{HB_F4E_AGM-65A_LAU117_SWA}"},
 [14] = {["CLSID"]="{HB_ALE_40_30_60}"},
@@ -4900,13 +4900,13 @@ Olympus.unitPayloads = {["A-10A"]={["MK-84*2 , LAU-68*2 , AGM-65K*2"]={[1] = {["
 [1] = {["CLSID"]="{LAU_34_AGM_45A}"},
 [11] = {["CLSID"]="{C40A1E3A-DD05-40D9-85A4-217729E37FAE}"},
 [3] = {["CLSID"]="{C40A1E3A-DD05-40D9-85A4-217729E37FAE}"}},
- ["ATGM + GUIDED: AGM-65D*2, GBU-24*2, Aim-7E2*3, AIM-9L*4, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fletcher Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{GBU-24}"},
+ ["ATGM + GUIDED: AGM-65D*2, GBU-24*2, Aim-7E2*3, AIM-9L*4, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fletcher Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [9] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [8] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [7] = {["CLSID"]="{F4_SARGENT_TANK_600_GAL}"},
 [6] = {["CLSID"]="{HB_PAVE_SPIKE_FAST_ON_ADAPTER_IN_AERO7}"},
 [5] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
- [1] = {["CLSID"]="{GBU-24}"},
+ [1] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [11] = {["CLSID"]="{HB_F4E_AGM-65D_LAU117_SWA}"},
 [3] = {["CLSID"]="{HB_F4E_AGM-65D_LAU117_SWA}"},
 [14] = {["CLSID"]="{HB_ALE_40_30_60}"},
@@ -5077,13 +5077,13 @@ Olympus.unitPayloads = {["A-10A"]={["MK-84*2 , LAU-68*2 , AGM-65K*2"]={[1] = {["
 [14] = {["CLSID"]="{HB_ALE_40_30_60}"},
 [11] = {["CLSID"]="{CBU-87}"},
 [3] = {["CLSID"]="{CBU-87}"}},
- ["GUIDED: GBU-8 HOBOS*2, GBU-24*2, Aim-7E2*3, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fl. Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{GBU-24}"},
+ ["GUIDED: GBU-8 HOBOS*2, GBU-24*2, Aim-7E2*3, AN/AVQ-23 Pave Spike*1, ALE-40 (30-60)*1, Sargent Fl. Fuel Tank 600 GAL*1"]={[13] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [9] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [8] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
 [7] = {["CLSID"]="{F4_SARGENT_TANK_600_GAL}"},
 [6] = {["CLSID"]="{HB_PAVE_SPIKE_FAST_ON_ADAPTER_IN_AERO7}"},
 [5] = {["CLSID"]="{HB_F4E_AIM-7E-2}"},
- [1] = {["CLSID"]="{GBU-24}"},
+ [1] = {["CLSID"]="{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}"},
 [11] = {["CLSID"]="{HB_F4E_GBU_8}"},
 [3] = {["CLSID"]="{HB_F4E_GBU_8}"},
 [14] = {["CLSID"]="{HB_ALE_40_30_60}"},
@@ -5780,6 +5780,16 @@ Olympus.unitPayloads = {["A-10A"]={["MK-84*2 , LAU-68*2 , AGM-65K*2"]={[1] = {["
 [4] = {["CLSID"]="{00F5DAC4-0466-4122-998F-B1A298E34113}"}}},
 ["F-14A-135-GR"]={["XT*2"]={[8] = {["CLSID"]="{F14-300gal}"},
 [3] = {["CLSID"]="{F14-300gal}"}},
+ ["AIM-54A-MK47*6, AIM-9M*2, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [9] = {["CLSID"]="{SHOULDER AIM_54A_Mk47 R}"},
+ [8] = {["CLSID"]="{F14-300gal}"},
+ [7] = {["CLSID"]="{AIM_54A_Mk47}"},
+ [6] = {["CLSID"]="{AIM_54A_Mk47}"},
+ [5] = {["CLSID"]="{AIM_54A_Mk47}"},
+ [4] = {["CLSID"]="{AIM_54A_Mk47}"},
+ [3] = {["CLSID"]="{F14-300gal}"},
+ [2] = {["CLSID"]="{SHOULDER AIM_54A_Mk47 L}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"}},
 ["AIM-54A-MK47*6, AIM-9L*2, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"},
 [9] = {["CLSID"]="{SHOULDER AIM_54A_Mk47 R}"},
 [8] = {["CLSID"]="{F14-300gal}"},
@@ -5790,36 +5800,123 @@ Olympus.unitPayloads = {["A-10A"]={["MK-84*2 , LAU-68*2 , AGM-65K*2"]={[1] = {["
 [3] = {["CLSID"]="{F14-300gal}"},
 [2] = {["CLSID"]="{SHOULDER AIM_54A_Mk47 L}"},
 [1] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"}},
- ["AIM-7F*6, AIM-9L*2, XT*2"]={[7] = {["CLSID"]="{BELLY AIM-7F}"},
- [4] = {["CLSID"]="{BELLY AIM-7F}"},
+ ["AIM-54A-MK60*6, AIM-9M*2, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [9] = {["CLSID"]="{SHOULDER AIM_54A_Mk60 R}"},
+ [8] = {["CLSID"]="{F14-300gal}"},
+ [7] = {["CLSID"]="{AIM_54A_Mk60}"},
+ [6] = {["CLSID"]="{AIM_54A_Mk60}"},
+ [5] = {["CLSID"]="{AIM_54A_Mk60}"},
+ [4] = {["CLSID"]="{AIM_54A_Mk60}"},
+ [3] = {["CLSID"]="{F14-300gal}"},
+ [2] = {["CLSID"]="{SHOULDER AIM_54A_Mk60 L}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"}},
+ ["AIM-54C-MK47*6, AIM-9M*2, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [9] = {["CLSID"]="{SHOULDER AIM_54C_Mk47 R}"},
+ [8] = {["CLSID"]="{F14-300gal}"},
+ [7] = {["CLSID"]="{AIM_54C_Mk47}"},
+ [6] = {["CLSID"]="{AIM_54C_Mk47}"},
+ [5] = {["CLSID"]="{AIM_54C_Mk47}"},
+ [4] = {["CLSID"]="{AIM_54C_Mk47}"},
+ [3] = {["CLSID"]="{F14-300gal}"},
+ [2] = {["CLSID"]="{SHOULDER AIM_54C_Mk47 L}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"}},
+ ["AIM-7M*6, AIM-9M*2, XT*2"]={[7] = {["CLSID"]="{BELLY AIM-7M}"},
+ [4] = {["CLSID"]="{BELLY AIM-7M}"},
+ [10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [9] = {["CLSID"]="{SHOULDER AIM-7M}"},
+ [8] = {["CLSID"]="{F14-300gal}"},
+ [5] = {["CLSID"]="{BELLY AIM-7M}"},
+ [6] = {["CLSID"]="{BELLY AIM-7M}"},
+ [3] = {["CLSID"]="{F14-300gal}"},
+ [2] = {["CLSID"]="{SHOULDER AIM-7M}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"}},
+ ["AIM-7M*6, AIM-9L*2, XT*2"]={[7] = {["CLSID"]="{BELLY AIM-7M}"},
+ [4] = {["CLSID"]="{BELLY AIM-7M}"},
 [10] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"},
- [9] = {["CLSID"]="{SHOULDER AIM-7F}"},
+ [9] = {["CLSID"]="{SHOULDER AIM-7M}"},
 [8] = {["CLSID"]="{F14-300gal}"},
- [5] = {["CLSID"]="{BELLY AIM-7F}"},
- [6] = {["CLSID"]="{BELLY AIM-7F}"},
+ [5] = {["CLSID"]="{BELLY AIM-7M}"},
+ [6] = {["CLSID"]="{BELLY AIM-7M}"},
 [3] = {["CLSID"]="{F14-300gal}"},
- [2] = {["CLSID"]="{SHOULDER AIM-7F}"},
+ [2] = {["CLSID"]="{SHOULDER AIM-7M}"},
 [1] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"}},
- ["AIM-54A-MK47*4, AIM-7F*2, AIM-9L*2, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"},
- [9] = {["CLSID"]="{SHOULDER AIM-7F}"},
+ ["AIM-54A-MK47*4, AIM-7M*2, AIM-9M*2, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [9] = {["CLSID"]="{SHOULDER AIM-7M}"},
 [8] = {["CLSID"]="{F14-300gal}"},
 [7] = {["CLSID"]="{AIM_54A_Mk47}"},
 [6] = {["CLSID"]="{AIM_54A_Mk47}"},
 [5] = {["CLSID"]="{AIM_54A_Mk47}"},
 [4] = {["CLSID"]="{AIM_54A_Mk47}"},
 [3] = {["CLSID"]="{F14-300gal}"},
- [2] = {["CLSID"]="{SHOULDER AIM-7F}"},
+ [2] = {["CLSID"]="{SHOULDER AIM-7M}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"}},
+ ["AIM-54A-MK47*4, AIM-7M*2, AIM-9L*2, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"},
+ [9] = {["CLSID"]="{SHOULDER AIM-7M}"},
+ [8] = {["CLSID"]="{F14-300gal}"},
+ [7] = {["CLSID"]="{AIM_54A_Mk47}"},
+ [6] = {["CLSID"]="{AIM_54A_Mk47}"},
+ [5] = {["CLSID"]="{AIM_54A_Mk47}"},
+ [4] = {["CLSID"]="{AIM_54A_Mk47}"},
+ [3] = {["CLSID"]="{F14-300gal}"},
+ [2] = {["CLSID"]="{SHOULDER AIM-7M}"},
 [1] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"}},
- ["AIM-54A-MK47*2, AIM-7F*1, AIM-9L*4, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"},
- [9] = {["CLSID"]="{LAU-7 - AIM-9L}"},
+ ["AIM-54A-MK60*4, AIM-7M*2, AIM-9M*2, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [9] = {["CLSID"]="{SHOULDER AIM-7M}"},
+ [8] = {["CLSID"]="{F14-300gal}"},
+ [7] = {["CLSID"]="{AIM_54A_Mk60}"},
+ [6] = {["CLSID"]="{AIM_54A_Mk60}"},
+ [5] = {["CLSID"]="{AIM_54A_Mk60}"},
+ [4] = {["CLSID"]="{AIM_54A_Mk60}"},
+ [3] = {["CLSID"]="{F14-300gal}"},
+ [2] = {["CLSID"]="{SHOULDER AIM-7M}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"}},
+ ["AIM-54C-MK47*4, AIM-7M*2, AIM-9M*2, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [9] = {["CLSID"]="{SHOULDER AIM-7M}"},
+ [8] = {["CLSID"]="{F14-300gal}"},
+ [7] = {["CLSID"]="{AIM_54C_Mk47}"},
+ [6] = {["CLSID"]="{AIM_54C_Mk47}"},
+ [5] = {["CLSID"]="{AIM_54C_Mk47}"},
+ [4] = {["CLSID"]="{AIM_54C_Mk47}"},
+ [3] = {["CLSID"]="{F14-300gal}"},
+ [2] = {["CLSID"]="{SHOULDER AIM-7M}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"}},
+ ["AIM-54A-MK47*2, AIM-7M*1, AIM-9M*2, AIM-9L*2, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"},
+ [9] = {["CLSID"]="{LAU-7 - AIM-9M}"},
 [8] = {["CLSID"]="{F14-300gal}"},
 [7] = {["CLSID"]="{AIM_54A_Mk47}"},
 [4] = {["CLSID"]="{AIM_54A_Mk47}"},
 [3] = {["CLSID"]="{F14-300gal}"},
- [2] = {["CLSID"]="{LAU-7 - AIM-9L}"},
+ [2] = {["CLSID"]="{LAU-7 - AIM-9M}"},
 [1] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"},
- [5] = {["CLSID"]="{BELLY AIM-7F}"}},
- ["AIM-54A-MK47*4, AIM-9L*4, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"},
+ [5] = {["CLSID"]="{BELLY AIM-7M}"}},
+ ["AIM-54A-MK47*2, AIM-7M*1, AIM-9M*4, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [9] = {["CLSID"]="{LAU-7 - AIM-9M}"},
+ [8] = {["CLSID"]="{F14-300gal}"},
+ [7] = {["CLSID"]="{AIM_54A_Mk47}"},
+ [4] = {["CLSID"]="{AIM_54A_Mk47}"},
+ [3] = {["CLSID"]="{F14-300gal}"},
+ [2] = {["CLSID"]="{LAU-7 - AIM-9M}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [5] = {["CLSID"]="{BELLY AIM-7M}"}},
+ ["AIM-54A-MK60*2, AIM-7M*1, AIM-9M*4, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [9] = {["CLSID"]="{LAU-7 - AIM-9M}"},
+ [8] = {["CLSID"]="{F14-300gal}"},
+ [7] = {["CLSID"]="{AIM_54A_Mk60}"},
+ [4] = {["CLSID"]="{AIM_54A_Mk60}"},
+ [3] = {["CLSID"]="{F14-300gal}"},
+ [2] = {["CLSID"]="{LAU-7 - AIM-9M}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [5] = {["CLSID"]="{BELLY AIM-7M}"}},
+ ["AIM-54C-MK47*2, AIM-7M*1, AIM-9M*4, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [9] = {["CLSID"]="{LAU-7 - AIM-9M}"},
+ [8] = {["CLSID"]="{F14-300gal}"},
+ [7] = {["CLSID"]="{AIM_54C_Mk47}"},
+ [4] = {["CLSID"]="{AIM_54C_Mk47}"},
+ [3] = {["CLSID"]="{F14-300gal}"},
+ [2] = {["CLSID"]="{LAU-7 - AIM-9M}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [5] = {["CLSID"]="{BELLY AIM-7M}"}},
+ ["AIM-54A-MK47*4, AIM-9M*2, AIM-9L*2, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
 [9] = {["CLSID"]="{LAU-7 - AIM-9L}"},
 [8] = {["CLSID"]="{F14-300gal}"},
 [7] = {["CLSID"]="{AIM_54A_Mk47}"},
@@ -5828,7 +5925,7 @@ Olympus.unitPayloads = {["A-10A"]={["MK-84*2 , LAU-68*2 , AGM-65K*2"]={[1] = {["
 [4] = {["CLSID"]="{AIM_54A_Mk47}"},
 [3] = {["CLSID"]="{F14-300gal}"},
 [2] = {["CLSID"]="{LAU-7 - AIM-9L}"},
- [1] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"}},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"}},
 ["AIM-54A-MK47*4, AIM-9M*4, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
 [9] = {["CLSID"]="{LAU-7 - AIM-9M}"},
 [8] = {["CLSID"]="{F14-300gal}"},
@@ -5849,16 +5946,63 @@ Olympus.unitPayloads = {["A-10A"]={["MK-84*2 , LAU-68*2 , AGM-65K*2"]={[1] = {["
 [3] = {["CLSID"]="{F14-300gal}"},
 [2] = {["CLSID"]="{LAU-7 - AIM-9M}"},
 [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"}},
- ["AIM-7F*4, AIM-9L*4, XT*2"]={[7] = {["CLSID"]="{BELLY AIM-7F}"},
- [4] = {["CLSID"]="{BELLY AIM-7F}"},
+ ["AIM-54C-MK47*4, AIM-9M*4, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [9] = {["CLSID"]="{LAU-7 - AIM-9M}"},
+ [8] = {["CLSID"]="{F14-300gal}"},
+ [7] = {["CLSID"]="{AIM_54C_Mk47}"},
+ [6] = {["CLSID"]="{AIM_54C_Mk47}"},
+ [5] = {["CLSID"]="{AIM_54C_Mk47}"},
+ [4] = {["CLSID"]="{AIM_54C_Mk47}"},
+ [3] = {["CLSID"]="{F14-300gal}"},
+ [2] = {["CLSID"]="{LAU-7 - AIM-9M}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"}},
+ ["AIM-7M*4, AIM-9M*2, AIM-9L*2, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"},
+ [9] = {["CLSID"]="{LAU-7 - AIM-9M}"},
+ [8] = {["CLSID"]="{F14-300gal}"},
+ [5] = {["CLSID"]="{BELLY AIM-7M}"},
+ [6] = {["CLSID"]="{BELLY AIM-7M}"},
+ [4] = {["CLSID"]="{BELLY AIM-7M}"},
+ [7] = {["CLSID"]="{BELLY AIM-7M}"},
+ [3] = {["CLSID"]="{F14-300gal}"},
+ [2] = {["CLSID"]="{LAU-7 - AIM-9M}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"}},
+ ["AIM-7M*4, AIM-9L*4, XT*2"]={[7] = {["CLSID"]="{BELLY AIM-7M}"},
+ [4] = {["CLSID"]="{BELLY AIM-7M}"},
 [10] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"},
 [9] = {["CLSID"]="{LAU-7 - AIM-9L}"},
 [8] = {["CLSID"]="{F14-300gal}"},
- [5] = {["CLSID"]="{BELLY AIM-7F}"},
- [6] = {["CLSID"]="{BELLY AIM-7F}"},
+ [5] = {["CLSID"]="{BELLY AIM-7M}"},
+ [6] = {["CLSID"]="{BELLY AIM-7M}"},
 [3] = {["CLSID"]="{F14-300gal}"},
 [2] = {["CLSID"]="{LAU-7 - AIM-9L}"},
 [1] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"}},
+ ["AIM-54A-MK47*2, AIM-7M*3, AIM-9M*2, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [9] = {["CLSID"]="{SHOULDER AIM-7M}"},
+ [8] = {["CLSID"]="{F14-300gal}"},
+ [7] = {["CLSID"]="{AIM_54A_Mk47}"},
+ [4] = {["CLSID"]="{AIM_54A_Mk47}"},
+ [3] = {["CLSID"]="{F14-300gal}"},
+ [2] = {["CLSID"]="{SHOULDER AIM-7M}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [5] = {["CLSID"]="{BELLY AIM-7M}"}},
+ ["AIM-54A-MK60*2, AIM-7M*3, AIM-9M*2, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [9] = {["CLSID"]="{SHOULDER AIM-7M}"},
+ [8] = {["CLSID"]="{F14-300gal}"},
+ [7] = {["CLSID"]="{AIM_54A_Mk60}"},
+ [4] = {["CLSID"]="{AIM_54A_Mk60}"},
+ [3] = {["CLSID"]="{F14-300gal}"},
+ [2] = {["CLSID"]="{SHOULDER AIM-7M}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [5] = {["CLSID"]="{BELLY AIM-7M}"}},
+ ["AIM-54C-MK47*2, AIM-7M*3, AIM-9M*2, XT*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [9] = {["CLSID"]="{SHOULDER AIM-7M}"},
+ [8] = {["CLSID"]="{F14-300gal}"},
+ [7] = {["CLSID"]="{AIM_54C_Mk47}"},
+ [4] = {["CLSID"]="{AIM_54C_Mk47}"},
+ [3] = {["CLSID"]="{F14-300gal}"},
+ [2] = {["CLSID"]="{SHOULDER AIM-7M}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
+ [5] = {["CLSID"]="{BELLY AIM-7M}"}},
 ["BDU-33*14"]={[4] = {["CLSID"]="{MAK79_BDU33 4}"},
 [7] = {["CLSID"]="{MAK79_BDU33 4}"},
 [5] = {["CLSID"]="{MAK79_BDU33 3L}"},
@@ -5915,29 +6059,29 @@ Olympus.unitPayloads = {["A-10A"]={["MK-84*2 , LAU-68*2 , AGM-65K*2"]={[1] = {["
 [9] = {["CLSID"]="{PHXBRU3242_2*LAU10 RS}"}},
 ["LUU-2*24"]={[5] = {["CLSID"]="{BRU3242_2*SUU25 R}"},
 [6] = {["CLSID"]="{BRU3242_SUU25}"}},
- ["AIM-54A-MK60*1, AIM-7F*1, AIM-9L*2, XT*2, Mk-82*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"},
+ ["AIM-54A-MK60*1, AIM-7M*1, AIM-9M*2, XT*2, Mk-82*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
 [9] = {["CLSID"]="{SHOULDER AIM_54A_Mk60 R}"},
 [8] = {["CLSID"]="{F14-300gal}"},
 [7] = {["CLSID"]="{BRU-32 MK-82}"},
 [4] = {["CLSID"]="{BRU-32 MK-82}"},
 [3] = {["CLSID"]="{F14-300gal}"},
- [2] = {["CLSID"]="{SHOULDER AIM-7F}"},
- [1] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"}},
- ["AIM-54A-MK60*1, AIM-7F*1, AIM-9L*2, XT*2, Mk-82*1"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"},
+ [2] = {["CLSID"]="{SHOULDER AIM-7M}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"}},
+ ["AIM-54A-MK60*1, AIM-7M*1, AIM-9M*2, XT*2, Mk-82*1"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
 [9] = {["CLSID"]="{SHOULDER AIM_54A_Mk60 R}"},
 [8] = {["CLSID"]="{F14-300gal}"},
 [7] = {["CLSID"]="{BRU-32 MK-82}"},
 [3] = {["CLSID"]="{F14-300gal}"},
- [2] = {["CLSID"]="{SHOULDER AIM-7F}"},
- [1] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"}},
- ["AIM-54A-MK60*1, AIM-7F*1, AIM-9L*2, XT*2, Mk-20*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"},
+ [2] = {["CLSID"]="{SHOULDER AIM-7M}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"}},
+ ["AIM-54A-MK60*1, AIM-7M*1, AIM-9M*2, XT*2, Mk-20*2"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
 [9] = {["CLSID"]="{SHOULDER AIM_54A_Mk60 R}"},
 [8] = {["CLSID"]="{F14-300gal}"},
 [7] = {["CLSID"]="{BRU-32 MK-20}"},
 [4] = {["CLSID"]="{BRU-32 MK-20}"},
 [3] = {["CLSID"]="{F14-300gal}"},
- [2] = {["CLSID"]="{SHOULDER AIM-7F}"},
- [1] = {["CLSID"]="{LAU-138 wtip - AIM-9L}"}},
+ [2] = {["CLSID"]="{SHOULDER AIM-7M}"},
+ [1] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"}},
 ["AIM-7M*1, AIM-9M*2, XT*2, GBU-12*2, LANTIRN"]={[10] = {["CLSID"]="{LAU-138 wtip - AIM-9M}"},
 [9] = {["CLSID"]="{F14-LANTIRN-TP}"},
 [8] = {["CLSID"]="{F14-300gal}"},
@@ -12639,14 +12783,14 @@ Olympus.unitPayloads = {["A-10A"]={["MK-84*2 , LAU-68*2 , AGM-65K*2"]={[1] = {["
 [3] = {["CLSID"]="{GBU-38}"},
 [2] = {["CLSID"]="{GBU-38}"},
 [1] = {["CLSID"]="{GBU-38}"}},
- ["AGM-114K*8,GBU-38*2"]={[4] = {["CLSID"]="{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}"},
+ ["AGM-114K*4,GBU-38*2"]={[4] = {["CLSID"]="AGM114x2_OH_58"},
 [3] = {["CLSID"]="{GBU-38}"},
 [2] = {["CLSID"]="{GBU-38}"},
- [1] = {["CLSID"]="{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}"}},
- ["AGM-114K*12"]={[4] = {["CLSID"]="{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}"},
+ [1] = {["CLSID"]="AGM114x2_OH_58"}},
+ ["AGM-114K*8"]={[4] = {["CLSID"]="AGM114x2_OH_58"},
 [3] = {["CLSID"]="AGM114x2_OH_58"},
 [2] = {["CLSID"]="AGM114x2_OH_58"},
- [1] = {["CLSID"]="{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}"}}},
+ [1] = {["CLSID"]="AGM114x2_OH_58"}}},
 ["OH-58D"]={["2xAGM-114, 7xHYDRA-70"]={[1] = {["CLSID"]="AGM114x2_OH_58"},
 [2] = {["CLSID"]="M260_HYDRA"}},
 ["4xAGM-114"]={[1] = {["CLSID"]="AGM114x2_OH_58"},