Add new units

2025-11-10 15:41:24 +00:00 · 2023-10-21 20:40:40 +02:00 · 2023-10-21 20:40:40 +02:00 · e3dcf8e547
commit e3dcf8e547
parent 9805c482c2
22 changed files with 52 additions and 7 deletions
--- a/game/ato/flight.py
+++ b/game/ato/flight.py
@ -114,7 +114,7 @@ class Flight(SidcDescribable, RadioFrequencyContainer, TacanContainer):
            for fm in self.roster.members:
                fm.loadout.pylons[F18_TGP_PYLON] = Weapon.with_clsid(
                    str(
-                        FA_18C_hornet.Pylon4.AN_AAQ_28_LITENING___Targeting_Pod_[1][
+                        FA_18C_hornet.Pylon4.AN_AAQ_28_LITENING___Targeting_Pod[1][
                            "clsid"
                        ]
                    )
--- a/resources/factions/NATO_OIF.json
+++ b/resources/factions/NATO_OIF.json
@ -92,6 +92,7 @@
    "EWR AN/FPS-117 Radar",
    "M163 Vulcan Air Defense System",
    "M1097 Heavy HMMWV Avenger",
+    "HEMTT C-RAM Phalanx",
    "M48 Chaparral"
  ],
  "requirements": {},
--- a/resources/factions/Syria-Lebanon_2005_Allied_Sword.json
+++ b/resources/factions/Syria-Lebanon_2005_Allied_Sword.json
@ -56,7 +56,7 @@
    "SA-6",
    "SA-11",
    "SA-10/S-300PS",
-    "Silkworm",
+    "SA-10/S-300PS Mobile",    "Silkworm",
    "Cold-War-Flak",
    "Russian Navy",
    "KS-19/SON-9"
--- a/resources/factions/australia_2005.json
+++ b/resources/factions/australia_2005.json
@ -45,7 +45,8 @@
  ],
  "missiles": [],
  "air_defense_units": [
-    "SAM Hawk SR (AN/MPQ-50)"
+    "SAM Hawk SR (AN/MPQ-50)",
+    "HEMTT C-RAM Phalanx"
  ],
  "requirements": {
    "C-130J-30 Super Hercules Mod by Anubis": "https://forums.eagle.ru/topic/252075-dcs-super-hercules-mod-by-anubis/"
--- a/resources/factions/bluefor_modern.json
+++ b/resources/factions/bluefor_modern.json
@ -115,6 +115,7 @@
    "EWR AN/FPS-117 Radar",
    "Flakpanzer Gepard",
    "M163 Vulcan Air Defense System",
+    "HEMTT C-RAM Phalanx",
    "M1097 Heavy HMMWV Avenger"
  ],
  "requirements": {},
--- a/resources/factions/china_2010.json
+++ b/resources/factions/china_2010.json
@ -53,7 +53,7 @@
    "SA-11",
    "HQ-7",
    "SA-10/S-300PS",
-    "SA-20B/S-300PMU-2",
+    "SA-10/S-300PS Mobile",    "SA-20B/S-300PMU-2",
    "Silkworm",
    "Chinese Navy"
  ],
--- a/resources/factions/egypt_2010s.json
+++ b/resources/factions/egypt_2010s.json
@ -79,6 +79,7 @@
  "air_defense_units": [
    "EWR 1L13",
    "EWR 55G6",
+    "HEMTT C-RAM Phalanx",
    "SAM SA-5 S-200 ST-68U \"Tin Shield\" SR",
    "SAM SA-8 Osa \"Gecko\" TEL",
    "SA-9 Strela",
--- a/resources/factions/india_2010.json
+++ b/resources/factions/india_2010.json
@ -65,6 +65,7 @@
    "SA-13 Gopher (9K35 Strela-10M3)",
    "SA-19 Grison (2K22 Tunguska)",
    "AAA ZU-23 Closed Emplacement",
+    "HEMTT C-RAM Phalanx",
    "ZU-23 on Ural-375",
    "ZSU-23-4 Shilka"
  ],
--- a/resources/factions/israel_2012.json
+++ b/resources/factions/israel_2012.json
@ -66,6 +66,7 @@
  "air_defense_units": [
    "SAM Hawk SR (AN/MPQ-50)",
    "M163 Vulcan Air Defense System",
+    "HEMTT C-RAM Phalanx",
    "M48 Chaparral"
  ],
  "requirements": {},
--- a/resources/factions/japan_2005.json
+++ b/resources/factions/japan_2005.json
@ -56,6 +56,7 @@
  "missiles": [],
  "air_defense_units": [
    "EWR AN/FPS-117 Radar",
+    "HEMTT C-RAM Phalanx",
    "Flakpanzer Gepard"
  ],
  "requirements": {},
--- a/resources/factions/us_aggressors.json
+++ b/resources/factions/us_aggressors.json
@ -70,6 +70,7 @@
  "missiles": [],
  "air_defense_units": [
    "EWR AN/FPS-117 Radar",
+    "HEMTT C-RAM Phalanx",
    "M1097 Heavy HMMWV Avenger"
  ],
  "requirements": {},
--- a/resources/factions/usa_2005.json
+++ b/resources/factions/usa_2005.json
@ -91,6 +91,7 @@
  "air_defense_units": [
    "EWR AN/FPS-117 Radar",
    "M1097 Heavy HMMWV Avenger",
+    "HEMTT C-RAM Phalanx",
    "M6 Linebacker"
  ],
  "requirements": {},
--- a/resources/factions/usn_2005.json
+++ b/resources/factions/usn_2005.json
@ -58,6 +58,7 @@
  "air_defense_units": [
    "SAM Hawk SR (AN/MPQ-50)",
    "M163 Vulcan Air Defense System",
+    "HEMTT C-RAM Phalanx",
    "M48 Chaparral"
  ],
  "requirements": {},
--- a/resources/factions/wrl_taskforceblue.json
+++ b/resources/factions/wrl_taskforceblue.json
@ -163,6 +163,7 @@
  "air_defense_units": [
    "SAM Patriot STR",
    "M163 Vulcan Air Defense System",
+    "HEMTT C-RAM Phalanx",
    "M1097 Heavy HMMWV Avenger",
    "M48 Chaparral"
  ],
--- a/resources/factions/wrl_taskforcemixed.json
+++ b/resources/factions/wrl_taskforcemixed.json
@ -187,6 +187,7 @@
    "EWR 55G6",
    "EWR AN/FPS-117 Radar",
    "Flakpanzer Gepard",
+    "HEMTT C-RAM Phalanx",
    "SAM SA-8 Osa \"Gecko\" TEL",
    "SA-9 Strela",
    "SA-13 Gopher (9K35 Strela-10M3)",
--- a/resources/groups/SA-10.yaml
+++ b/resources/groups/SA-10.yaml
@ -3,9 +3,11 @@ tasks:
  - LORAD
 units:
  - SAM SA-10 S-300 "Grumble" Clam Shell SR
+  - SAM SA-10 S-300 "Grumble" Tin Shield SR
  - SAM SA-10 S-300 "Grumble" Big Bird SR
  - SAM SA-10 S-300 "Grumble" C2
  - SAM SA-10 S-300 "Grumble" Flap Lid TR
+  - SAM SA-10 S-300 "Grumble" Flap Lid-B TR
  - SAM SA-10 S-300 "Grumble" TEL D
  - SAM SA-10 S-300 "Grumble" TEL C
 layouts:
--- a/resources/layouts/anti_air/S-300_Site.yaml
+++ b/resources/layouts/anti_air/S-300_Site.yaml
@ -7,7 +7,8 @@ groups:
      unit_count:
        - 1
      unit_types:
-        - S-300PS 40B6MD sr # SA-10
+        - S-300PS 40B6MD sr # SA-10 Clam Shell SR
+        - S-300PS 40B6MD sr_19J6 # SA-10 Tin Shield SR
        - S-300PS SA-10B 40B6MD MAST sr # SA-10B
        - S-300V 9S15 sr # SA-12
        - S-300PMU1 40B6MD sr # SA-20 + B, is the 5N66E
@ -16,7 +17,8 @@ groups:
      unit_count:
        - 1
      unit_types:
-        - S-300PS 64H6E sr # SA-10
+        - S-300PS 64H6E sr # SA-10 Flap Lid-A TR
+        - S-300PS 40B6MD sr_19J6 # SA-10 Tin Shield SR
        - S-300PS 64H6E TRAILER sr # SA-10B
        - S-300V 9S19 sr # SA-12
        - S-300PMU1 64N6E sr # SA-20 + B
@ -35,8 +37,9 @@ groups:
      unit_count:
        - 1
      unit_types:
-        - S-300PS 40B6M tr # SA-10
+        - S-300PS 40B6M tr # SA-10 Flap Lid-A TR
        - S-300PS 30N6 TRAILER tr # SA-10B
+        - S-300PS 5H63C 30H6_tr # SA-10 Flap Lid-B TR
        - S-300V 9S32 tr # SA-12
        - S-300PMU1 40B6M tr # SA-20, is the 30N6E!
        - S-300PMU2 92H6E tr # SA-20B
--- a/resources/units/aircraft/Mirage-F1BE.yaml
+++ b/resources/units/aircraft/Mirage-F1BE.yaml
@ -11,6 +11,14 @@ role: Fighter
 max_range: 200
 variants:
  Mirage-F1BE: {}
+radios:
+  intra_flight: UHF TRAP 137B
+  inter_flight: V/UHF TRAP 136
+  channels:
+    type: common
+    namer: mirage-f1ce
+    intra_flight_radio_index: 2
+    inter_flight_radio_index: 1
 tasks:
  BAI: 330
  BARCAP: 320
--- a/resources/units/ground_units/HEMTT_C-RAM_Phalanx.yaml
+++ b/resources/units/ground_units/HEMTT_C-RAM_Phalanx.yaml
@ -0,0 +1,11 @@
+class: AAA
+description: "Counter rocket, artillery, and mortar, abbreviated C-RAM or counter-RAM, is a set of
+ systems used to detect and/or destroy incoming rockets, artillery, and mortar rounds in the air
+  before they hit their ground targets, or simply provide early warning."
+introduced: 2005
+manufacturer: General Electric
+origin: USA
+price: 14
+role: Self-Propelled Anti-Aircraft Gun
+variants:
+  HEMTT C-RAM Phalanx: {}
--- a/resources/units/ground_units/S-300PS
+++ b/resources/units/ground_units/S-300PS
@ -2,3 +2,4 @@ class: TrackRadar
 price: 24
 variants:
  SAM SA-10 S-300 "Grumble" Flap Lid TR: null
+  SAM SA-10 S-300 "Grumble" Flap Lid-A TR: null
--- a/resources/units/ground_units/S-300PS
+++ b/resources/units/ground_units/S-300PS
@ -0,0 +1,4 @@
+class: SpecializedRadar
+price: 30
+variants:
+  SAM SA-10 S-300 "Grumble" Tin Shield SR: null
--- a/resources/units/ground_units/S-300PS
+++ b/resources/units/ground_units/S-300PS
@ -0,0 +1,4 @@
+class: TrackRadar
+price: 24
+variants:
+  SAM SA-10 S-300 "Grumble" Flap Lid-B TR: null