From 0b2e76e12bfb845829d4bd0e6da4521e182d6865 Mon Sep 17 00:00:00 2001
From: Vasyl Horbachenko <vasyl.horbachenko@gmail.com>
Date: Mon, 25 Jun 2018 05:09:00 +0300
Subject: [PATCH] few minor fixes

---
 game/event/groundintercept.py |    4 +-
 game/game.py                  |   15 +-
 gen/conflictgen.py            |    8 +-
 resources/payloads/FA-18C.lua | 1213 +++++++++------------------------
 theater/caucasus.py           |    1 -
 5 files changed, 342 insertions(+), 899 deletions(-)

diff --git a/game/event/groundintercept.py b/game/event/groundintercept.py
index 428ca183..7d80c367 100644
--- a/game/event/groundintercept.py
+++ b/game/event/groundintercept.py
@@ -29,9 +29,9 @@ class GroundInterceptEvent(Event):
                 destroyed_targets += count
 
         if self.from_cp.captured:
-            return math.ceil(float(destroyed_targets) / total_targets) >= self.SUCCESS_TARGETS_HIT_PERCENTAGE
+            return float(destroyed_targets) / total_targets >= self.SUCCESS_TARGETS_HIT_PERCENTAGE
         else:
-            return math.ceil(float(destroyed_targets) / total_targets) < self.SUCCESS_TARGETS_HIT_PERCENTAGE
+            return float(destroyed_targets) / total_targets < self.SUCCESS_TARGETS_HIT_PERCENTAGE
 
     def commit(self, debriefing: Debriefing):
         super(GroundInterceptEvent, self).commit(debriefing)
diff --git a/game/game.py b/game/game.py
index af1e2b37..e7b50dd9 100644
--- a/game/game.py
+++ b/game/game.py
@@ -33,12 +33,12 @@ PLAYER_INTERCEPT_GLOBAL_PROBABILITY_BASE = 25
 PLAYER_INTERCEPT_GLOBAL_PROBABILITY_LOG = 2
 EVENT_PROBABILITIES = {
     CaptureEvent: [100, 4],
-    InterceptEvent: [35, 5],
-    GroundInterceptEvent: [35, 5],
+    InterceptEvent: [25, 5],
+    GroundInterceptEvent: [25, 5],
     GroundAttackEvent: [0, 5],
-    NavalInterceptEvent: [35, 5],
-    AntiAAStrikeEvent: [35, 5],
-    InfantryTransportEvent: [100, 0],
+    NavalInterceptEvent: [25, 5],
+    AntiAAStrikeEvent: [25, 5],
+    InfantryTransportEvent: [25, 0],
 }
 
 PLAYER_BASE_STRENGTH_RECOVERY = 0.2
@@ -174,7 +174,10 @@ class Game:
         if event.is_successfull(debriefing):
             self.budget += event.bonus()
 
-        self.events.remove(event)
+        if event in self.events:
+            self.events.remove(event)
+        else:
+            print("finish_event: event not in the events!")
 
     def is_player_attack(self, event: Event):
         return event.attacker_name == self.player
diff --git a/gen/conflictgen.py b/gen/conflictgen.py
index 0e0f7a7c..e1f3cb30 100644
--- a/gen/conflictgen.py
+++ b/gen/conflictgen.py
@@ -25,8 +25,8 @@ INTERCEPT_ATTACKERS_HEADING = -45, 45
 INTERCEPT_DEFENDERS_HEADING = -10, 10
 INTERCEPT_ATTACKERS_DISTANCE = 60000
 INTERCEPT_DEFENDERS_DISTANCE = 30000
-INTERCEPT_MAX_DISTANCE = 80000
-INTERCEPT_MIN_DISTANCE = 45000
+INTERCEPT_MAX_DISTANCE = 130000
+INTERCEPT_MIN_DISTANCE = 60000
 
 NAVAL_INTERCEPT_DISTANCE_FACTOR = 0.4
 NAVAL_INTERCEPT_DISTANCE_MAX = 40000
@@ -124,7 +124,7 @@ class Conflict:
 
     @classmethod
     def intercept_conflict(cls, attacker: Country, defender: Country, from_cp: ControlPoint, to_cp: ControlPoint, theater: ConflictTheater):
-        raw_distance = from_cp.position.distance_to_point(to_cp.position) * 0.4
+        raw_distance = from_cp.position.distance_to_point(to_cp.position) * 0.6
         distance = max(min(raw_distance, INTERCEPT_MAX_DISTANCE), INTERCEPT_MIN_DISTANCE)
 
         heading = _heading_sum(from_cp.position.heading_between_point(to_cp.position), random.choice([-1, 1]) * random.randint(60, 100))
@@ -213,7 +213,7 @@ class Conflict:
 
     @classmethod
     def intercept_conflict(cls, attacker: Country, defender: Country, from_cp: ControlPoint, to_cp: ControlPoint, theater: ConflictTheater):
-        raw_distance = from_cp.position.distance_to_point(to_cp.position) * 0.4
+        raw_distance = from_cp.position.distance_to_point(to_cp.position)
         distance = max(min(raw_distance, INTERCEPT_MAX_DISTANCE), INTERCEPT_MIN_DISTANCE)
 
         heading = _heading_sum(from_cp.position.heading_between_point(to_cp.position), random.choice([-1, 1]) * random.randint(60, 100))
diff --git a/resources/payloads/FA-18C.lua b/resources/payloads/FA-18C.lua
index 3cc31e94..5606d778 100644
--- a/resources/payloads/FA-18C.lua
+++ b/resources/payloads/FA-18C.lua
@@ -1,358 +1,194 @@
 local unitPayloads = {
-	["name"] = "FA-18C",
+	["name"] = "FA-18C_hornet",
 	["payloads"] = {
 		[1] = {
-			["name"] = "AGM-62*2,AIM-9*2,AIM-7,FLIR Pod,Fuel*3",
+			["name"] = "AIM-9M*6, AIM-7M*2, FUEL*3",
 			["pylons"] = {
 				[1] = {
 					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 1,
+					["num"] = 9,
 				},
 				[2] = {
-					["CLSID"] = "{C40A1E3A-DD05-40D9-85A4-217729E37FAE}",
-					["num"] = 2,
+					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
+					["num"] = 1,
 				},
 				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
+					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
 					["num"] = 4,
 				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
+				[4] = {
 					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
 					["num"] = 6,
 				},
-				[7] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 7,
+				[5] = {
+					["CLSID"] = "LAU-115_2*LAU-127_AIM-9M",
+					["num"] = 2,
 				},
-				[8] = {
-					["CLSID"] = "{C40A1E3A-DD05-40D9-85A4-217729E37FAE}",
+				[6] = {
+					["CLSID"] = "LAU-115_2*LAU-127_AIM-9M",
 					["num"] = 8,
 				},
+				[7] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 3,
+				},
+				[8] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 5,
+				},
 				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 7,
 				},
 			},
 			["tasks"] = {
-				[1] = 33,
+				[1] = 11,
 			},
 		},
 		[2] = {
-			["name"] = "GBU-10*2,AIM-9*2,AIM-7,FLIR Pod,Fuel*3",
+			["name"] = "AIM-9M*6, AIM-7M*2, FUEL*2",
 			["pylons"] = {
 				[1] = {
 					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
 					["num"] = 1,
 				},
 				[2] = {
-					["CLSID"] = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}",
+					["CLSID"] = "LAU-115_2*LAU-127_AIM-9M",
 					["num"] = 2,
 				},
 				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
 					["num"] = 3,
 				},
 				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
-					["num"] = 4,
+					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
+					["num"] = 9,
 				},
 				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
+					["CLSID"] = "LAU-115_2*LAU-127_AIM-9M",
+					["num"] = 8,
 				},
 				[6] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 7,
+				},
+				[7] = {
+					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
+					["num"] = 4,
+				},
+				[8] = {
 					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
 					["num"] = 6,
 				},
-				[7] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}",
-					["num"] = 8,
-				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
-				},
-			},
-			["tasks"] = {
-				[1] = 33,
-			},
-		},
-		[3] = {
-			["name"] = "GBU-12*2,AIM-9*2,AIM-7,FLIR Pod,Fuel*3",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 1,
-				},
-				[2] = {
-					["CLSID"] = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}",
-					["num"] = 8,
-				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
-				},
-			},
-			["tasks"] = {
-				[1] = 33,
-			},
-		},
-		[4] = {
-			["name"] = "Fuel*3",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 3,
-				},
-				[2] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 7,
-				},
-			},
-			["tasks"] = {
-				[1] = 16,
-			},
-		},
-		[5] = {
-			["name"] = "Mk-84*2,AIM-9*2,AIM-7,FLIR Pod,Fuel*3",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 1,
-				},
-				[2] = {
-					["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}",
-					["num"] = 8,
-				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
-				},
-			},
-			["tasks"] = {
-				[1] = 32,
-				[2] = 34,
-			},
-		},
-		[6] = {
-			["name"] = "GBU-16*2,AIM-9*2,AIM-7,FLIR Pod,Fuel*3",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 1,
-				},
-				[2] = {
-					["CLSID"] = "{0D33DDAE-524F-4A4E-B5B8-621754FE3ADE}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{0D33DDAE-524F-4A4E-B5B8-621754FE3ADE}",
-					["num"] = 8,
-				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
-				},
-			},
-			["tasks"] = {
-				[1] = 33,
-			},
-		},
-		[7] = {
-			["name"] = "AGM-154*2,AIM-9*2,AIM-7,FLIR Pod,Fuel*3",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 1,
-				},
-				[2] = {
-					["CLSID"] = "{9BCC2A2B-5708-4860-B1F1-053A18442067}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{9BCC2A2B-5708-4860-B1F1-053A18442067}",
-					["num"] = 8,
-				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
-				},
-			},
-			["tasks"] = {
-				[1] = 33,
-			},
-		},
-		[8] = {
-			["name"] = "AIM-120*4,AIM-9*2,Fuel*3",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 1,
-				},
-				[2] = {
-					["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}",
-					["num"] = 8,
-				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
-				},
 			},
 			["tasks"] = {
 				[1] = 19,
-				[2] = 11,
-				[3] = 18,
 			},
 		},
-		[9] = {
-			["name"] = "AGM-65D*2,AIM-9*2,AIM-7,FLIR Pod,Fuel*3",
+		[3] = {
+			["name"] = "AIM-9M*2, MK-84*2, FUEL*2",
 			["pylons"] = {
 				[1] = {
 					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
 					["num"] = 1,
 				},
 				[2] = {
-					["CLSID"] = "{444BA8AE-82A7-4345-842E-76154EFCCA46}",
-					["num"] = 2,
+					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
+					["num"] = 9,
 				},
 				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
 					["num"] = 3,
 				},
 				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 7,
+				},
+				[5] = {
+					["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}",
+					["num"] = 2,
+				},
+				[6] = {
+					["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}",
+					["num"] = 8,
+				},
+			},
+			["tasks"] = {
+				[1] = 32,
+			},
+		},
+		[4] = {
+			["name"] = "AIM-9M*2, MK-83*4, FUEL*2",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
+					["num"] = 9,
+				},
+				[3] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 3,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 7,
+				},
+				[5] = {
+					["CLSID"] = "{BRU33_2X_MK-83}",
+					["num"] = 2,
+				},
+				[6] = {
+					["CLSID"] = "{BRU33_2X_MK-83}",
+					["num"] = 8,
+				},
+			},
+			["tasks"] = {
+				[1] = 32,
+			},
+		},
+		[5] = {
+			["name"] = "Carrier Landing",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 5,
+				},
+				[3] = {
+					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
+					["num"] = 9,
+				},
+			},
+			["tasks"] = {
+			},
+		},
+		[6] = {
+			["name"] = "AIM-9M*2, AIM-7M*4, FUEL*3",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
+					["num"] = 9,
+				},
+				[3] = {
+					["CLSID"] = "{LAU-115 - AIM-7M}",
+					["num"] = 2,
+				},
+				[4] = {
+					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
 					["num"] = 4,
 				},
 				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
 					["num"] = 5,
 				},
 				[6] = {
@@ -360,734 +196,339 @@ local unitPayloads = {
 					["num"] = 6,
 				},
 				[7] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{444BA8AE-82A7-4345-842E-76154EFCCA46}",
+					["CLSID"] = "{LAU-115 - AIM-7M}",
 					["num"] = 8,
 				},
+				[8] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 3,
+				},
 				[9] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 7,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[7] = {
+			["name"] = "AIM-9M*2, CBU-99*4, FUEL*2",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
+					["num"] = 1,
+				},
+				[2] = {
 					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
 					["num"] = 9,
 				},
+				[3] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 3,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 7,
+				},
+				[5] = {
+					["CLSID"] = "{BRU33_2X_CBU-99}",
+					["num"] = 2,
+				},
+				[6] = {
+					["CLSID"] = "{BRU33_2X_CBU-99}",
+					["num"] = 8,
+				},
+			},
+			["tasks"] = {
+				[1] = 31,
+			},
+		},
+		[8] = {
+			["name"] = "AIM-9M*2, MK-82SE*4, FUEL*2",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
+					["num"] = 9,
+				},
+				[3] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 3,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 7,
+				},
+				[5] = {
+					["CLSID"] = "{BRU33_2X_MK-82_Snakeye}",
+					["num"] = 2,
+				},
+				[6] = {
+					["CLSID"] = "{BRU33_2X_MK-82_Snakeye}",
+					["num"] = 8,
+				},
+			},
+			["tasks"] = {
+				[1] = 31,
+			},
+		},
+		[9] = {
+			["name"] = "AIM-9M*2, MK-20*4, FUEL*2",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
+					["num"] = 1,
+				},
+				[2] = {
+					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
+					["num"] = 9,
+				},
+				[3] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 3,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 7,
+				},
+				[5] = {
+					["CLSID"] = "{BRU33_2X_ROCKEYE}",
+					["num"] = 2,
+				},
+				[6] = {
+					["CLSID"] = "{BRU33_2X_ROCKEYE}",
+					["num"] = 8,
+				},
 			},
 			["tasks"] = {
 				[1] = 31,
 			},
 		},
 		[10] = {
-			["name"] = "AGM88*2_AGM65D*2_AIM9*2_AIM7_FLIR Pod_Fuel",
+			["name"] = "AIM-9M*2, MK-82*4, FUEL*2",
 			["pylons"] = {
 				[1] = {
 					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
 					["num"] = 1,
 				},
 				[2] = {
-					["CLSID"] = "{444BA8AE-82A7-4345-842E-76154EFCCA46}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8200-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{444BA8AE-82A7-4345-842E-76154EFCCA46}",
-					["num"] = 8,
-				},
-				[9] = {
 					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
 					["num"] = 9,
 				},
+				[3] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 3,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 7,
+				},
+				[5] = {
+					["CLSID"] = "{BRU33_2X_MK-82}",
+					["num"] = 2,
+				},
+				[6] = {
+					["CLSID"] = "{BRU33_2X_MK-82}",
+					["num"] = 8,
+				},
 			},
 			["tasks"] = {
-				[1] = 29,
+				[1] = 31,
 			},
 		},
 		[11] = {
-			["name"] = "AGM88*4_AIM9*2_AIM7_FLIR Pod_Fuel",
+			["name"] = "AIM-9M*2, AIM-7M*2, FUEL*2",
 			["pylons"] = {
 				[1] = {
 					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
 					["num"] = 1,
 				},
 				[2] = {
-					["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}",
-					["num"] = 2,
+					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
+					["num"] = 9,
 				},
 				[3] = {
-					["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}",
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
 					["num"] = 3,
 				},
 				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
-					["num"] = 4,
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 7,
 				},
 				[5] = {
-					["CLSID"] = "{EFEC8200-B922-11d7-9897-000476191836}",
-					["num"] = 5,
+					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
+					["num"] = 4,
 				},
 				[6] = {
 					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
 					["num"] = 6,
 				},
-				[7] = {
-					["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}",
-					["num"] = 8,
-				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
-				},
 			},
 			["tasks"] = {
-				[1] = 29,
+				[1] = 18,
 			},
 		},
 		[12] = {
-			["name"] = "AIM-9*2,AIM-7*6,Fuel",
+			["name"] = "AIM-9M*2, MK-83*2, FUEL*2",
 			["pylons"] = {
 				[1] = {
 					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
 					["num"] = 1,
 				},
 				[2] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 8,
-				},
-				[9] = {
 					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
 					["num"] = 9,
 				},
+				[3] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 3,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 7,
+				},
+				[5] = {
+					["CLSID"] = "{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}",
+					["num"] = 2,
+				},
+				[6] = {
+					["CLSID"] = "{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}",
+					["num"] = 8,
+				},
 			},
 			["tasks"] = {
-				[1] = 10,
+				[1] = 32,
 			},
 		},
 		[13] = {
-			["name"] = "Mk20*4,AIM-9*2,AIM-7,FLIR Pod,Fuel*3",
+			["name"] = "AIM-9M*2, ZUNI*4, FUEL*2",
 			["pylons"] = {
 				[1] = {
 					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
 					["num"] = 1,
 				},
 				[2] = {
-					["CLSID"] = "{0B9ABA77-93B8-45FC-9C63-82AFB2CB50A4}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{0B9ABA77-93B8-45FC-9C63-82AFB2CB50A4}",
-					["num"] = 8,
-				},
-				[9] = {
 					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
 					["num"] = 9,
 				},
+				[3] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 3,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 7,
+				},
+				[5] = {
+					["CLSID"] = "{BRU33_2*LAU10}",
+					["num"] = 2,
+				},
+				[6] = {
+					["CLSID"] = "{BRU33_2*LAU10}",
+					["num"] = 8,
+				},
 			},
 			["tasks"] = {
-				[1] = 31,
+				[1] = 32,
 			},
 		},
 		[14] = {
-			["name"] = "AIM-120*6,AIM-9*2,Fuel",
+			["name"] = "AIM-9M*2, LAU-61*4, FUEL*2",
 			["pylons"] = {
 				[1] = {
 					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
 					["num"] = 1,
 				},
 				[2] = {
-					["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}",
-					["num"] = 8,
-				},
-				[9] = {
 					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
 					["num"] = 9,
 				},
+				[3] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 3,
+				},
+				[4] = {
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 7,
+				},
+				[5] = {
+					["CLSID"] = "{BRU33_2*LAU61}",
+					["num"] = 2,
+				},
+				[6] = {
+					["CLSID"] = "{BRU33_2*LAU61}",
+					["num"] = 8,
+				},
 			},
 			["tasks"] = {
-				[1] = 10,
+				[1] = 32,
 			},
 		},
 		[15] = {
-			["name"] = "LAU-10*2,AIM-9*2,AIM-7,FLIR Pod,Fuel*3",
+			["name"] = "AIM-9M*2, LAU-68*4, FUEL*2",
 			["pylons"] = {
 				[1] = {
 					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
 					["num"] = 1,
 				},
 				[2] = {
-					["CLSID"] = "{F3EFE0AB-E91A-42D8-9CA2-B63C91ED570A}",
-					["num"] = 2,
+					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
+					["num"] = 9,
 				},
 				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
 					["num"] = 3,
 				},
 				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
 					["num"] = 7,
 				},
-				[8] = {
-					["CLSID"] = "{F3EFE0AB-E91A-42D8-9CA2-B63C91ED570A}",
-					["num"] = 8,
+				[5] = {
+					["CLSID"] = "{BRU33_2*LAU68_MK5}",
+					["num"] = 2,
 				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
+				[6] = {
+					["CLSID"] = "{BRU33_2*LAU68_MK5}",
+					["num"] = 8,
 				},
 			},
 			["tasks"] = {
 				[1] = 32,
-				[2] = 34,
 			},
 		},
 		[16] = {
-			["name"] = "AIM-9*2,AIM-7*4,Fuel*3",
+			["name"] = "AIM-9M*2, AIM-7M*2, FUEL*1",
 			["pylons"] = {
 				[1] = {
 					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
 					["num"] = 1,
 				},
 				[2] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 2,
+					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
+					["num"] = 9,
 				},
 				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 3,
+					["CLSID"] = "{FPU_8A_FUEL_TANK}",
+					["num"] = 5,
 				},
 				[4] = {
 					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
 					["num"] = 4,
 				},
 				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
 					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
 					["num"] = 6,
 				},
-				[7] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 8,
-				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
-				},
-			},
-			["tasks"] = {
-				[1] = 19,
-				[2] = 11,
-				[3] = 18,
-			},
-		},
-		[17] = {
-			["name"] = "MK-82*8,AIM-9*2,AIM-7,FLIR Pod,Fuel",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 1,
-				},
-				[2] = {
-					["CLSID"] = "{D5D51E24-348C-4702-96AF-97A714E72697}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{D5D51E24-348C-4702-96AF-97A714E72697}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{D5D51E24-348C-4702-96AF-97A714E72697}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{D5D51E24-348C-4702-96AF-97A714E72697}",
-					["num"] = 8,
-				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
-				},
-			},
-			["tasks"] = {
-				[1] = 32,
-				[2] = 34,
-			},
-		},
-		[18] = {
-			["name"] = "AIM-120*2,AIM-9*2,AIM-7*2,Fuel*3",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 1,
-				},
-				[2] = {
-					["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}",
-					["num"] = 8,
-				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
-				},
-			},
-			["tasks"] = {
-				[1] = 19,
-				[2] = 11,
-				[3] = 18,
-			},
-		},
-		[19] = {
-			["name"] = "AGM-88*2,AIM-9*2,AIM-7,FLIR Pod,Fuel*3",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 1,
-				},
-				[2] = {
-					["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}",
-					["num"] = 8,
-				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
-				},
-			},
-			["tasks"] = {
-				[1] = 29,
-			},
-		},
-		[20] = {
-			["name"] = "AGM-84E*2,AIM-9*2,AIM-7,FLIR Pod,Fuel*3",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 1,
-				},
-				[2] = {
-					["CLSID"] = "{AF42E6DF-9A60-46D8-A9A0-1708B241AADB}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{AF42E6DF-9A60-46D8-A9A0-1708B241AADB}",
-					["num"] = 8,
-				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
-				},
-			},
-			["tasks"] = {
-				[1] = 33,
-			},
-		},
-		[21] = {
-			["name"] = "MK-82*4,AIM-9*2,AIM-7,FLIR Pod,Fuel*3",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 1,
-				},
-				[2] = {
-					["CLSID"] = "{D5D51E24-348C-4702-96AF-97A714E72697}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{D5D51E24-348C-4702-96AF-97A714E72697}",
-					["num"] = 8,
-				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
-				},
-			},
-			["tasks"] = {
-				[1] = 32,
-				[2] = 34,
-			},
-		},
-		[22] = {
-			["name"] = "AGM-84A*2,AIM-9*2,AIM-7,FLIR Pod,Fuel*3",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 1,
-				},
-				[2] = {
-					["CLSID"] = "{8B7CADF9-4954-46B3-8CFB-93F2F5B90B03}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{8B7CADF9-4954-46B3-8CFB-93F2F5B90B03}",
-					["num"] = 8,
-				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
-				},
-			},
-			["tasks"] = {
-				[1] = 30,
-			},
-		},
-		[23] = {
-			["name"] = "AIM-9M*2,AGM-65D*2,Mk-82*4,FLIR Pod,Fuel",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 1,
-				},
-				[2] = {
-					["CLSID"] = "{444BA8AE-82A7-4345-842E-76154EFCCA46}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{D5D51E24-348C-4702-96AF-97A714E72697}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{1C2B16EB-8EB0-43de-8788-8EBB2D70B8BC}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{D5D51E24-348C-4702-96AF-97A714E72697}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{444BA8AE-82A7-4345-842E-76154EFCCA46}",
-					["num"] = 8,
-				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
-				},
-			},
-			["tasks"] = {
-				[1] = 31,
-			},
-		},
-		[24] = {
-			["name"] = "AIM-120*4,AIM-9*2,AIM-7*2,Fuel",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 1,
-				},
-				[2] = {
-					["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{C8E06185-7CD6-4C90-959F-044679E90751}",
-					["num"] = 8,
-				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
-				},
 			},
 			["tasks"] = {
 				[1] = 10,
 			},
 		},
-		[25] = {
-			["name"] = "AGM-65K*2,AIM-9*2,AIM-7,FLIR Pod,Fuel*3",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 1,
-				},
-				[2] = {
-					["CLSID"] = "{69DC8AE7-8F77-427B-B8AA-B19D3F478B66}",
-					["num"] = 2,
-				},
-				[3] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 3,
-				},
-				[4] = {
-					["CLSID"] = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}",
-					["num"] = 4,
-				},
-				[5] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 5,
-				},
-				[6] = {
-					["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}",
-					["num"] = 6,
-				},
-				[7] = {
-					["CLSID"] = "{EFEC8201-B922-11d7-9897-000476191836}",
-					["num"] = 7,
-				},
-				[8] = {
-					["CLSID"] = "{69DC8AE7-8F77-427B-B8AA-B19D3F478B66}",
-					["num"] = 8,
-				},
-				[9] = {
-					["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}",
-					["num"] = 9,
-				},
-			},
-			["tasks"] = {
-				[1] = 31,
-			},
-		},
 	},
-	["unitType"] = "F/A-18C",
+	["unitType"] = "FA-18C_hornet",
 }
 return unitPayloads
diff --git a/theater/caucasus.py b/theater/caucasus.py
index 8b806dc8..76c27c96 100644
--- a/theater/caucasus.py
+++ b/theater/caucasus.py
@@ -72,7 +72,6 @@ class CaucasusTheater(ConflictTheater):
 
         self.carrier_1.captured = True
         self.soganlug.captured = True
-        self.beslan.base.strength = 0.25
 
     def add_controlpoint(self, point: ControlPoint, connected_to: typing.Collection[ControlPoint] = []):
         point.name = " ".join(re.split(r" |-", point.name)[:1])