DCS 55918 (#3401)

This PR adds support for DCS 2.9.5.55918. Some limited support for the
Kiowa Warrior is also implemented.

changelog.md

@@ -4,7 +4,7 @@ Saves from 11.0.0 are compatible with 11.1.0. See Known Issues section for excep
 
 ## Features/Improvements
 
-* **[Engine]** Support for DCS 2.9.5.55300 including Heatblur F-4E. 
+* **[Engine]** Support for DCS 2.9.5.55918 including Heatblur F-4E. 
 
 ## Fixes
 

game/dcs/aircrafttype.py

@@ -37,6 +37,7 @@ from game.radio.channels import (
     PhantomChannelNamer,
     HindChannelNamer,
     HipChannelNamer,
+    KiowaChannelNamer,
 )
 from game.utils import (
     Distance,
@@ -116,6 +117,7 @@ class RadioConfig:
             "phantom": PhantomChannelNamer,
             "hind": HindChannelNamer,
             "hip": HipChannelNamer,
+            "kiowa": KiowaChannelNamer,
         }[config.get("namer", "default")]
 
 

game/radio/channels.py

@@ -437,3 +437,16 @@ class HipChannelNamer(ChannelNamer):
     @classmethod
     def name(cls) -> str:
         return "hip"
+
+
+class KiowaChannelNamer(ChannelNamer):
+    """Channel namer for OH58D Kiowa Warrior"""
+
+    @staticmethod
+    def channel_name(radio_id: int, channel_id: int) -> str:
+        radio_name = ["UHF AM", "VHF AM", "VHF FM1", "VHF FM2"][radio_id - 1]
+        return f"{radio_name} Ch {channel_id}"
+
+    @classmethod
+    def name(cls) -> str:
+        return "kiowa"

game/radio/radios.py

@@ -160,6 +160,7 @@ RADIOS: List[Radio] = [
     Radio("AN/ARC-164", (RadioRange(MHz(225), MHz(400), MHz(1), Modulation.AM),)),
     Radio("AN/ARC-186(V) AM", (RadioRange(MHz(116), MHz(152), MHz(1), Modulation.AM),)),
     Radio("AN/ARC-186(V) FM", (RadioRange(MHz(30), MHz(76), MHz(1), Modulation.FM),)),
+    Radio("AN/ARC-201", (RadioRange(MHz(30), MHz(88), kHz(25), Modulation.FM),)),
     Radio(
         "AN/ARC-210",
         (

requirements.txt

@@ -36,7 +36,7 @@ pre-commit==3.5.0
 pydantic==2.5.2
 pydantic-settings==2.1.0
 pydantic_core==2.14.5
-pydcs @ git+https://github.com/dcs-liberation/dcs@b83c5a00bdda9719737ce61719a4d64a0dd4321c
+pydcs @ git+https://github.com/dcs-liberation/dcs@58b4cc91bfb068e094f684e4747190d1dcd57232
 pyinstaller==5.13.1
 pyinstaller-hooks-contrib==2023.6
 pyproj==3.6.1

resources/factions/NATO_Desert_Storm.yaml

@@ -25,6 +25,7 @@ aircrafts:
   - F/A-18C Hornet (Lot 20)
   - Mirage 2000C
   - OH-58D Kiowa Warrior
+  - OH-58D(R) Kiowa Warrior
   - S-3B Viking
   - SA 342L Gazelle
   - SA 342M Gazelle

resources/factions/NATO_OIF.yaml

@@ -25,6 +25,7 @@ aircrafts:
   - F/A-18C Hornet (Lot 20)
   - Mirage 2000C
   - OH-58D Kiowa Warrior
+  - OH-58D(R) Kiowa Warrior
   - S-3B Viking
   - SA 342L Gazelle
   - SA 342M Gazelle

resources/factions/bluefor_modern.yaml

@@ -45,6 +45,7 @@ aircrafts:
   - Mi-24P Hind-F
   - Mi-8MTV2 Hip
   - MiG-29S Fulcrum-C
+  - OH-58D(R) Kiowa Warrior
   - SA 342L Gazelle
   - SA 342M Gazelle
   - Su-25T Frogfoot

resources/factions/turkey_2005.yaml

@@ -13,6 +13,7 @@ aircrafts:
   - F-4E Phantom II
   - F-4E-45MC Phantom II
   - OH-58D Kiowa Warrior
+  - OH-58D(R) Kiowa Warrior
   - UH-1H Iroquois
   - UH-60A
   - UH-60L

resources/factions/usa_1990.yaml

@@ -23,6 +23,7 @@ aircrafts:
   - F-15E Strike Eagle (Suite 4+)
   - F-16CM Fighting Falcon (Block 50)
   - F/A-18C Hornet (Lot 20)
+  - OH-58D(R) Kiowa Warrior
   - S-3B Viking
   - SH-60B Seahawk
   - UH-1H Iroquois

resources/factions/usa_2005.yaml

@@ -26,6 +26,7 @@ aircrafts:
   - F-16CM Fighting Falcon (Block 50)
   - F-22A Raptor
   - F/A-18C Hornet (Lot 20)
+  - OH-58D(R) Kiowa Warrior
   - S-3B Viking
   - SH-60B Seahawk
   - UH-1H Iroquois

resources/units/aircraft/F-4E-45MC.yaml

@@ -51,3 +51,4 @@ tasks:
   SEAD Escort: 120
   Strike: 400
   TARCAP: 410
+hit_points: 20

resources/units/aircraft/OH58D.yaml

@@ -0,0 +1,35 @@
+class: Helicopter
+cabin_size: 0 # Can not transport troops
+can_carry_crates: false # Can not carry crates
+carrier_capable: true
+description:
+  The Bell OH-58D Kiowa Warrior is a family of single-engine, single-rotor, military
+  helicopters used for observation, utility, and direct fire support. Bell Helicopter
+  manufactured the OH-58 for the United States Army based on its Model 206A JetRanger
+  helicopter. The OH-58 was in continuous U.S. Army service from 1969 to 2017, when
+  it was replaced in these roles by the Boeing AH-64 Apache and Eurocopter UH-72 Lakota.
+  The latest model, the OH-58D Kiowa Warrior, is primarily operated in an armed reconnaissance
+  role in support of ground troops. The OH-58 has been exported to Austria, Canada,
+  Croatia, the Dominican Republic, Taiwan, Saudi Arabia, and Greece. It has also been
+  produced under license in Australia.
+introduced: 1983
+lha_capable: true
+manufacturer: Bell
+origin: USA
+price: 6
+role: Light Attack/Forward Air Control
+radios:
+  intra_flight: AN/ARC-164
+  inter_flight: AN/ARC-164
+  channels:
+    type: common
+    namer: kiowa
+    intra_flight_radio_index: 1
+    inter_flight_radio_index: 1
+variants:
+  OH-58D(R) Kiowa Warrior: {}
+tasks:
+  BAI: 470
+  CAS: 470
+  OCA/Aircraft: 470
+hit_points: 12