Merge branch 'dcs-liberation:develop' into develop

gen/sam/ewr_group_generator.py

@@ -18,6 +18,7 @@ from gen.sam.ewrs import (
     StraightFlushGenerator,
     TallRackGenerator,
     EwrGenerator,
+    TinShieldGenerator,
 )
 
 EWR_MAP = {
@@ -31,6 +32,7 @@ EWR_MAP = {
     "SnowDriftGenerator": SnowDriftGenerator,
     "StraightFlushGenerator": StraightFlushGenerator,
     "HawkEwrGenerator": HawkEwrGenerator,
+    "TinShieldGenerator": TinShieldGenerator,
 }
 
 

gen/sam/ewrs.py

@@ -102,3 +102,9 @@ class HawkEwrGenerator(EwrGenerator):
     """
 
     unit_type = AirDefence.Hawk_sr
+
+
+class TinShieldGenerator(EwrGenerator):
+    """19ZH6 "Tin Shield" EWR."""
+
+    unit_type = AirDefence.RLS_19J6

gen/sam/sam_group_generator.py

@@ -28,6 +28,7 @@ from gen.sam.sam_gepard import GepardGenerator
 from gen.sam.sam_hawk import HawkGenerator
 from gen.sam.sam_hq7 import HQ7Generator
 from gen.sam.sam_linebacker import LinebackerGenerator
+from gen.sam.sam_nasams import NasamBGenerator, NasamCGenerator
 from gen.sam.sam_patriot import PatriotGenerator
 from gen.sam.sam_rapier import RapierGenerator
 from gen.sam.sam_roland import RolandGenerator
@@ -100,6 +101,8 @@ SAM_MAP: Dict[str, Type[AirDefenseGroupGenerator]] = {
     "SA20Generator": SA20Generator,
     "SA20BGenerator": SA20BGenerator,
     "SA23Generator": SA23Generator,
+    "NasamBGenerator": NasamBGenerator,
+    "NasamCGenerator": NasamCGenerator,
 }
 
 

gen/sam/sam_nasams.py

@@ -0,0 +1,68 @@
+from typing import Type
+
+from dcs.mapping import Point
+from dcs.unittype import VehicleType
+from dcs.vehicles import AirDefence
+
+from game import Game
+from game.theater import SamGroundObject
+from gen.sam.airdefensegroupgenerator import (
+    AirDefenseRange,
+    AirDefenseGroupGenerator,
+)
+
+
+class NasamCGenerator(AirDefenseGroupGenerator):
+    """
+    This generate a Nasams group with AIM-120C missiles
+    """
+
+    name = "NASAMS AIM-120C"
+
+    def __init__(self, game: Game, ground_object: SamGroundObject):
+        super().__init__(game, ground_object)
+        self.launcherType: Type[VehicleType] = AirDefence.NASAMS_LN_C
+
+    def generate(self) -> None:
+        # Command Post
+        self.add_unit(
+            AirDefence.NASAMS_Command_Post,
+            "CP",
+            self.position.x + 30,
+            self.position.y + 30,
+            self.heading,
+        )
+        # Radar
+        self.add_unit(
+            AirDefence.NASAMS_Radar_MPQ64F1,
+            "RADAR",
+            self.position.x - 30,
+            self.position.y - 30,
+            self.heading,
+        )
+
+        positions = self.get_circular_position(4, launcher_distance=120, coverage=360)
+        for i, position in enumerate(positions):
+            self.add_unit(
+                self.launcherType,
+                "LN#" + str(i),
+                position[0],
+                position[1],
+                position[2],
+            )
+
+    @classmethod
+    def range(cls) -> AirDefenseRange:
+        return AirDefenseRange.Medium
+
+
+class NasamBGenerator(NasamCGenerator):
+    """
+    This generate a Nasams group with AIM-120B missiles
+    """
+
+    name = "NASAMS AIM-120B"
+
+    def __init__(self, game: Game, ground_object: SamGroundObject):
+        super().__init__(game, ground_object)
+        self.launcherType: Type[VehicleType] = AirDefence.NASAMS_LN_B

resources/factions/gdr_1985.json

@@ -52,7 +52,8 @@
     "ZU23Generator"
   ],
   "ewrs": [
-    "FlatFaceGenerator"
+    "FlatFaceGenerator",
+    "TinShieldGenerator"
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [],
@@ -66,4 +67,4 @@
   "navy_generators": [],
   "has_jtac": true,
   "jtac_unit": "Mi-8MTV2 Hip"
-}
+}

resources/factions/india_2010.json

@@ -57,7 +57,8 @@
   ],
   "ewrs": [
     "BoxSpringGenerator",
-    "TallRackGenerator"
+    "TallRackGenerator",
+    "TinShieldGenerator"
   ],
   "aircraft_carrier": [
     "KUZNECOW"
@@ -78,4 +79,4 @@
   ],
   "has_jtac": true,
   "jtac_unit": "MQ-9 Reaper"
-}
+}

resources/factions/iran_1988.json

@@ -53,7 +53,8 @@
     "ColdWarFlakGenerator"
   ],
   "ewrs": [
-    "TallRackGenerator"
+    "TallRackGenerator",
+    "TinShieldGenerator"
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [],
@@ -81,4 +82,4 @@
   "has_jtac": true,
   "jtac_unit": "MQ-9 Reaper",
   "doctrine": "coldwar"
-}
+}

resources/factions/iran_2015.json

@@ -65,7 +65,8 @@
     "ZU23UralGenerator"
   ],
   "ewrs": [
-    "TallRackGenerator"
+    "TallRackGenerator",
+    "TinShieldGenerator"
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [],
@@ -93,4 +94,4 @@
   ],
   "has_jtac": true,
   "jtac_unit": "MQ-9 Reaper"
-}
+}

resources/factions/libya_2011.json

@@ -53,7 +53,8 @@
   ],
   "ewrs": [
     "BoxSpringGenerator",
-    "TallRackGenerator"
+    "TallRackGenerator",
+    "TinShieldGenerator"
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [],
@@ -75,4 +76,4 @@
     "MolniyaGroupGenerator",
     "LaCombattanteIIGroupGenerator"
   ]
-}
+}

resources/factions/north_korea_2000.json

@@ -57,7 +57,8 @@
   ],
   "ewrs": [
     "BoxSpringGenerator",
-    "TallRackGenerator"
+    "TallRackGenerator",
+    "TinShieldGenerator"
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [],
@@ -75,4 +76,4 @@
     "MolniyaGroupGenerator"
   ],
   "has_jtac": false
-}
+}

resources/factions/russia_1970_limited_air.json

@@ -48,7 +48,8 @@
     "ZU23UralGenerator"
   ],
   "ewrs": [
-    "FlatFaceGenerator"
+    "FlatFaceGenerator",
+    "TinShieldGenerator"
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [],
@@ -66,4 +67,4 @@
   ],
   "has_jtac": false,
   "doctrine": "coldwar"
-}
+}

resources/factions/russia_1975 (Mi-24P).json

@@ -63,7 +63,8 @@
     "ZU23UralGenerator"
   ],
   "ewrs": [
-    "FlatFaceGenerator"
+    "FlatFaceGenerator",
+    "TinShieldGenerator"
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [],

resources/factions/russia_1975.json

@@ -63,7 +63,8 @@
     "ZU23UralGenerator"
   ],
   "ewrs": [
-    "FlatFaceGenerator"
+    "FlatFaceGenerator",
+    "TinShieldGenerator"
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [],

resources/factions/russia_1990.json

@@ -73,7 +73,8 @@
   ],
   "ewrs": [
     "BoxSpringGenerator",
-    "TallRackGenerator"
+    "TallRackGenerator",
+    "TinShieldGenerator"
   ],
   "aircraft_carrier": [
     "KUZNECOW"
@@ -96,4 +97,4 @@
   ],
   "has_jtac": true,
   "jtac_unit": "MQ-9 Reaper"
-}
+}

resources/factions/syria_1982.json

@@ -54,7 +54,8 @@
     "ZSU57Generator"
   ],
   "ewrs": [
-    "BoxSpringGenerator"
+    "BoxSpringGenerator",
+    "TinShieldGenerator"
   ],
   "missiles": [
     "ScudGenerator"
@@ -70,4 +71,4 @@
   "navy_generators": [
     "GrishaGroupGenerator"
   ]
-}
+}

resources/factions/syria_2011.json

@@ -71,7 +71,8 @@
   ],
   "ewrs": [
     "BoxSpringGenerator",
-    "TallRackGenerator"
+    "TallRackGenerator",
+    "TinShieldGenerator"
   ],
   "missiles": [
     "ScudGenerator"
@@ -88,4 +89,4 @@
     "GrishaGroupGenerator",
     "MolniyaGroupGenerator"
   ]
-}
+}

resources/factions/syria_2012.json

@@ -73,7 +73,8 @@
   ],
   "ewrs": [
     "BoxSpringGenerator",
-    "TallRackGenerator"
+    "TallRackGenerator",
+    "TinShieldGenerator"
   ],
   "missiles": [
     "ScudGenerator"
@@ -90,4 +91,4 @@
     "GrishaGroupGenerator",
     "MolniyaGroupGenerator"
   ]
-}
+}

resources/factions/usa_2005.json

@@ -68,7 +68,8 @@
   "air_defenses": [
     "AvengerGenerator",
     "LinebackerGenerator",
-    "PatriotGenerator"
+    "PatriotGenerator",
+    "NasamCGenerator"
   ],
   "ewrs": [
     "PatriotEwrGenerator"
@@ -126,4 +127,4 @@
       "VMFA-323"
     ]
   }
-}
+}

resources/units/ground_units/NASAMS_Command_Post.yaml

@@ -0,0 +1,8 @@
+price: 18
+description: "NASAMS (National/Norwegian Advanced Surface to Air Missile System) is a distributed and networked medium to long range air-defence system.
+              NASAMS was the first surface-based application for the AIM-120 AMRAAM (Advanced Medium Range Air-to-Air Missile)."
+introduced: 1995
+manufacturer: Kongsberg Defence & Aerospace, Raytheon
+origin: Norway, USA
+variants:
+  SAM NASAMS C2: null

resources/units/ground_units/NASAMS_LN_B.yaml

@@ -0,0 +1,8 @@
+price: 15
+description: "NASAMS (National/Norwegian Advanced Surface to Air Missile System) is a distributed and networked medium to long range air-defence system.
+              NASAMS was the first surface-based application for the AIM-120 AMRAAM (Advanced Medium Range Air-to-Air Missile)."
+introduced: 1995
+manufacturer: Kongsberg Defence & Aerospace, Raytheon
+origin: Norway, USA
+variants:
+  SAM NASAMS LN AIM-120B: null

resources/units/ground_units/NASAMS_LN_C.yaml

@@ -0,0 +1,8 @@
+price: 20
+description: "NASAMS (National/Norwegian Advanced Surface to Air Missile System) is a distributed and networked medium to long range air-defence system.
+              NASAMS was the first surface-based application for the AIM-120 AMRAAM (Advanced Medium Range Air-to-Air Missile)."
+introduced: 1996
+manufacturer: Kongsberg Defence & Aerospace, Raytheon
+origin: Norway, USA
+variants:
+  SAM NASAMS LN AIM-120C: null

resources/units/ground_units/NASAMS_Radar_MPQ64F1.yaml

@@ -0,0 +1,8 @@
+price: 26
+description: "NASAMS (National/Norwegian Advanced Surface to Air Missile System) is a distributed and networked medium to long range air-defence system.
+              NASAMS was the first surface-based application for the AIM-120 AMRAAM (Advanced Medium Range Air-to-Air Missile)."
+introduced: 1995
+manufacturer: Kongsberg Defence & Aerospace, Raytheon
+origin: Norway, USA
+variants:
+  SAM NASAMS SR MPQ64F1: null

resources/units/ground_units/RLS_19J6.yaml

@@ -0,0 +1,3 @@
+price: 16
+variants:
+  SAM SA-5 S-200 ST-68U "Tin Shield" SR: null