Update swedish military assets pack (#464)

* Update swedish military assets pack

* re add old variant names for save compat

* Update faction.py

fixed presets

* fix double variant name

game/data/radar_db.py

@@ -27,6 +27,7 @@ from pydcs_extensions import highdigitsams as hds
 from pydcs_extensions import vietnamwarvessels as vwv
 from pydcs_extensions import chinesemilitaryassetspack as cmap
 from pydcs_extensions import russianmilitaryassetspack as rmap
+from pydcs_extensions import swedishmilitaryassetspack as smap
 from pydcs_extensions import usamilitaryassetspack as usamap
 
 
@@ -65,6 +66,9 @@ TRACK_RADARS = {
     cmap.CH_HQ22_STR,
     rmap.CH_BukM3_9S36M,
     rmap.CH_S350_50N6,
+    smap.LvS_103_PM103,
+    smap.LvS_103_PM103_HX,
+    smap.UndE23,
     usamap.MIM104_ANMPQ65,
     usamap.MIM104_ANMPQ65A,
     usamap.MIM104_ANMPQ65_HEMTT,
@@ -110,6 +114,25 @@ LAUNCHER_TRACKER_PAIRS = {
     rmap.CH_BukM3_9A317MA: (rmap.CH_BukM3_9S36M,),
     rmap.CH_S350_50P6_9M96D: (rmap.CH_S350_50N6,),
     rmap.CH_S350_50P6_9M100: (rmap.CH_S350_50N6,),
+    smap.LvS_103_Lavett103_Rb103A: (
+        smap.LvS_103_PM103,
+        smap.LvS_103_PM103_HX,
+    ),
+    smap.LvS_103_Lavett103_HX_Rb103A: (
+        smap.LvS_103_PM103,
+        smap.LvS_103_PM103_HX,
+    ),
+    smap.LvS_103_Lavett103_Rb103B: (
+        smap.LvS_103_PM103,
+        smap.LvS_103_PM103_HX,
+    ),
+    smap.LvS_103_Lavett103_HX_Rb103B: (
+        smap.LvS_103_PM103,
+        smap.LvS_103_PM103_HX,
+    ),
+    smap.RBS_70: (smap.UndE23,),
+    smap.RBS_90: (smap.UndE23,),
+    smap.RBS_98: (smap.UndE23,),
     usamap.MIM104_M903_PAC2: (
         usamap.MIM104_ANMPQ65,
         usamap.MIM104_ANMPQ65A,
@@ -197,6 +220,9 @@ UNITS_WITH_RADAR = {
     rmap.CH_BukM3_9S36M,
     rmap.CH_BukM3_9A317M,
     rmap.CH_BukM3_9A317MA,
+    smap.LvS_103_PM103,
+    smap.LvS_103_PM103_HX,
+    smap.UndE23,
     usamap.CH_Centurion_C_RAM,
     usamap.CH_NASAMS3_SR,
     usamap.MIM104_ANMPQ65,

game/factions/faction.py

@@ -575,8 +575,10 @@ class Faction:
             self.remove_preset("David's Sling (Semicircle)")
         # swedish military assets pack
         if not mod_settings.swedishmilitaryassetspack:
-            self.remove_vehicle("BV410_RBS70")
+            self.remove_vehicle("Grkpbv90")
-            self.remove_vehicle("BV410_RBS90")
+            self.remove_vehicle("Artillerisystem08_SGR77B")
+            self.remove_vehicle("Artillerisystem08_M982")
+            self.remove_vehicle("LvKv9040")
             self.remove_vehicle("LvS_103_Lavett103_Rb103A")
             self.remove_vehicle("LvS_103_Lavett103_Rb103B")
             self.remove_vehicle("LvS_103_Lavett103_HX_Rb103A")
@@ -585,37 +587,43 @@ class Faction:
             self.remove_vehicle("LvS_103_PM103")
             self.remove_vehicle("LvS_103_PM103_HX")
             self.remove_vehicle("LvS_103_Elverk103")
-            self.remove_vehicle("LvKv9040")
+            self.remove_vehicle("RBS-70")
-            self.remove_vehicle("RBS_70")
+            self.remove_vehicle("RBS-90")
-            self.remove_vehicle("RBS_90")
+            self.remove_vehicle("RBS-98")
-            self.remove_vehicle("RBS_98")
             self.remove_vehicle("UndE23")
-            self.remove_vehicle("BV410")
-            self.remove_vehicle("CV9040")
-            self.remove_vehicle("Strv103")
-            self.remove_vehicle("Strv121")
-            self.remove_vehicle("Strv122")
-            self.remove_vehicle("Strv2000")
-            self.remove_vehicle("Volvo740")
-            self.remove_vehicle("RBS_15KA")
-            self.remove_vehicle("AG_90")
             self.remove_vehicle("SwedishinfantryAK4")
             self.remove_vehicle("SwedishinfantryAK5")
             self.remove_vehicle("SwedishinfantryAK5GT")
             self.remove_vehicle("SwedishinfantryKSP90")
             self.remove_vehicle("SwedishinfantryKSP58")
             self.remove_vehicle("SwedishinfantryPskott86")
-            self.remove_vehicle("RBS_57")
+            self.remove_vehicle("RBS-57")
-            self.remove_vehicle("RBS_58")
+            self.remove_vehicle("RBS-58")
-            self.remove_vehicle("Artillerisystem08")
+            self.remove_vehicle("AG-90")
-            self.remove_vehicle("Grkpbv90")
+            self.remove_vehicle("CV9040")
-            self.remove_ship("HSwMS_Visby")
+            self.remove_vehicle("CH_Strf9040C")
+            self.remove_vehicle("Strv103")
+            self.remove_vehicle("Strv2000")
+            self.remove_vehicle("Volvo740")
+            self.remove_vehicle("CH_BVS10")
+            self.remove_vehicle("CH_CV9050")
+            self.remove_vehicle("CH_Ikv91")
+            self.remove_vehicle("CH_Strv123")
+            self.remove_vehicle("CH_Strv122")
+            self.remove_vehicle("CH_SisuGTP")
+            self.remove_vehicle("RBS-15KA")
             self.remove_ship("Strb90")
+            self.remove_ship("HSwMS_Visby")
             self.remove_aircraft("HKP15B")
+            self.remove_aircraft("CH_JAS39C")
             self.remove_preset("LvS-103 Rb103A")
             self.remove_preset("LvS-103 Rb103A Mobile")
             self.remove_preset("LvS-103 Rb103B")
             self.remove_preset("LvS-103 Rb103B Mobile")
+            self.remove_preset("RBS-15")
+            self.remove_preset("RBS-70")
+            self.remove_preset("RBS-90")
+            self.remove_preset("RBS-98")
         if not mod_settings.coldwarassets:
             self.remove_aircraft("B_47")
             self.remove_aircraft("Tu-4K")

game/pretense/pretensetgogenerator.py

@@ -63,9 +63,9 @@ from game.unitmap import UnitMap
 from game.utils import Heading
 from pydcs_extensions import (
     Char_M551_Sheridan,
-    BV410_RBS70,
+    CH_BVS10,
-    BV410_RBS90,
+    RBS_70,
-    BV410,
+    RBS_90,
     VAB__50,
     VAB_T20_13,
 )
@@ -100,9 +100,6 @@ PRETENSE_AMPHIBIOUS_UNITS = [
     VAB__50,
     VAB_T20_13,
     Char_M551_Sheridan,
-    BV410_RBS70,
-    BV410_RBS90,
-    BV410,
 ]
 
 

pydcs_extensions/swedishmilitaryassetspack/swedishmilitaryassetspack.py

@@ -6,74 +6,162 @@ from typing import Set
 
 from dcs import unittype, task
 from dcs.helicopters import HelicopterType
+from dcs.planes import PlaneType
+from dcs.weapons_data import Weapons
 
-from game.modsupport import vehiclemod, shipmod, helicoptermod
+from game.modsupport import (
+    helicoptermod,
+    planemod,
+    shipmod,
+    vehiclemod,
+)
+from pydcs_extensions.weapon_injector import inject_weapons
 
 
+class WeaponsSW:
+
+    IRIS_T_IR_AAM = {"clsid": "{CH_IRIS-T}", "name": "IRIS-T IR AAM", "weight": 88.4}
+
+    Meteor_AMRAAM___Active_Radar_AAM = {
+        "clsid": "{CH_Meteor}",
+        "name": "Meteor AMRAAM - Active Radar AAM",
+        "weight": 190,
+    }
+
+    Meteor_AMRAAM___Active_Radar_AAM_x_2 = {
+        "clsid": "{CH_Meteor_DUAL}",
+        "name": "Meteor AMRAAM - Active Radar AAM x 2",
+        "weight": 380,
+    }
+
+    AIM_120C_8_AMRAAM___Active_Radar_AAM = {
+        "clsid": "{CH_AIM-120C8}",
+        "name": "AIM-120C-8 AMRAAM - Active Radar AAM",
+        "weight": 161,
+    }
+
+    AIM_120C_8_AMRAAM___Active_Radar_AAM_x_2 = {
+        "clsid": "{CH_AIM-120C8_DUAL}",
+        "name": "AIM-120C-8 AMRAAM - Active Radar AAM x 2",
+        "weight": 322,
+    }
+
+    GBU_49___500lb_Laser__GPS_Guided_Bomb_LD = {
+        "clsid": "{CH_GBU49}",
+        "name": "GBU-49 - 500lb Laser & GPS Guided Bomb LD",
+        "weight": 253,
+    }
+
+    GBU_39_SDB_285_lb_Guided_Glide_Bomb = {
+        "clsid": "{CH_GBU39}",
+        "name": "GBU-39 SDB 285 lb Guided Glide-Bomb",
+        "weight": 129,
+    }
+
+    Taurus_KEPD_350_ALCM = {
+        "clsid": "{CH_KEPD350}",
+        "name": "Taurus KEPD-350 ALCM",
+        "weight": 1400,
+    }
+
+    Drop_tank_1100_litres = {
+        "clsid": "{CH_JAS39C_Tank1100}",
+        "name": "Drop tank 1100 litres",
+        "weight": 946.06,
+    }
+
+    RBS_15_Mk4 = {"clsid": "{CH_RBS15MK4}", "name": "RBS-15 Mk4", "weight": 650}
+
+
+inject_weapons(WeaponsSW)
+
+
+## ARTILLERY
 @vehiclemod
-class BV410_RBS70(unittype.VehicleType):
+class Grkpbv90(unittype.VehicleType):
-    id = "BV410_RBS70"
+    id = "Grkpbv90"
-    name = "[SMA] RBS 70 EldE 70 Mobile SAM LN"
+    name = "[CH] Grkpbv 90 SPM"
     detection_range = 0
-    threat_range = 8000
+    threat_range = 7500
-    air_weapon_dist = 8000
+    air_weapon_dist = 7500
     eplrs = True
 
 
 @vehiclemod
-class BV410_RBS90(unittype.VehicleType):
+class Artillerisystem08_SGR77B(unittype.VehicleType):
-    id = "BV410_RBS90"
+    id = "Artillerisystem08_SGR77B"
-    name = "[SMA] RBS 90 EldE 90 Mobile SAM LN"
+    name = "[CH] Archer SPG SGR77B"
-    detection_range = 20000
+    detection_range = 10000
-    threat_range = 8000
+    threat_range = 40000
-    air_weapon_dist = 8000
+    air_weapon_dist = 40000
+    eplrs = True
+
+
+@vehiclemod
+class Artillerisystem08_M982(unittype.VehicleType):
+    id = "Artillerisystem08_M982"
+    name = "[CH] Archer SPG M982 Excalibur"
+    detection_range = 0
+    threat_range = 50000
+    air_weapon_dist = 50000
+    eplrs = True
+
+
+# Air Defense
+@vehiclemod
+class LvKv9040(unittype.VehicleType):
+    id = "LvKv9040"
+    name = "[CH] Lvkv 9040B SPAAG"
+    detection_range = 15000
+    threat_range = 4000
+    air_weapon_dist = 4000
     eplrs = True
 
 
 @vehiclemod
 class LvS_103_Lavett103_Rb103A(unittype.VehicleType):
     id = "LvS-103_Lavett103_Rb103A"
-    name = "[SMA] LvS-103 Lavett 103 Rb103A Stationary SAM LN"
+    name = "[CH] LvS-103 Lavett 103 Rb103A LN"
     detection_range = 0
-    threat_range = 150000
+    threat_range = 160000
-    air_weapon_dist = 150000
+    air_weapon_dist = 160000
     eplrs = True
 
 
 @vehiclemod
 class LvS_103_Lavett103_Rb103B(unittype.VehicleType):
     id = "LvS-103_Lavett103_Rb103B"
-    name = "[SMA] LvS-103 Lavett 103 Rb103B Stationary SAM LN"
+    name = "[CH] LvS-103 Lavett 103 Rb103B LN"
     detection_range = 0
-    threat_range = 35000
+    threat_range = 120000
-    air_weapon_dist = 35000
+    air_weapon_dist = 120000
     eplrs = True
 
 
 @vehiclemod
 class LvS_103_Lavett103_HX_Rb103A(unittype.VehicleType):
     id = "LvS-103_Lavett103_HX_Rb103A"
-    name = "[SMA] LvS-103 Lavett 103 Rb103A Mobile SAM LN"
+    name = "[CH] LvS-103 Lavett 103 Rb103A LN (HX)"
     detection_range = 0
-    threat_range = 150000
+    threat_range = 160000
-    air_weapon_dist = 150000
+    air_weapon_dist = 160000
     eplrs = True
 
 
 @vehiclemod
 class LvS_103_Lavett103_HX_Rb103B(unittype.VehicleType):
     id = "LvS-103_Lavett103_HX_Rb103B"
-    name = "[SMA] LvS-103 Lavett 103 Rb103B Mobile SAM LN"
+    name = "[CH] LvS-103 Lavett 103 Rb103B LN (HX)"
     detection_range = 0
-    threat_range = 150000
+    threat_range = 120000
-    air_weapon_dist = 150000
+    air_weapon_dist = 120000
     eplrs = True
 
 
 @vehiclemod
 class LvS_103_StriE103(unittype.VehicleType):
     id = "LvS-103_StriE103"
-    name = "[SMA] LvS-103 StriE 103 Mobile SAM ECS"
+    name = "[CH] LvS-103 StriE 103 ECS (HX)"
     detection_range = 0
     threat_range = 0
     air_weapon_dist = 0
@@ -83,8 +171,8 @@ class LvS_103_StriE103(unittype.VehicleType):
 @vehiclemod
 class LvS_103_PM103(unittype.VehicleType):
     id = "LvS-103_PM103"
-    name = "[SMA] LvS-103 PM 103 Stationary SAM STR"
+    name = "[CH] LvS-103 PM 103 STR"
-    detection_range = 160000
+    detection_range = 200000
     threat_range = 0
     air_weapon_dist = 0
     eplrs = True
@@ -93,8 +181,8 @@ class LvS_103_PM103(unittype.VehicleType):
 @vehiclemod
 class LvS_103_PM103_HX(unittype.VehicleType):
     id = "LvS-103_PM103_HX"
-    name = "[SMA] LvS-103 PM 103 Mobile SAM STR"
+    name = "[CH] LvS-103 PM 103 STR (HX)"
-    detection_range = 160000
+    detection_range = 200000
     threat_range = 0
     air_weapon_dist = 0
     eplrs = True
@@ -103,27 +191,17 @@ class LvS_103_PM103_HX(unittype.VehicleType):
 @vehiclemod
 class LvS_103_Elverk103(unittype.VehicleType):
     id = "LvS-103_Elverk103"
-    name = "[SMA] LvS-103 Elverk 103 Mobile SAM EPP"
+    name = "[CH] LvS-103 Elverk 103 EPP (HX)"
     detection_range = 0
     threat_range = 0
     air_weapon_dist = 0
     eplrs = True
 
 
-@vehiclemod
-class LvKv9040(unittype.VehicleType):
-    id = "LvKv9040"
-    name = "[SMA] Lvkv 9040 SPAAG"
-    detection_range = 15000
-    threat_range = 4000
-    air_weapon_dist = 4000
-    eplrs = True
-
-
 @vehiclemod
 class RBS_70(unittype.VehicleType):
     id = "RBS-70"
-    name = "[SMA] RBS 70 EldE 70 Stationary SAM LN"
+    name = "[CH] RBS 70 VSHORAD LN"
     detection_range = 0
     threat_range = 8000
     air_weapon_dist = 8000
@@ -133,7 +211,7 @@ class RBS_70(unittype.VehicleType):
 @vehiclemod
 class RBS_90(unittype.VehicleType):
     id = "RBS-90"
-    name = "[SMA] RBS 90 EldE 90 Stationary SAM LN"
+    name = "[CH] RBS 90 VSHORAD LN"
     detection_range = 20000
     threat_range = 8000
     air_weapon_dist = 8000
@@ -143,7 +221,7 @@ class RBS_90(unittype.VehicleType):
 @vehiclemod
 class RBS_98(unittype.VehicleType):
     id = "RBS-98"
-    name = "[SMA] RBS 98 EldE 98 Mobile SAM LN"
+    name = "[CH] RBS 98 SAM LN (BvS 10)"
     detection_range = 0
     threat_range = 20000
     air_weapon_dist = 20000
@@ -153,67 +231,139 @@ class RBS_98(unittype.VehicleType):
 @vehiclemod
 class UndE23(unittype.VehicleType):
     id = "UndE23"
-    name = "[SMA] UndE 23 (RBS 70/90/98) SAM STR"
+    name = "[CH] UndE 23 (RBS 70/90/98) STR"
-    detection_range = 100000
+    detection_range = 300000
     threat_range = 0
     air_weapon_dist = 0
     eplrs = True
 
 
+## INFANTRY
 @vehiclemod
-class BV410(unittype.VehicleType):
+class SwedishinfantryAK4(unittype.VehicleType):
-    id = "BV410"
+    id = "SwedishinfantryAK4"
-    name = "[SMA] Bv 410 ATV"
+    name = "[CH] Ak 4 Soldier"
     detection_range = 0
+    threat_range = 600
+    air_weapon_dist = 600
+    eplrs = True
+
+
+@vehiclemod
+class SwedishinfantryAK5(unittype.VehicleType):
+    id = "SwedishinfantryAK5"
+    name = "[CH] Ak 5 Soldier"
+    detection_range = 0
+    threat_range = 500
+    air_weapon_dist = 500
+    eplrs = True
+
+
+@vehiclemod
+class SwedishinfantryAK5GT(unittype.VehicleType):
+    id = "SwedishinfantryAK5GT"
+    name = "[CH] Ak 5 Granattillsats Soldier"
+    detection_range = 0
+    threat_range = 500
+    air_weapon_dist = 500
+    eplrs = True
+
+
+@vehiclemod
+class SwedishinfantryKSP90(unittype.VehicleType):
+    id = "SwedishinfantryKSP90"
+    name = "[CH] Ksp 90 Soldier"
+    detection_range = 0
+    threat_range = 700
+    air_weapon_dist = 700
+    eplrs = True
+
+
+@vehiclemod
+class SwedishinfantryKSP58(unittype.VehicleType):
+    id = "SwedishinfantryKSP58"
+    name = "[CH] Ksp 58 Soldier"
+    detection_range = 0
+    threat_range = 1200
+    air_weapon_dist = 1200
+    eplrs = True
+
+
+@vehiclemod
+class SwedishinfantryPskott86(unittype.VehicleType):
+    id = "SwedishinfantryPskott86"
+    name = "[CH] Pskott 86 Soldier"
+    detection_range = 0
+    threat_range = 400
+    air_weapon_dist = 400
+    eplrs = True
+
+
+@vehiclemod
+class RBS_57(unittype.VehicleType):
+    id = "RBS-57"
+    name = "[CH] RBS 57 ATGM Soldier"
+    detection_range = 0
+    threat_range = 1000
+    air_weapon_dist = 1000
+    eplrs = True
+
+
+@vehiclemod
+class RBS_58(unittype.VehicleType):
+    id = "RBS-58"
+    name = "[CH] RBS 58 ATGM"
+    detection_range = 5000
+    threat_range = 5000
+    air_weapon_dist = 5000
+    eplrs = True
+
+
+@vehiclemod
+class AG_90(unittype.VehicleType):
+    id = "AG-90"
+    name = "[CH] Ag 90 Sniper AMR"
+    detection_range = 5000
     threat_range = 1800
     air_weapon_dist = 1800
     eplrs = True
 
 
+##Armor
 @vehiclemod
 class CV9040(unittype.VehicleType):
     id = "CV9040"
-    name = "[SMA] Strf 9040 IFV"
+    name = "[CH] Strf 9040B IFV"
     detection_range = 0
     threat_range = 4000
     air_weapon_dist = 4000
     eplrs = True
 
 
+@vehiclemod
+class CH_Strf9040C(unittype.VehicleType):
+    id = "CH_Strf9040C"
+    name = "[CH] Strf 9040C IFV"
+    detection_range = 3500
+    threat_range = 3500
+    air_weapon_dist = 3500
+    eplrs = True
+
+
 @vehiclemod
 class Strv103(unittype.VehicleType):
     id = "Strv103"
-    name = "[SMA] Strv 103 MBT"
+    name = "[CH] Strv 103 MBT"
     detection_range = 6000
     threat_range = 6000
     air_weapon_dist = 6000
     eplrs = True
 
 
-@vehiclemod
-class Strv121(unittype.VehicleType):
-    id = "Strv121"
-    name = "[SMA] Strv 121 MBT"
-    detection_range = 0
-    threat_range = 8000
-    air_weapon_dist = 1200
-    eplrs = True
-
-
-@vehiclemod
-class Strv122(unittype.VehicleType):
-    id = "Strv122"
-    name = "[SMA] Strv 122 MBT"
-    detection_range = 0
-    threat_range = 8000
-    air_weapon_dist = 1200
-    eplrs = True
-
-
 @vehiclemod
 class Strv2000(unittype.VehicleType):
     id = "Strv2000"
-    name = "[SMA] Strv 2000 T140/40 MBT"
+    name = "[CH] Strv 2000 T140/40 MBT"
     detection_range = 8000
     threat_range = 8000
     air_weapon_dist = 4000
@@ -223,7 +373,7 @@ class Strv2000(unittype.VehicleType):
 @vehiclemod
 class Volvo740(unittype.VehicleType):
     id = "Volvo740"
-    name = "[SMA] Volvo 740 Improvised fighting vehicle"
+    name = "[CH] Volvo 740 Improvised fighting vehicle"
     detection_range = 0
     threat_range = 1200
     air_weapon_dist = 1200
@@ -231,150 +381,81 @@ class Volvo740(unittype.VehicleType):
 
 
 @vehiclemod
-class RBS_15KA(unittype.VehicleType):
+class CH_BVS10(unittype.VehicleType):
-    id = "RBS-15KA"
+    id = "CH_BVS10"
-    name = "[SMA] RBS 15KA LBASM"
+    name = "[CH] BvS 10 ATV"
-    detection_range = 300000
+    detection_range = 0
-    threat_range = 300000
-    air_weapon_dist = 300000
-    eplrs = True
-
-
-## INFANTRY
-
-
-@vehiclemod
-class AG_90(unittype.VehicleType):
-    id = "AG-90"
-    name = "[SMA] Ag 90 Sniper team"
-    detection_range = 5000
     threat_range = 1800
     air_weapon_dist = 1800
     eplrs = True
 
 
 @vehiclemod
-class SwedishinfantryAK4(unittype.VehicleType):
+class CH_CV9050(unittype.VehicleType):
-    id = "SwedishinfantryAK4"
+    id = "CH_CV9050"
-    name = "[SMA] Ak 4 Soldier"
+    name = "[CH] CV 9050 IFV"
-    detection_range = 1500
+    detection_range = 6000
-    threat_range = 600
+    threat_range = 5500
-    air_weapon_dist = 600
+    air_weapon_dist = 5500
     eplrs = True
 
 
 @vehiclemod
-class SwedishinfantryAK5(unittype.VehicleType):
+class CH_Ikv91(unittype.VehicleType):
-    id = "SwedishinfantryAK5"
+    id = "CH_Ikv91"
-    name = "[SMA] Ak 5 Soldier"
+    name = "[CH] Ikv 91 LT"
-    detection_range = 1500
+    detection_range = 3500
-    threat_range = 500
+    threat_range = 3500
-    air_weapon_dist = 500
-    eplrs = True
-
-
-@vehiclemod
-class SwedishinfantryAK5GT(unittype.VehicleType):
-    id = "SwedishinfantryAK5GT"
-    name = "[SMA] Ak 5 Granattillsats Soldier"
-    detection_range = 1000
-    threat_range = 500
-    air_weapon_dist = 500
-    eplrs = True
-
-
-@vehiclemod
-class SwedishinfantryKSP90(unittype.VehicleType):
-    id = "SwedishinfantryKSP90"
-    name = "[SMA] Ksp 90 Soldier"
-    detection_range = 700
-    threat_range = 700
-    air_weapon_dist = 700
-    eplrs = True
-
-
-@vehiclemod
-class SwedishinfantryKSP58(unittype.VehicleType):
-    id = "SwedishinfantryKSP58"
-    name = "[SMA] Ksp 58 Soldier"
-    detection_range = 1200
-    threat_range = 1200
     air_weapon_dist = 1200
     eplrs = True
 
 
 @vehiclemod
-class SwedishinfantryPskott86(unittype.VehicleType):
+class CH_Strv123(unittype.VehicleType):
-    id = "SwedishinfantryPskott86"
+    id = "CH_Strv123"
-    name = "[SMA] Pskott 86 Soldier"
+    name = "[CH] Strv 123 MBT"
-    detection_range = 1500
-    threat_range = 400
-    air_weapon_dist = 400
-    eplrs = True
-
-
-@vehiclemod
-class RBS_57(unittype.VehicleType):
-    id = "RBS-57"
-    name = "[SMA] RBS 57 ATGM"
-    detection_range = 5000
-    threat_range = 1000
-    air_weapon_dist = 1000
-    eplrs = True
-
-
-@vehiclemod
-class RBS_58(unittype.VehicleType):
-    id = "RBS-58"
-    name = "[SMA] RBS 58 ATGM"
-    detection_range = 5000
-    threat_range = 5000
-    air_weapon_dist = 5000
-    eplrs = True
-
-
-## ARTILLERY
-
-
-@vehiclemod
-class Artillerisystem08(unittype.VehicleType):
-    id = "Artillerisystem08"
-    name = "[SMA] Artillerisystem 08 SPG"
-    detection_range = 10000
-    threat_range = 25000
-    air_weapon_dist = 25000
-    eplrs = True
-
-
-@vehiclemod
-class Grkpbv90(unittype.VehicleType):
-    id = "Grkpbv90"
-    name = "[SMA] Grkpbv 90 SPM"
     detection_range = 0
-    threat_range = 7500
+    threat_range = 8000
-    air_weapon_dist = 7500
+    air_weapon_dist = 1200
+    eplrs = True
+
+
+@vehiclemod
+class CH_Strv122(unittype.VehicleType):
+    id = "CH_Strv122"
+    name = "[CH] Strv 122 MBT"
+    detection_range = 0
+    threat_range = 8000
+    air_weapon_dist = 1200
+    eplrs = True
+
+
+@vehiclemod
+class CH_SisuGTP(unittype.VehicleType):
+    id = "CH_SisuGTP"
+    name = "[CH] Sisu GTP APC"
+    detection_range = 0
+    threat_range = 1800
+    air_weapon_dist = 1800
+    eplrs = True
+
+
+## Missiles
+@vehiclemod
+class RBS_15KA(unittype.VehicleType):
+    id = "RBS-15KA"
+    name = "[CH] RBS 15KA LBASM"
+    detection_range = 300000
+    threat_range = 300000
+    air_weapon_dist = 300000
     eplrs = True
 
 
 ## SHIPS
-
-
-@shipmod
-class HSwMS_Visby(unittype.ShipType):
-    id = "HSwMS_Visby"
-    name = "[SMA] HSwMS Visby Corvette"
-    plane_num = 0
-    helicopter_num = 1
-    parking = 1
-    detection_range = 180000
-    threat_range = 30000
-    air_weapon_dist = 30000
-
-
 @shipmod
 class Strb90(unittype.ShipType):
     id = "Strb90"
-    name = "[SMA] Strb 90 FAC"
+    name = "[CH] Strb 90 FAC"
     plane_num = 0
     helicopter_num = 0
     parking = 0
@@ -383,9 +464,19 @@ class Strb90(unittype.ShipType):
     air_weapon_dist = 10000
 
 
+@shipmod
+class HSwMS_Visby(unittype.ShipType):
+    id = "HSwMS_Visby"
+    name = "[CH] Visby Class Corvette"
+    plane_num = 0
+    helicopter_num = 1
+    parking = 1
+    detection_range = 180000
+    threat_range = 30000
+    air_weapon_dist = 30000
+
+
 ## HELICOPTERS
-
-
 @helicoptermod
 class HKP15B(HelicopterType):
     id = "HKP15B"
@@ -414,3 +505,310 @@ class HKP15B(HelicopterType):
 
     tasks = [task.Reconnaissance, task.Transport]
     task_default = task.Reconnaissance
+
+
+## Planes
+@planemod
+class CH_JAS39C(PlaneType):
+    id = "CH_JAS39C"
+    height = 4.5
+    width = 8.4
+    length = 14.1
+    fuel_max = 2550
+    max_speed = 2649.996
+    chaff = 80
+    flare = 40
+    charge_total = 120
+    chaff_charge_size = 1
+    flare_charge_size = 1
+    eplrs = True
+    category = "Interceptor"  # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F}
+
+    livery_name = "CH_JAS39C"  # from type
+
+    class Pylon1:
+        IRIS_T_IR_AAM = (1, Weapons.IRIS_T_IR_AAM)
+
+    class Pylon2:
+        IRIS_T_IR_AAM = (2, Weapons.IRIS_T_IR_AAM)
+        Meteor_AMRAAM___Active_Radar_AAM = (2, Weapons.Meteor_AMRAAM___Active_Radar_AAM)
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
+            2,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C_8_AMRAAM___Active_Radar_AAM = (
+            2,
+            Weapons.AIM_120C_8_AMRAAM___Active_Radar_AAM,
+        )
+        GBU_12___500lb_Laser_Guided_Bomb = (2, Weapons.GBU_12___500lb_Laser_Guided_Bomb)
+        GBU_49___500lb_Laser__GPS_Guided_Bomb_LD = (
+            2,
+            Weapons.GBU_49___500lb_Laser__GPS_Guided_Bomb_LD,
+        )
+        GBU_39_SDB_285_lb_Guided_Glide_Bomb = (
+            2,
+            Weapons.GBU_39_SDB_285_lb_Guided_Glide_Bomb,
+        )
+        Rb_75A__AGM_65A_Maverick___TV_ASM_ = (
+            2,
+            Weapons.Rb_75A__AGM_65A_Maverick___TV_ASM_,
+        )
+        Rb_75B__AGM_65B_Maverick___TV_ASM_ = (
+            2,
+            Weapons.Rb_75B__AGM_65B_Maverick___TV_ASM_,
+        )
+        Rb_75T__AGM_65A_Maverick___TV_ASM_Lg_HE_Whd_ = (
+            2,
+            Weapons.Rb_75T__AGM_65A_Maverick___TV_ASM_Lg_HE_Whd_,
+        )
+        _4x_SB_M_71_120kg_GP_Bomb_Low_drag = (
+            2,
+            Weapons._4x_SB_M_71_120kg_GP_Bomb_Low_drag,
+        )
+        _4x_SB_M_71_120kg_GP_Bomb_High_drag = (
+            2,
+            Weapons._4x_SB_M_71_120kg_GP_Bomb_High_drag,
+        )
+        ARAK_M_70B_HE_6x_135mm_UnGd_Rkts__Shu70_HE_FRAG = (
+            2,
+            Weapons.ARAK_M_70B_HE_6x_135mm_UnGd_Rkts__Shu70_HE_FRAG,
+        )
+        ARAK_M_70B_AP_6x_135mm_UnGd_Rkts__Pshu70_HEAT = (
+            2,
+            Weapons.ARAK_M_70B_AP_6x_135mm_UnGd_Rkts__Pshu70_HEAT,
+        )
+
+    # ERRR <CLEAN>
+
+    class Pylon3:
+        IRIS_T_IR_AAM = (3, Weapons.IRIS_T_IR_AAM)
+        Meteor_AMRAAM___Active_Radar_AAM = (3, Weapons.Meteor_AMRAAM___Active_Radar_AAM)
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
+            3,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C_8_AMRAAM___Active_Radar_AAM = (
+            3,
+            Weapons.AIM_120C_8_AMRAAM___Active_Radar_AAM,
+        )
+        GBU_12___500lb_Laser_Guided_Bomb = (3, Weapons.GBU_12___500lb_Laser_Guided_Bomb)
+        GBU_49___500lb_Laser__GPS_Guided_Bomb_LD = (
+            3,
+            Weapons.GBU_49___500lb_Laser__GPS_Guided_Bomb_LD,
+        )
+        GBU_39_SDB_285_lb_Guided_Glide_Bomb = (
+            3,
+            Weapons.GBU_39_SDB_285_lb_Guided_Glide_Bomb,
+        )
+        BK_90_MJ12__12x_MJ2_HEAT___36x_MJ1_HE_FRAG_Bomblets_ = (
+            3,
+            Weapons.BK_90_MJ12__12x_MJ2_HEAT___36x_MJ1_HE_FRAG_Bomblets_,
+        )
+        BK_90_MJ1__72_x_MJ1_HE_FRAG_Bomblets_ = (
+            3,
+            Weapons.BK_90_MJ1__72_x_MJ1_HE_FRAG_Bomblets_,
+        )
+        BK_90_MJ2__24_x_MJ2_HEAT_Bomblets_ = (
+            3,
+            Weapons.BK_90_MJ2__24_x_MJ2_HEAT_Bomblets_,
+        )
+        Rb_75A__AGM_65A_Maverick___TV_ASM_ = (
+            3,
+            Weapons.Rb_75A__AGM_65A_Maverick___TV_ASM_,
+        )
+        Rb_75B__AGM_65B_Maverick___TV_ASM_ = (
+            3,
+            Weapons.Rb_75B__AGM_65B_Maverick___TV_ASM_,
+        )
+        Rb_75T__AGM_65A_Maverick___TV_ASM_Lg_HE_Whd_ = (
+            3,
+            Weapons.Rb_75T__AGM_65A_Maverick___TV_ASM_Lg_HE_Whd_,
+        )
+        Taurus_KEPD_350_ALCM = (3, Weapons.Taurus_KEPD_350_ALCM)
+        _4x_SB_M_71_120kg_GP_Bomb_Low_drag = (
+            3,
+            Weapons._4x_SB_M_71_120kg_GP_Bomb_Low_drag,
+        )
+        _4x_SB_M_71_120kg_GP_Bomb_High_drag = (
+            3,
+            Weapons._4x_SB_M_71_120kg_GP_Bomb_High_drag,
+        )
+        ARAK_M_70B_HE_6x_135mm_UnGd_Rkts__Shu70_HE_FRAG = (
+            3,
+            Weapons.ARAK_M_70B_HE_6x_135mm_UnGd_Rkts__Shu70_HE_FRAG,
+        )
+        ARAK_M_70B_AP_6x_135mm_UnGd_Rkts__Pshu70_HEAT = (
+            3,
+            Weapons.ARAK_M_70B_AP_6x_135mm_UnGd_Rkts__Pshu70_HEAT,
+        )
+        RBS_15_Mk4 = (3, Weapons.RBS_15_Mk4)
+        Drop_tank_1100_litres = (3, Weapons.Drop_tank_1100_litres)
+
+    # ERRR <CLEAN>
+
+    class Pylon4:
+        GBU_12___500lb_Laser_Guided_Bomb = (4, Weapons.GBU_12___500lb_Laser_Guided_Bomb)
+        GBU_49___500lb_Laser__GPS_Guided_Bomb_LD = (
+            4,
+            Weapons.GBU_49___500lb_Laser__GPS_Guided_Bomb_LD,
+        )
+        _4x_SB_M_71_120kg_GP_Bomb_Low_drag = (
+            4,
+            Weapons._4x_SB_M_71_120kg_GP_Bomb_Low_drag,
+        )
+        _4x_SB_M_71_120kg_GP_Bomb_High_drag = (
+            4,
+            Weapons._4x_SB_M_71_120kg_GP_Bomb_High_drag,
+        )
+        Drop_tank_1100_litres = (4, Weapons.Drop_tank_1100_litres)
+        AN_AAQ_28_LITENING___Targeting_Pod_ = (
+            4,
+            Weapons.AN_AAQ_28_LITENING___Targeting_Pod_,
+        )
+
+    # ERRR <CLEAN>
+
+    class Pylon5:
+        AN_AAQ_28_LITENING___Targeting_Pod_ = (
+            5,
+            Weapons.AN_AAQ_28_LITENING___Targeting_Pod_,
+        )
+
+    # ERRR <CLEAN>
+
+    class Pylon6:
+        IRIS_T_IR_AAM = (6, Weapons.IRIS_T_IR_AAM)
+        Meteor_AMRAAM___Active_Radar_AAM = (6, Weapons.Meteor_AMRAAM___Active_Radar_AAM)
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
+            6,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C_8_AMRAAM___Active_Radar_AAM = (
+            6,
+            Weapons.AIM_120C_8_AMRAAM___Active_Radar_AAM,
+        )
+        GBU_12___500lb_Laser_Guided_Bomb = (6, Weapons.GBU_12___500lb_Laser_Guided_Bomb)
+        GBU_49___500lb_Laser__GPS_Guided_Bomb_LD = (
+            6,
+            Weapons.GBU_49___500lb_Laser__GPS_Guided_Bomb_LD,
+        )
+        GBU_39_SDB_285_lb_Guided_Glide_Bomb = (
+            6,
+            Weapons.GBU_39_SDB_285_lb_Guided_Glide_Bomb,
+        )
+        BK_90_MJ12__12x_MJ2_HEAT___36x_MJ1_HE_FRAG_Bomblets_ = (
+            6,
+            Weapons.BK_90_MJ12__12x_MJ2_HEAT___36x_MJ1_HE_FRAG_Bomblets_,
+        )
+        BK_90_MJ1__72_x_MJ1_HE_FRAG_Bomblets_ = (
+            6,
+            Weapons.BK_90_MJ1__72_x_MJ1_HE_FRAG_Bomblets_,
+        )
+        BK_90_MJ2__24_x_MJ2_HEAT_Bomblets_ = (
+            6,
+            Weapons.BK_90_MJ2__24_x_MJ2_HEAT_Bomblets_,
+        )
+        Rb_75A__AGM_65A_Maverick___TV_ASM_ = (
+            6,
+            Weapons.Rb_75A__AGM_65A_Maverick___TV_ASM_,
+        )
+        Rb_75B__AGM_65B_Maverick___TV_ASM_ = (
+            6,
+            Weapons.Rb_75B__AGM_65B_Maverick___TV_ASM_,
+        )
+        Rb_75T__AGM_65A_Maverick___TV_ASM_Lg_HE_Whd_ = (
+            6,
+            Weapons.Rb_75T__AGM_65A_Maverick___TV_ASM_Lg_HE_Whd_,
+        )
+        Taurus_KEPD_350_ALCM = (6, Weapons.Taurus_KEPD_350_ALCM)
+        _4x_SB_M_71_120kg_GP_Bomb_Low_drag = (
+            6,
+            Weapons._4x_SB_M_71_120kg_GP_Bomb_Low_drag,
+        )
+        _4x_SB_M_71_120kg_GP_Bomb_High_drag = (
+            6,
+            Weapons._4x_SB_M_71_120kg_GP_Bomb_High_drag,
+        )
+        ARAK_M_70B_HE_6x_135mm_UnGd_Rkts__Shu70_HE_FRAG = (
+            6,
+            Weapons.ARAK_M_70B_HE_6x_135mm_UnGd_Rkts__Shu70_HE_FRAG,
+        )
+        ARAK_M_70B_AP_6x_135mm_UnGd_Rkts__Pshu70_HEAT = (
+            6,
+            Weapons.ARAK_M_70B_AP_6x_135mm_UnGd_Rkts__Pshu70_HEAT,
+        )
+        RBS_15_Mk4 = (6, Weapons.RBS_15_Mk4)
+        Drop_tank_1100_litres = (6, Weapons.Drop_tank_1100_litres)
+
+    # ERRR <CLEAN>
+
+    class Pylon7:
+        IRIS_T_IR_AAM = (7, Weapons.IRIS_T_IR_AAM)
+        Meteor_AMRAAM___Active_Radar_AAM = (7, Weapons.Meteor_AMRAAM___Active_Radar_AAM)
+        AIM_120B_AMRAAM___Active_Radar_AAM = (
+            7,
+            Weapons.AIM_120B_AMRAAM___Active_Radar_AAM,
+        )
+        AIM_120C_8_AMRAAM___Active_Radar_AAM = (
+            7,
+            Weapons.AIM_120C_8_AMRAAM___Active_Radar_AAM,
+        )
+        GBU_12___500lb_Laser_Guided_Bomb = (7, Weapons.GBU_12___500lb_Laser_Guided_Bomb)
+        GBU_49___500lb_Laser__GPS_Guided_Bomb_LD = (
+            7,
+            Weapons.GBU_49___500lb_Laser__GPS_Guided_Bomb_LD,
+        )
+        GBU_39_SDB_285_lb_Guided_Glide_Bomb = (
+            7,
+            Weapons.GBU_39_SDB_285_lb_Guided_Glide_Bomb,
+        )
+        Rb_75A__AGM_65A_Maverick___TV_ASM_ = (
+            7,
+            Weapons.Rb_75A__AGM_65A_Maverick___TV_ASM_,
+        )
+        Rb_75B__AGM_65B_Maverick___TV_ASM_ = (
+            7,
+            Weapons.Rb_75B__AGM_65B_Maverick___TV_ASM_,
+        )
+        Rb_75T__AGM_65A_Maverick___TV_ASM_Lg_HE_Whd_ = (
+            7,
+            Weapons.Rb_75T__AGM_65A_Maverick___TV_ASM_Lg_HE_Whd_,
+        )
+        _4x_SB_M_71_120kg_GP_Bomb_Low_drag = (
+            7,
+            Weapons._4x_SB_M_71_120kg_GP_Bomb_Low_drag,
+        )
+        _4x_SB_M_71_120kg_GP_Bomb_High_drag = (
+            7,
+            Weapons._4x_SB_M_71_120kg_GP_Bomb_High_drag,
+        )
+        ARAK_M_70B_HE_6x_135mm_UnGd_Rkts__Shu70_HE_FRAG = (
+            7,
+            Weapons.ARAK_M_70B_HE_6x_135mm_UnGd_Rkts__Shu70_HE_FRAG,
+        )
+        ARAK_M_70B_AP_6x_135mm_UnGd_Rkts__Pshu70_HEAT = (
+            7,
+            Weapons.ARAK_M_70B_AP_6x_135mm_UnGd_Rkts__Pshu70_HEAT,
+        )
+
+    # ERRR <CLEAN>
+
+    class Pylon8:
+        IRIS_T_IR_AAM = (8, Weapons.IRIS_T_IR_AAM)
+
+    pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8}
+
+    tasks = [
+        task.CAP,
+        task.Escort,
+        task.FighterSweep,
+        task.Intercept,
+        task.AFAC,
+        task.SEAD,
+        task.AntishipStrike,
+        task.CAS,
+        task.PinpointStrike,
+        task.GroundAttack,
+        task.RunwayAttack,
+    ]
+    task_default = task.CAP

qt_ui/uiconstants.py

@@ -228,6 +228,8 @@ def load_aircraft_icons():
     AIRCRAFT_ICONS["CH_Tu-95MSM"] = AIRCRAFT_ICONS["CH_Tu-95"]
     AIRCRAFT_ICONS["CH_Tu-160M2"] = AIRCRAFT_ICONS["CH_Tu-16"]
     AIRCRAFT_ICONS["B-21"] = AIRCRAFT_ICONS["B"]
+    AIRCRAFT_ICONS["CH_JAS39C"] = AIRCRAFT_ICONS["CH_JAS"]
+    AIRCRAFT_ICONS["HKP15B"] = AIRCRAFT_ICONS["HKP"]
 
 
 def load_vehicle_icons():

resources/customized_payloads/CH_JAS39C.lua

@@ -0,0 +1,434 @@
+local unitPayloads = {
+	["name"] = "CH_JAS39C",
+	["payloads"] = {
+		[1] = {
+			["displayName"] = "Retribution OCA/Runway",
+			["name"] = "Retribution OCA/Runway",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 8,
+				},
+				[2] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{CH_GBU49}",
+					["num"] = 2,
+					["settings"] = {
+						["NFP_PRESID"] = "MDRN_B_A_PGM_TAILONLY",
+						["NFP_PRESVER"] = 1,
+						["NFP_fuze_type_tail"] = "FMU139CB_LD",
+						["arm_delay_ctrl_FMU139CB_LD"] = 4,
+						["function_delay_ctrl_FMU139CB_LD"] = 0,
+					},
+				},
+				[4] = {
+					["CLSID"] = "{CH_GBU49}",
+					["num"] = 7,
+					["settings"] = {
+						["NFP_PRESID"] = "MDRN_B_A_PGM_TAILONLY",
+						["NFP_PRESVER"] = 1,
+						["NFP_fuze_type_tail"] = "FMU139CB_LD",
+						["arm_delay_ctrl_FMU139CB_LD"] = 4,
+						["function_delay_ctrl_FMU139CB_LD"] = 0,
+					},
+				},
+				[5] = {
+					["CLSID"] = "{CH_GBU49}",
+					["num"] = 6,
+					["settings"] = {
+						["NFP_PRESID"] = "MDRN_B_A_PGM_TAILONLY",
+						["NFP_PRESVER"] = 1,
+						["NFP_fuze_type_tail"] = "FMU139CB_LD",
+						["arm_delay_ctrl_FMU139CB_LD"] = 4,
+						["function_delay_ctrl_FMU139CB_LD"] = 0,
+					},
+				},
+				[6] = {
+					["CLSID"] = "{CH_GBU49}",
+					["num"] = 3,
+					["settings"] = {
+						["NFP_PRESID"] = "MDRN_B_A_PGM_TAILONLY",
+						["NFP_PRESVER"] = 1,
+						["NFP_fuze_type_tail"] = "FMU139CB_LD",
+						["arm_delay_ctrl_FMU139CB_LD"] = 4,
+						["function_delay_ctrl_FMU139CB_LD"] = 0,
+					},
+				},
+				[7] = {
+					["CLSID"] = "{CH_JAS39C_Tank1100}",
+					["num"] = 4,
+				},
+				[8] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 5,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[2] = {
+			["displayName"] = "Retribution BARCAP",
+			["name"] = "Retribution BARCAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 8,
+				},
+				[2] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{CH_Meteor}",
+					["num"] = 2,
+				},
+				[4] = {
+					["CLSID"] = "{CH_Meteor}",
+					["num"] = 7,
+				},
+				[5] = {
+					["CLSID"] = "{CH_Meteor}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "{CH_Meteor}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{CH_JAS39C_Tank1100}",
+					["num"] = 4,
+				},
+				[8] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 5,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[3] = {
+			["displayName"] = "Retribution TARCAP",
+			["name"] = "Retribution TARCAP",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 8,
+				},
+				[2] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{CH_Meteor}",
+					["num"] = 2,
+				},
+				[4] = {
+					["CLSID"] = "{CH_Meteor}",
+					["num"] = 7,
+				},
+				[5] = {
+					["CLSID"] = "{CH_Meteor}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "{CH_Meteor}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{CH_JAS39C_Tank1100}",
+					["num"] = 4,
+				},
+				[8] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 5,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[4] = {
+			["displayName"] = "Retribution DEAD",
+			["name"] = "Retribution DEAD",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 8,
+				},
+				[2] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{CH_Meteor}",
+					["num"] = 2,
+				},
+				[4] = {
+					["CLSID"] = "{CH_Meteor}",
+					["num"] = 7,
+				},
+				[5] = {
+					["CLSID"] = "{CH_KEPD350}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "{CH_KEPD350}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{CH_JAS39C_Tank1100}",
+					["num"] = 4,
+				},
+				[8] = {
+					["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
+					["num"] = 5,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[5] = {
+			["displayName"] = "Retribution OCA/Aircraft",
+			["name"] = "Retribution OCA/Aircraft",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 8,
+				},
+				[2] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{CH_GBU49}",
+					["num"] = 2,
+					["settings"] = {
+						["NFP_PRESID"] = "MDRN_B_A_PGM_TAILONLY",
+						["NFP_PRESVER"] = 1,
+						["NFP_fuze_type_tail"] = "FMU139CB_LD",
+						["arm_delay_ctrl_FMU139CB_LD"] = 4,
+						["function_delay_ctrl_FMU139CB_LD"] = 0,
+					},
+				},
+				[4] = {
+					["CLSID"] = "{CH_GBU49}",
+					["num"] = 7,
+					["settings"] = {
+						["NFP_PRESID"] = "MDRN_B_A_PGM_TAILONLY",
+						["NFP_PRESVER"] = 1,
+						["NFP_fuze_type_tail"] = "FMU139CB_LD",
+						["arm_delay_ctrl_FMU139CB_LD"] = 4,
+						["function_delay_ctrl_FMU139CB_LD"] = 0,
+					},
+				},
+				[5] = {
+					["CLSID"] = "{CH_GBU49}",
+					["num"] = 6,
+					["settings"] = {
+						["NFP_PRESID"] = "MDRN_B_A_PGM_TAILONLY",
+						["NFP_PRESVER"] = 1,
+						["NFP_fuze_type_tail"] = "FMU139CB_LD",
+						["arm_delay_ctrl_FMU139CB_LD"] = 4,
+						["function_delay_ctrl_FMU139CB_LD"] = 0,
+					},
+				},
+				[6] = {
+					["CLSID"] = "{CH_GBU49}",
+					["num"] = 3,
+					["settings"] = {
+						["NFP_PRESID"] = "MDRN_B_A_PGM_TAILONLY",
+						["NFP_PRESVER"] = 1,
+						["NFP_fuze_type_tail"] = "FMU139CB_LD",
+						["arm_delay_ctrl_FMU139CB_LD"] = 4,
+						["function_delay_ctrl_FMU139CB_LD"] = 0,
+					},
+				},
+				[7] = {
+					["CLSID"] = "{CH_JAS39C_Tank1100}",
+					["num"] = 4,
+				},
+				[8] = {
+					["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
+					["num"] = 5,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[6] = {
+			["displayName"] = "Retribution CAS",
+			["name"] = "Retribution CAS",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 8,
+				},
+				[2] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{RB75T}",
+					["num"] = 2,
+				},
+				[4] = {
+					["CLSID"] = "{RB75T}",
+					["num"] = 7,
+				},
+				[5] = {
+					["CLSID"] = "{CH_GBU39}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "{CH_GBU39}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{CH_JAS39C_Tank1100}",
+					["num"] = 4,
+				},
+				[8] = {
+					["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
+					["num"] = 5,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[7] = {
+			["displayName"] = "Retribution BAI",
+			["name"] = "Retribution BAI",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 8,
+				},
+				[2] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{RB75T}",
+					["num"] = 2,
+				},
+				[4] = {
+					["CLSID"] = "{RB75T}",
+					["num"] = 7,
+				},
+				[5] = {
+					["CLSID"] = "{RB75T}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "{RB75T}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{CH_JAS39C_Tank1100}",
+					["num"] = 4,
+				},
+				[8] = {
+					["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
+					["num"] = 5,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[8] = {
+			["displayName"] = "Retribution Escort",
+			["name"] = "Retribution Escort",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 8,
+				},
+				[2] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{CH_Meteor}",
+					["num"] = 2,
+				},
+				[4] = {
+					["CLSID"] = "{CH_Meteor}",
+					["num"] = 7,
+				},
+				[5] = {
+					["CLSID"] = "{CH_Meteor}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "{CH_Meteor}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{CH_JAS39C_Tank1100}",
+					["num"] = 4,
+				},
+				[8] = {
+					["CLSID"] = "<CLEAN>",
+					["num"] = 5,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+		[9] = {
+			["displayName"] = "Retribution Anti-ship",
+			["name"] = "Retribution Anti-ship",
+			["pylons"] = {
+				[1] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 8,
+				},
+				[2] = {
+					["CLSID"] = "{CH_IRIS-T}",
+					["num"] = 1,
+				},
+				[3] = {
+					["CLSID"] = "{CH_Meteor}",
+					["num"] = 2,
+				},
+				[4] = {
+					["CLSID"] = "{CH_Meteor}",
+					["num"] = 7,
+				},
+				[5] = {
+					["CLSID"] = "{CH_RBS15MK4}",
+					["num"] = 6,
+				},
+				[6] = {
+					["CLSID"] = "{CH_RBS15MK4}",
+					["num"] = 3,
+				},
+				[7] = {
+					["CLSID"] = "{CH_JAS39C_Tank1100}",
+					["num"] = 4,
+				},
+				[8] = {
+					["CLSID"] = "{A111396E-D3E8-4b9c-8AC9-2432489304D5}",
+					["num"] = 5,
+				},
+			},
+			["tasks"] = {
+				[1] = 11,
+			},
+		},
+	},
+	["tasks"] = {
+	},
+	["unitType"] = "CH_JAS39C",
+}
+return unitPayloads

resources/factions/blufor_current.json

@@ -64,13 +64,14 @@
     "Marder 1A3",
     "Merkava Mk IV",
     "VAB Mephisto",
-    "Strf 9040 IFV",
+    "[CH] Strf 9040B IFV",
-    "Lvkv 9040 SPAAG",
+    "[CH] Lvkv 9040B SPAAG",
-    "Strv 2000 T140/40 MBT",
+    "[CH] Strv 2000 T140/40 MBT",
+    "[CH] BvS 10 ATV",
     "Leopard 2A4",
     "Leopard 2A5",
-    "BV 410",
+    "[CH] BvS 10 ATV",
-    "BV 410 RBS 90",
+    "[CH] RBS 90 VSHORAD LN",
     "[CH] LAV-AD SPAAGM",
     "[CH] M10 LT",
     "[CH] M1A2 SEPv3 MBT",
@@ -84,8 +85,6 @@
   "artillery_units": [
     "M109A6 Paladin",
     "M270 Multiple Launch Rocket System",
-    "Grkpbv 90 SPM",
-    "Artillerisystem 08 SPG",
     "[CH] M270A1 MLRS (GMLRS)",
     "[CH] M777 LTH M795",
     "[CH] M777 LTH M982 Excalibur",
@@ -93,7 +92,10 @@
     "[CH] M777 LTH M795 (MTVR)",
     "[CH] M270A1 MLRS (GLSDB)",
     "[CH] M142 HIMARS (GLSDB)",
-    "[CH] M142 HIMARS (AGMLRS)"
+    "[CH] M142 HIMARS (AGMLRS)",
+    "[CH] Grkpbv 90 SPM",
+    "[CH] Archer SPG SGR77B",
+    "[CH] Archer SPG M982 Excalibur"
   ],
   "logistics_units": [
     "Truck M818 6x6",
@@ -107,16 +109,6 @@
     "Infantry M249",
     "Infantry M4",
     "MANPADS Stinger",
-    "Soldier Ak 4",
-    "Soldier Ak 5",
-    "Soldier Ak 5 Granattillsats",
-    "Soldier Ksp 58",
-    "Soldier Ksp 90",
-    "Ag 90 Sniper team",
-    "Soldier Pskott 86",
-    "Soldier RBS 57 ATGM",
-    "Soldier RBS 58 ATGM",
-    "RBS 90 EldE 90 Stationary SAM LN",
     "[CH] FGM-148 ATGM Soldier",
     "[CH] FIM-92K Stinger Soldier",
     "[CH] M120 120 mm Mortar",
@@ -127,7 +119,17 @@
     "[CH] M4 AR Soldier",
     "[CH] M4/M203 AR/GL Soldier",
     "[CH] M82 AMR Soldier",
-    "[CH] Mk19 AGL Soldier"
+    "[CH] Mk19 AGL Soldier",
+    "[CH] Ak 4 Soldier",
+    "[CH] Ak 5 Soldier",
+    "[CH] Ak 5 Granattillsats Soldier",
+    "[CH] Ksp 58 Soldier",
+    "[CH] Ksp 90 Soldier",
+    "[CH] Ag 90 Sniper AMR",
+    "[CH] Pskott 86 Soldier",
+    "[CH] RBS 57 ATGM Soldier",
+    "[CH] RBS 58 ATGM",
+    "[CH] RBS 90 VSHORAD LN"
   ],
   "preset_groups": [
     "Hawk",
@@ -157,8 +159,8 @@
     "L61 Juan Carlos I",
     "F100 Álvaro de Bazán",
     "F105 Cristobal Colon",
-    "HSwMS Visby Corvette",
+    "[CH] Visby Class Corvette",
-    "Strb 90 FAC",
+    "[CH] Strb 90 FAC",
     "[CH] Arleigh Burke Flight IIA Destroyer",
     "[CH] Arleigh Burke Flight III Destroyer",
     "[CH] Constellation Frigate",
@@ -178,7 +180,7 @@
     "HEMTT C-RAM Phalanx",
     "M1097 Heavy HMMWV Avenger",
     "SAM Hawk SR (AN/MPQ-50)",
-    "SAM UndE 23 (RBS 70/90/98) STR",
+    "[CH] UndE 23 (RBS 70/90/98) STR",
     "[CH] Centurion C-RAM",
     "[CH] LAV-AD SPAAGM"
   ],

resources/factions/sweden_1997.json

@@ -10,6 +10,8 @@
     "AJS-37 Viggen",
     "JAS 39 Gripen",
     "JAS 39 Gripen A/G",
+    "[CH] JAS 39C Gripen",
+    "[CH] HKP15B",
     "UH-1H Iroquois"
   ],
   "awacs": [
@@ -20,36 +22,36 @@
     "KC-130J"
   ],
   "frontline_units": [
-    "Strf 9040 IFV",
+    "[CH] Strf 9040B IFV",
-    "Lvkv 9040 SPAAG",
+    "[CH] Strv 103 MBT",
-    "Strv 103 MBT",
+    "[CH] Strv 2000 T140/40 MBT",
-    "Strv 2000 T140/40 MBT",
+    "[CH] Ikv 91 LT",
+    "[CH] Strf 9040C IFV",
     "Leopard 2A4",
     "Leopard 2A5",
-    "BV 410",
+    "[CH] Volvo 740 Improvised fighting vehicle"
-    "BV 410 RBS 90",
-    "Volvo 740 with KSP 58 7.62mm"
   ],
   "artillery_units": [
-    "Grkpbv 90 SPM",
+    "[CH] Grkpbv 90 SPM",
-    "Haubits 77 AD SPG"
+    "[CH] Archer SPG M982 Excalibur"
   ],
   "air_defense_units": [
     "SAM Hawk SR (AN/MPQ-50)",
-    "SAM UndE 23 (RBS 70/90/98) STR"
+    "[CH] UndE 23 (RBS 70/90/98) STR",
+    "[CH] Lvkv 9040B SPAAG"
   ],
   "logistics_units": [
     "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Soldier Ak 4",
+    "[CH] Ak 4 Soldier",
-    "Soldier Ak 5",
+    "[CH] Ak 5 Soldier",
-    "Soldier Ak 5 Granattillsats",
+    "[CH] Ak 5 Granattillsats Soldier",
-    "Soldier Ksp 58",
+    "[CH] Ksp 58 Soldier",
-    "Soldier Ksp 90",
+    "[CH] Ksp 90 Soldier",
-    "Ag 90 Sniper team",
+    "[CH] Ag 90 Sniper AMR",
-    "Soldier Pskott 86",
+    "[CH] Pskott 86 Soldier",
-    "RBS 90 EldE 90 Stationary SAM LN"
+    "[CH] RBS 90 VSHORAD LN"
   ],
   "preset_groups": [
     "RBS-15",
@@ -58,8 +60,8 @@
     "Hawk"
   ],
   "naval_units": [
-    "HSwMS Visby Corvette",
+    "[CH] Visby Class Corvette",
-    "Strb 90 FAC"
+    "[CH] Strb 90 FAC"
   ],
   "missiles": [],
   "requirements": {

resources/factions/sweden_2002.json

@@ -10,6 +10,8 @@
     "AJS-37 Viggen",
     "JAS 39 Gripen",
     "JAS 39 Gripen A/G",
+    "[CH] JAS 39C Gripen",
+    "[CH] HKP15B",
     "UH-1H Iroquois"
   ],
   "awacs": [
@@ -23,6 +25,8 @@
     "FV510 Warrior",
     "Leopard 2A4",
     "M1097 Heavy HMMWV Avenger",
+    "[CH] Ikv 91 LT",
+    "[CH] Strf 9040C IFV",
     "M1126 Stryker ICV (M2 HMG)"
   ],
   "artillery_units": [],
@@ -43,7 +47,8 @@
   "missiles": [],
   "air_defense_units": [
     "SAM Hawk SR (AN/MPQ-50)",
-    "M1097 Heavy HMMWV Avenger"
+    "M1097 Heavy HMMWV Avenger",
+    "[CH] Lvkv 9040B SPAAG"
   ],
   "requirements": {
     "JAS39 Gripen Mod by Community": "https://github.com/whisky-actual/Community-JAS-39-C"

resources/factions/sweden_2020.json

@@ -10,6 +10,8 @@
     "AJS-37 Viggen",
     "JAS 39 Gripen",
     "JAS 39 Gripen A/G",
+    "[CH] JAS 39C Gripen",
+    "[CH] HKP15B",
     "UH-1H Iroquois",
     "UH-60L"
   ],
@@ -21,37 +23,42 @@
     "KC-130J"
   ],
   "frontline_units": [
-    "Strf 9040 IFV",
+    "[CH] Strf 9040B IFV",
-    "Lvkv 9040 SPAAG",
+    "[CH] Strv 2000 T140/40 MBT",
-    "Strv 2000 T140/40 MBT",
+    "[CH] Ikv 91 LT",
+    "[CH] Sisu GTP APC",
+    "[CH] Strf 9040C IFV",
+    "[CH] Strv 122 MBT",
+    "[CH] Strv 123 MBT",
     "Leopard 2A4",
     "Leopard 2A5",
-    "BV 410",
+    "[CH] BvS 10 ATV",
-    "BV 410 RBS 90",
+    "[CH] Volvo 740 Improvised fighting vehicle"
-    "Volvo 740 with KSP 58 7.62mm"
   ],
   "artillery_units": [
-    "Grkpbv 90 SPM",
+    "[CH] Grkpbv 90 SPM",
-    "Artillerisystem 08 SPG"
+    "[CH] Archer SPG SGR77B",
+    "[CH] Archer SPG M982 Excalibur"
   ],
   "air_defense_units": [
     "SAM Hawk SR (AN/MPQ-50)",
-    "SAM UndE 23 (RBS 70/90/98) STR"
+    "[CH] UndE 23 (RBS 70/90/98) STR",
+    "[CH] Lvkv 9040B SPAAG"
   ],
   "logistics_units": [
     "Truck M818 6x6"
   ],
   "infantry_units": [
-    "Soldier Ak 4",
+    "[CH] Ak 4 Soldier",
-    "Soldier Ak 5",
+    "[CH] Ak 5 Soldier",
-    "Soldier Ak 5 Granattillsats",
+    "[CH] Ak 5 Granattillsats Soldier",
-    "Soldier Ksp 58",
+    "[CH] Ksp 58 Soldier",
-    "Soldier Ksp 90",
+    "[CH] Ksp 90 Soldier",
-    "Ag 90 Sniper team",
+    "[CH] Ag 90 Sniper AMR",
-    "Soldier Pskott 86",
+    "[CH] Pskott 86 Soldier",
-    "Soldier RBS 57 ATGM",
+    "[CH] RBS 57 ATGM Soldier",
-    "Soldier RBS 58 ATGM",
+    "[CH] RBS 58 ATGM",
-    "RBS 90 EldE 90 Stationary SAM LN"
+    "[CH] RBS 90 VSHORAD LN"
   ],
   "preset_groups": [
     "RBS-15",
@@ -65,8 +72,8 @@
     "Hawk"
   ],
   "naval_units": [
-    "HSwMS Visby Corvette",
+    "[CH] Visby Class Corvette",
-    "Strb 90 FAC"
+    "[CH] Strb 90 FAC"
   ],
   "missiles": [],
   "requirements": {

resources/groups/LvS-103_Rb103A.yaml

@@ -2,10 +2,10 @@ name: LvS-103 Rb103A
 tasks:
   - LORAD
 units:
-  - SAM LvS-103 PM 103 Stationary STR
+  - "[CH] LvS-103 PM 103 STR"
-  - SAM LvS-103 StriE 103 Mobile ECS
+  - "[CH] LvS-103 StriE 103 ECS (HX)"
-  - SAM LvS-103 Elverk 103 Mobile EPP
+  - "[CH] LvS-103 Elverk 103 EPP (HX)"
-  - SAM LvS-103 Lavett 103 Rb103A Stationary LN
+  - "[CH] LvS-103 Lavett 103 Rb103A LN"
-  - SAM LvS-103 Lavett 103 Rb103B Stationary LN
+  - "[CH] LvS-103 Lavett 103 Rb103B LN"
 layouts:
   - LvS-103A Battery

resources/groups/LvS-103_Rb103A_Mobile.yaml

@@ -2,10 +2,10 @@ name: LvS-103 Rb103A Mobile
 tasks:
   - LORAD
 units:
-  - SAM LvS-103 PM 103 Mobile STR
+  - "[CH] LvS-103 PM 103 STR (HX)"
-  - SAM LvS-103 StriE 103 Mobile ECS
+  - "[CH] LvS-103 StriE 103 ECS (HX)"
-  - SAM LvS-103 Elverk 103 Mobile EPP
+  - "[CH] LvS-103 Elverk 103 EPP (HX)"
-  - SAM LvS-103 Lavett 103 Rb103A Mobile LN
+  - "[CH] LvS-103 Lavett 103 Rb103A LN (HX)"
-  - SAM LvS-103 Lavett 103 Rb103B Mobile LN
+  - "[CH] LvS-103 Lavett 103 Rb103B LN (HX)"
 layouts:
   - LvS-103A Mobile Battery

resources/groups/LvS-103_Rb103B.yaml

@@ -2,9 +2,9 @@ name: LvS-103 Rb103B
 tasks:
   - MERAD
 units:
-  - SAM LvS-103 PM 103 Stationary STR
+  - "[CH] LvS-103 PM 103 STR"
-  - SAM LvS-103 StriE 103 Mobile ECS
+  - "[CH] LvS-103 StriE 103 ECS (HX)"
-  - SAM LvS-103 Elverk 103 Mobile EPP
+  - "[CH] LvS-103 Elverk 103 EPP (HX)"
-  - SAM LvS-103 Lavett 103 Rb103B Stationary LN
+  - "[CH] LvS-103 Lavett 103 Rb103B LN"
 layouts:
   - LvS-103B Battery

resources/groups/LvS-103_Rb103B_Mobile.yaml

@@ -2,9 +2,9 @@ name: LvS-103 Rb103B Mobile
 tasks:
   - MERAD
 units:
-  - SAM LvS-103 PM 103 Mobile STR
+  - "[CH] LvS-103 PM 103 STR (HX)"
-  - SAM LvS-103 StriE 103 Mobile ECS
+  - "[CH] LvS-103 StriE 103 ECS (HX)"
-  - SAM LvS-103 Elverk 103 Mobile EPP
+  - "[CH] LvS-103 Elverk 103 EPP (HX)"
-  - SAM LvS-103 Lavett 103 Rb103B Mobile LN
+  - "[CH] LvS-103 Lavett 103 Rb103B LN (HX)"
 layouts:
   - LvS-103B Mobile Battery

resources/groups/RBS-15.yaml

@@ -2,7 +2,7 @@ name: RBS-15
 tasks:
   - Coastal
 units:
-  - AShM RBS 15KA
+  - "[CH] RBS 15KA LBASM"
-  - SAM UndE 23 (RBS 70/90/98) STR
+  - "[CH] UndE 23 (RBS 70/90/98) STR"
 layouts:
   - Silkworm

resources/groups/RBS-70.yaml

@@ -2,9 +2,8 @@ name: RBS-70
 tasks:
   - SHORAD
 units:
-  - RBS 70 EldE 70 Stationary SAM LN
+  - "[CH] RBS 70 VSHORAD LN"
-  - BV 410 RBS 70
+  - "[CH] UndE 23 (RBS 70/90/98) STR"
-  - SAM UndE 23 (RBS 70/90/98) STR
 layouts:
   - 6 Launcher Site (Semicircle)
   - 6 Launcher Site (Circle)

resources/groups/RBS-90.yaml

@@ -2,8 +2,7 @@ name: RBS-90
 tasks:
   - SHORAD
 units:
-  - RBS 90 EldE 90 Stationary SAM LN
+  - "[CH] RBS 90 VSHORAD LN"
-  - BV 410 RBS 90
+  - "[CH] UndE 23 (RBS 70/90/98) STR"
-  - SAM UndE 23 (RBS 70/90/98) STR
 layouts:
   - 2 Launcher Site

resources/groups/RBS-98.yaml

@@ -2,8 +2,8 @@ name: RBS-98
 tasks:
   - SHORAD
 units:
-  - RBS 98 EldE 98 Mobile SAM LN
+  - "[CH] RBS 98 SAM LN (BvS 10)"
-  - SAM UndE 23 (RBS 70/90/98) STR
+  - "[CH] UndE 23 (RBS 70/90/98) STR"
 layouts:
   - 6 Launcher Site (Semicircle)
   - 6 Launcher Site (Circle)

resources/layouts/anti_air/LvS-103B_Battery.yaml

@@ -9,6 +9,8 @@ groups:
       unit_types:
         - LvS-103_PM103
     - name: Patriot Battery 1
+      optional: true # Allow groups without SHORAD
+      fill: false # Do not fill with faction possible units
       unit_count:
         - 1
       unit_classes:
@@ -19,6 +21,8 @@ groups:
       unit_types:
         - LvS-103_StriE103
     - name: Patriot Battery 3
+      optional: true # Allow groups without SHORAD
+      fill: false # Do not fill with faction possible units
       unit_count:
         - 1
       unit_classes:

resources/layouts/anti_air/LvS-103B_Mobile_Battery.yaml

@@ -9,6 +9,8 @@ groups:
       unit_types:
         - LvS-103_PM103_HX
     - name: Patriot Battery 1
+      optional: true # Allow groups without SHORAD
+      fill: false # Do not fill with faction possible units
       unit_count:
         - 1
       unit_classes:
@@ -19,6 +21,8 @@ groups:
       unit_types:
         - LvS-103_StriE103
     - name: Patriot Battery 3
+      optional: true # Allow groups without SHORAD
+      fill: false # Do not fill with faction possible units
       unit_count:
         - 1
       unit_classes:

resources/units/aircraft/CH_JAS39C.yaml

@@ -0,0 +1,26 @@
+description:
+  The Saab JAS 39 Gripen is a light single-engine multirole fighter aircraft
+  manufactured by the Swedish aerospace company Saab AB. The Gripen has a delta wing
+  and canard configuration with relaxed stability design and fly-by-wire flight controls.
+  Various versions have been built, grouped as A-, C- and E-series.
+introduced: 2002
+manufacturer: Saab AB
+origin: Sweden
+price: 21
+role: Fighter
+variants:
+  "[CH] JAS 39C Gripen": {}
+tasks:
+  BAI: 750
+  DEAD: 750
+  CAS: 750
+  BARCAP: 430
+  Escort: 430
+  Fighter sweep: 430
+  Intercept: 430
+  OCA/Aircraft: 750
+  OCA/Runway: 610
+  SEAD: 750
+  SEAD Escort: 750
+  Strike: 610
+  TARCAP: 430

resources/units/aircraft/HKP15B.yaml

@@ -0,0 +1,15 @@
+description: "The AgustaWestland HKP 15B, originally the Agusta A109, is a lightweight, 
+  twin-engine, eight-seat multi-purpose helicopter designed and initially produced by the 
+  Italian rotorcraft manufacturer Agusta. It was the first all-Italian helicopter to be 
+  mass-produced. Its production has been continued by Agusta's successor companies, 
+  presently Leonardo (formerly AgustaWestland, merged into the new Finmeccanica since 2016)."
+introduced: 1971
+manufacturer: Agusta
+origin: Italy
+role: Transport
+price: 5
+variants:
+  "[CH] HKP15B": null
+tasks:
+  Air Assault: 50
+  Transport: 90

resources/units/ground_units/AG-90.yaml

@@ -4,3 +4,4 @@ spawn_weight: 1
 variants:
   Ag 90 Sniper team: null
   M82A1 Barrett Light 50 Sniper team: null
+  "[CH] Ag 90 Sniper AMR": null

resources/units/ground_units/Artillerisystem08_M982.yaml

@@ -12,3 +12,4 @@ role: Self-Propelled Gun
 variants:
   Artillerisystem 08 SPG: {}
   Haubits 77 AD SPG: {}
+  "[CH] Archer SPG M982 Excalibur": {}

resources/units/ground_units/Artillerisystem08_SGR77B.yaml

@@ -0,0 +1,13 @@
+class: Artillery
+description: The Archer Artillery System or Artillerisystem 08 is a
+  self-propelled gun system of Sweden. The main piece of the system is
+  a fully automated 155 mm/L52 gun howitzer and a M151 Protector remote
+  controlled weapon station mounted on a modified 6x6 chassis of the
+  Volvo A30D all-terrain articulated hauler.
+introduced: 2016
+manufacturer: Bofors
+origin: Sweden
+price: 25
+role: Self-Propelled Gun
+variants:
+  "[CH] Archer SPG SGR77B": {}

resources/units/ground_units/BV410_RBS70.yaml

@@ -1,14 +0,0 @@
-class: Launcher
-description: Man-portable air defense system used for very short distances.
-  Primarily used against slow and low flying attack aircraft or helicopters.
-  
-  Transported by BV 410, a tracked all-terrain armoured vehicle.
-  
-  Works together with the UndE 23 search and track radar.
-introduced: 2013
-manufacturer: Bofors / BAE Systems Hägglunds
-origin: Sweden
-price: 16
-role: Self-Propelled Surface-to-Air Missile Launcher
-variants:
-  BV 410 RBS 70: {}

resources/units/ground_units/BV410_RBS90.yaml

@@ -1,15 +0,0 @@
-class: SHORAD
-description: Man-portable air defense system used for very short distances.
-  Primarily used against slow and low flying attack aircraft or helicopters.
-  
-  Transported by BV 410, a tracked all-terrain armoured vehicle.
-  
-  Works together with the UndE 23 search and track radar,
-  but will function standalone.
-introduced: 2013
-manufacturer: Bofors / BAE Systems Hägglunds
-origin: Sweden
-price: 18
-role: Self-Propelled Surface-to-Air Missile Launcher
-variants:
-  BV 410 RBS 90: {}

resources/units/ground_units/CH_BVS10.yaml

@@ -7,3 +7,4 @@ price: 6
 role: Armoured Personnel Carrier
 variants:
   BV 410: {}
+  "[CH] BvS 10 ATV": {}

resources/units/ground_units/CH_CV9050.yaml

@@ -0,0 +1,11 @@
+class: IFV
+description: The Combat Vehicle 90 (CV90), Swedish Stridsfordon 90 (Strf 90),
+  is a family of Swedish tracked armored combat vehicles. The original CV9040
+  model carries eight soldiers and is equipped with a 50 mm Bofors autocannon.
+introduced: 1993
+manufacturer: Försvarets Materielverk, Hägglunds and Bofors
+origin: Sweden
+price: 10
+role: Infantry Fighting Vehicle
+variants:
+  "[CH] CV 9050 IFV": {}

resources/units/ground_units/CH_Ikv91.yaml

@@ -0,0 +1,12 @@
+class: IFV
+description: "The infanterikanonvagn 91 (ikv 91), was a high 
+  mobility assault gun that was developed to meet the operational requirements of the Swedish 
+  Army. It was designed and manufactured by \x48\xC3\xA4\x67\x67\x6C\x75\x6E\x64\x20\x26\x20\x53\xC3\xB6\x6E\x65\x72 and employed common components 
+  with the Pbv 302 armoured personnel carrier series."
+introduced: 1975
+manufacturer: \x48\xC3\xA4\x67\x67\x6C\x75\x6E\x64\x20\x26\x20\x53\xC3\xB6\x6E\x65\x72
+origin: Sweden
+price: 10
+role: Infantry Fighting Vehicle
+variants:
+  "[CH] Ikv 91 LT": {}

resources/units/ground_units/CH_SisuGTP.yaml

@@ -0,0 +1,11 @@
+class: APC
+description: "The Sisu GTP is a Finnish made four-wheeled, 
+  modular mine-resistant ambush protected armoured personnel carrier (APC) 
+  designed and built by Sisu Auto. The first version was produced in 2018."
+introduced: 2022
+manufacturer: Sisu Auto
+origin: Sweden
+price: 6
+role: Armoured Personnel Carrier
+variants:
+  "[CH] Sisu GTP APC": {}

resources/units/ground_units/CH_Strf9040C.yaml

@@ -0,0 +1,11 @@
+class: IFV
+description: The Combat Vehicle 90 (CV90), Swedish Stridsfordon 90 (Strf 90),
+  is a family of Swedish tracked armored combat vehicles. The original CV9040
+  model carries eight soldiers and is equipped with a 40 mm Bofors autocannon.
+introduced: 1993
+manufacturer: Försvarets Materielverk, Hägglunds and Bofors
+origin: Sweden
+price: 10
+role: Infantry Fighting Vehicle
+variants:
+  "[CH] Strf 9040C IFV": {}

resources/units/ground_units/CH_Strv122.yaml

@@ -0,0 +1,13 @@
+class: Tank
+description: "Stridsvagn 122 is a Swedish main battle tank that, like the German Leopard 2A5, 
+  is based on the German Leopard 2 Improved variant utilizing such newer technology as command, 
+  control, and fire-control systems, reinforced armour, and long-term combat capacity. 
+  Externally, the vehicle is distinguished from the Leopard 2A5 by the French GALIX smoke 
+  dispensers, different storage bins, and the thicker crew hatches."
+introduced: 2025
+manufacturer: Krauss-Maffei Wegmann
+origin: Sweden
+price: 25
+role: Main Battle Tank
+variants:
+  "[CH] Strv 122 MBT": {}

resources/units/ground_units/CH_Strv123.yaml

@@ -0,0 +1,13 @@
+class: Tank
+description: "Stridsvagn 122 is a Swedish main battle tank that, like the German Leopard 2A5, 
+  is based on the German Leopard 2 Improved variant utilizing such newer technology as command, 
+  control, and fire-control systems, reinforced armour, and long-term combat capacity. 
+  Externally, the vehicle is distinguished from the Leopard 2A5 by the French GALIX smoke 
+  dispensers, different storage bins, and the thicker crew hatches."
+introduced: 2025
+manufacturer: Krauss-Maffei Wegmann
+origin: Sweden
+price: 25
+role: Main Battle Tank
+variants:
+  "[CH] Strv 123 MBT": {}

resources/units/ground_units/CV9040.yaml

@@ -10,3 +10,4 @@ role: Infantry Fighting Vehicle
 variants:
   Strf 9040 IFV: {}
   CV9040 IFV: {}
+  "[CH] Strf 9040B IFV": {}

resources/units/ground_units/Grkpbv90.yaml

@@ -11,3 +11,4 @@ price: 15
 role: Self-Propelled Gun
 variants:
   Grkpbv 90 SPM: {}
+  "[CH] Grkpbv 90 SPM": {}

resources/units/ground_units/LvKv9040.yaml

@@ -10,3 +10,4 @@ price: 24
 role: Self-Propelled Anti-Aircraft Gun
 variants:
   Lvkv 9040 SPAAG: {}
+  "[CH] Lvkv 9040B SPAAG": {}

resources/units/ground_units/LvS-103_Elverk103.yaml

@@ -2,3 +2,4 @@ class: Power
 price: 15
 variants:
   SAM LvS-103 Elverk 103 Mobile EPP: null
+  "[CH] LvS-103 Elverk 103 EPP (HX)": null

resources/units/ground_units/LvS-103_Lavett103_HX_Rb103A.yaml

@@ -8,3 +8,4 @@ description: Long range air defense launcher.
 price: 15
 variants:
   SAM LvS-103 Lavett 103 Rb103A Mobile LN: null
+  "[CH] LvS-103 Lavett 103 Rb103A LN (HX)": null

resources/units/ground_units/LvS-103_Lavett103_HX_Rb103B.yaml

@@ -9,3 +9,4 @@ description: Medium range air defense launcher.
 price: 8
 variants:
   SAM LvS-103 Lavett 103 Rb103B Mobile LN: null
+  "[CH] LvS-103 Lavett 103 Rb103B LN (HX)": null

resources/units/ground_units/LvS-103_Lavett103_Rb103A.yaml

@@ -8,3 +8,4 @@ description: Long range air defense launcher.
 price: 15
 variants:
   SAM LvS-103 Lavett 103 Rb103A Stationary LN: null
+  "[CH] LvS-103 Lavett 103 Rb103A LN": null

resources/units/ground_units/LvS-103_Lavett103_Rb103B.yaml

@@ -9,3 +9,4 @@ description: Medium range air defense launcher.
 price: 8
 variants:
   SAM LvS-103 Lavett 103 Rb103B Stationary LN: null
+  "[CH] LvS-103 Lavett 103 Rb103B LN": null

resources/units/ground_units/LvS-103_PM103.yaml

@@ -2,6 +2,7 @@ class: SearchRadar
 price: 22
 variants:
   SAM LvS-103 PM 103 Stationary STR: null
+  "[CH] LvS-103 PM 103 STR": null
 skynet_properties: # Override skynet default properties
   can_engage_harm: true
   # can_engage_air_weapon: true # https://github.com/walder/Skynet-IADS/tree/develop#engage-air-weapons

resources/units/ground_units/LvS-103_PM103_HX.yaml

@@ -2,6 +2,7 @@ class: SearchRadar
 price: 22
 variants:
   SAM LvS-103 PM 103 Mobile STR: null
+  "[CH] LvS-103 PM 103 STR (HX)": null
 skynet_properties: # Override skynet default properties
   can_engage_harm: true
   # can_engage_air_weapon: true # https://github.com/walder/Skynet-IADS/tree/develop#engage-air-weapons

resources/units/ground_units/LvS-103_StriE103.yaml

@@ -2,3 +2,4 @@ class: TrackRadar
 price: 30
 variants:
   SAM LvS-103 StriE 103 Mobile ECS: null
+  "[CH] LvS-103 StriE 103 ECS (HX)": null

resources/units/ground_units/RBS-15KA.yaml

@@ -2,3 +2,4 @@ class: AntiShipMissile
 price: 0
 variants:
   AShM RBS 15KA: null
+  "[CH] RBS 15KA LBASM": null

resources/units/ground_units/RBS-57.yaml

@@ -4,3 +4,4 @@ spawn_weight: 1
 variants:
   Soldier RBS 57 ATGM: null
   Soldier NLAW ATGM: null
+  "[CH] RBS 57 ATGM Soldier": null

resources/units/ground_units/RBS-58.yaml

@@ -3,3 +3,4 @@ price: 0
 spawn_weight: 1
 variants:
   Soldier RBS 58 ATGM: null
+  "[CH] RBS 58 ATGM": null

resources/units/ground_units/RBS-70.yaml

@@ -10,3 +10,4 @@ price: 15
 role: Surface-to-Air Missile Launcher
 variants:
   RBS 70 EldE 70 Stationary SAM LN: {}
+  "[CH] RBS 70 VSHORAD LN": {}

resources/units/ground_units/RBS-90.yaml

@@ -1,5 +1,5 @@
 class: Manpad
-spawn_weight: 1
+spawn_weight: 5
 description: Man-portable air defense system used for very short distances.
   Primarily used against slow and low flying attack aircraft or helicopters.
   
@@ -12,3 +12,4 @@ price: 17
 role: Surface-to-Air Missile Launcher
 variants:
   RBS 90 EldE 90 Stationary SAM LN: {}
+  "[CH] RBS 90 VSHORAD LN": {}

resources/units/ground_units/RBS-98.yaml

@@ -11,3 +11,4 @@ price: 20
 role: Self-Propelled Surface-to-Air Missile Launcher
 variants:
   RBS 98 EldE 98 Mobile SAM LN: {}
+  "[CH] RBS 98 SAM LN (BvS 10)": {}

resources/units/ground_units/Strv103.yaml

@@ -14,3 +14,4 @@ price: 18
 role: Main Battle Tank
 variants:
   Strv 103 MBT: {}
+  "[CH] Strv 103 MBT": {}

resources/units/ground_units/Strv2000.yaml

@@ -10,3 +10,4 @@ price: 22
 role: Main Battle Tank
 variants:
   Strv 2000 T140/40 MBT: {}
+  "[CH] Strv 2000 T140/40 MBT": {}

resources/units/ground_units/SwedishinfantryAK4.yaml

@@ -1,6 +1,7 @@
 class: Infantry
 price: 0
-spawn_weight: 1
+spawn_weight: 5
 variants:
   Soldier Ak 4: null
   Soldier HK G3: null
+  "[CH] Ak 4 Soldier": null

resources/units/ground_units/SwedishinfantryAK5.yaml

@@ -1,5 +1,6 @@
 class: Infantry
 price: 0
-spawn_weight: 1
+spawn_weight: 5
 variants:
   Soldier Ak 5: null
+  "[CH] Ak 5 Soldier": null

resources/units/ground_units/SwedishinfantryAK5GT.yaml

@@ -3,3 +3,4 @@ price: 0
 spawn_weight: 1
 variants:
   Soldier Ak 5 Granattillsats: null
+  "[CH] Ak 5 Granattillsats Soldier": null

resources/units/ground_units/SwedishinfantryKSP58.yaml

@@ -3,3 +3,4 @@ price: 0
 spawn_weight: 1
 variants:
   Soldier Ksp 58: null
+  "[CH] Ksp 58 Soldier": null

resources/units/ground_units/SwedishinfantryKSP90.yaml

@@ -3,3 +3,4 @@ price: 0
 spawn_weight: 1
 variants:
   Soldier Ksp 90: null
+  "[CH] Ksp 90 Soldier": null

resources/units/ground_units/SwedishinfantryPskott86.yaml

@@ -4,3 +4,4 @@ spawn_weight: 1
 variants:
   Soldier Pskott 86: null
   Soldier AT-4: null
+  "[CH] Pskott 86 Soldier": null

resources/units/ground_units/UndE23.yaml

@@ -1,7 +1,8 @@
 class: SearchRadar
 price: 22
 variants:
-  SAM UndE 23 (RBS 70/90/98) STR: null
+  "SAM UndE 23 (RBS 70/90/98) STR"
+  "[CH] UndE 23 (RBS 70/90/98) STR": null
 skynet_properties: # Override skynet default properties
   can_engage_harm: true
   # can_engage_air_weapon: true # https://github.com/walder/Skynet-IADS/tree/develop#engage-air-weapons

resources/units/ground_units/Volvo740.yaml

@@ -3,3 +3,4 @@ price: 4
 role: Recon
 variants:
   Volvo 740 with KSP 58 7.62mm: {}
+  "[CH] Volvo 740 Improvised fighting vehicle": {}

resources/units/ships/HSwMS_Visby.yaml

@@ -2,3 +2,4 @@ class: Destroyer
 price: 0
 variants:
   HSwMS Visby Corvette: null
+  "[CH] Visby Class Corvette": null

resources/units/ships/Strb90.yaml

@@ -2,3 +2,4 @@ class: Destroyer
 price: 0
 variants:
   Strb 90 FAC: null
+  "[CH] Strb 90 FAC": null