Update README.md

Remove reference to DCS Stable and Open Beta as they are now merged.

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.55918 including Heatblur F-4E and Polychop OH-58D Kiowa Warrior support. 
+* **[Engine]** Support for DCS 2.9.5.55300 including Heatblur F-4E. 
 
 ## Fixes
 

game/campaignloader/mizcampaignloader.py

@@ -61,8 +61,6 @@ class MizCampaignLoader:
         AirDefence.Hawk_ln.id,
         AirDefence.S_75M_Volhov.id,
         AirDefence.X_5p73_s_125_ln.id,
-        AirDefence.NASAMS_LN_B.id,
-        AirDefence.NASAMS_LN_C.id,
     }
 
     SHORT_RANGE_SAM_UNIT_TYPES = {

game/dcs/aircrafttype.py

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

game/radio/channels.py

@@ -437,16 +437,3 @@ 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,7 +160,6 @@ 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@58b4cc91bfb068e094f684e4747190d1dcd57232
+pydcs @ git+https://github.com/dcs-liberation/dcs@b83c5a00bdda9719737ce61719a4d64a0dd4321c
 pyinstaller==5.13.1
 pyinstaller-hooks-contrib==2023.6
 pyproj==3.6.1

resources/customized_payloads/OH58D.lua

@@ -1,101 +0,0 @@
-local unitPayloads = {
-	["name"] = "OH58D",
-	["payloads"] = {
-		[1] = {
-			["name"] = "Liberation CAS",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "OH58D_AGM_114_R",
-					["num"] = 5,
-				},
-				[2] = {
-					["CLSID"] = "OH58D_M3P_L500",
-					["num"] = 1,
-				},
-			},
-			["tasks"] = {
-				[1] = 16,
-			},
-		},
-		[2] = {
-			["displayName"] = "Liberation DEAD",
-			["name"] = "Liberation DEAD",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "OH58D_AGM_114_R",
-					["num"] = 5,
-				},
-				[2] = {
-					["CLSID"] = "OH58D_AGM_114_L",
-					["num"] = 1,
-				},
-			},
-			["tasks"] = {
-				[1] = 16,
-			},
-		},
-		[3] = {
-			["displayName"] = "Liberation BAI",
-			["name"] = "Liberation BAI",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "OH58D_AGM_114_R",
-					["num"] = 5,
-				},
-				[2] = {
-					["CLSID"] = "{M260_APKWS_M151}",
-					["num"] = 1,
-				},
-			},
-			["tasks"] = {
-				[1] = 16,
-			},
-		},
-		[4] = {
-			["displayName"] = "Liberation OCA/Aircraft",
-			["name"] = "Liberation OCA/Aircraft",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "{M260_APKWS_M151}",
-					["num"] = 5,
-				},
-				[2] = {
-					["CLSID"] = "{M260_APKWS_M151}",
-					["num"] = 1,
-				},
-			},
-			["tasks"] = {
-				[1] = 16,
-			},
-		},
-		[5] = {
-			["displayName"] = "Liberation Escort",
-			["name"] = "Liberation Escort",
-			["pylons"] = {
-				[1] = {
-					["CLSID"] = "OH58D_AGM_114_R",
-					["num"] = 5,
-				},
-				[2] = {
-					["CLSID"] = "OH58D_FIM_92_L",
-					["num"] = 1,
-				},
-			},
-			["tasks"] = {
-				[1] = 16,
-			},
-		},
-	},
-	["tasks"] = {
-		[1] = 11,
-		[2] = 31,
-		[3] = 32,
-		[4] = 16,
-		[5] = 18,
-		[6] = 35,
-		[7] = 30,
-		[8] = 17,
-	},
-	["unitType"] = "OH58D",
-}
-return unitPayloads

resources/factions/NATO_Desert_Storm.yaml

@@ -25,7 +25,6 @@ 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,7 +25,6 @@ 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,7 +45,6 @@ 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,7 +13,6 @@ 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,7 +23,6 @@ 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,7 +26,6 @@ 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/squadrons/OH58D/AUS Army.yaml

@@ -1,13 +0,0 @@
----
-name: Australian Army
-country: Australia
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - AUS Army Fictional
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/DE Army.yaml

@@ -1,13 +0,0 @@
----
-name: German Army
-country: Germany
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - DE Army Fictional
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/ES Army.yaml

@@ -1,13 +0,0 @@
----
-name: Spanish Army
-country: Spain
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - ES Army Fictional
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/FR Army.yaml

@@ -1,13 +0,0 @@
----
-name: French Army
-country: France
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - FR Army Fictional
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/GR Army.yaml

@@ -1,13 +0,0 @@
----
-name: Greek Army
-country: Greece
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - GR Army Fictional
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/HR 393EH.yaml

@@ -1,29 +0,0 @@
----
-name: Croatian Air Force 393rd Helicopter Squadron
-nickname: Night Owls
-country: Croatia
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery_set:
-  - HR 393EH 321
-  - HR 393EH 322
-  - HR 393EH 323
-  - HR 393EH 324
-  - HR 393EH 325
-  - HR 393EH 326
-  - HR 393EH 327
-  - HR 393EH 328
-  - HR 393EH 329
-  - HR 393EH 330
-  - HR 393EH 331
-  - HR 393EH 332
-  - HR 393EH 333
-  - HR 393EH 334
-  - HR 393EH 335
-  - HR 393EH 336
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/ISR Army.yaml

@@ -1,13 +0,0 @@
----
-name: Israeli Army
-country: Israel
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - ISR Army Fictional
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/JPN Army.yaml

@@ -1,13 +0,0 @@
----
-name: Japanese Army
-country: Japan
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - JPN Army Fictional
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/NL Army.yaml

@@ -1,13 +0,0 @@
----
-name: Dutch Army
-country: Netherlands
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - NL Army Fictional
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/PL Army.yaml

@@ -1,13 +0,0 @@
----
-name: Polish Army
-country: Poland
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - PL Army Fictional
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/RU Army.yaml

@@ -1,13 +0,0 @@
----
-name: Russian Army
-country: Russia
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - RU Army Fictional
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/TN ANG 1-230.yaml

@@ -1,16 +0,0 @@
----
-name: Tennessee National Guard 1-230th Air Cavalry Squadron
-nickname: Pink Fuzzy Bunnies of Death
-female_pilot_percentage: 10
-country: USA
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery_set:
-  - US Tennessee ANG 1-230 113
-  - US Tennessee ANG 1-230 152
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/TUN Army.yaml

@@ -1,13 +0,0 @@
----
-name: Tunisian Army
-country: Tunisia
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - TUN Army
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/TWN Army.yaml

@@ -1,13 +0,0 @@
----
-name: Taiwanese Army
-country: Taiwan
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - TWN Army Fictional
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/UK Army Desert.yaml

@@ -1,13 +0,0 @@
----
-name: British Army Air Corps Desert
-country: UK
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - UK Army Fictional Desert
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/UK Army.yaml

@@ -1,13 +0,0 @@
----
-name: British Army Air Corps
-country: UK
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - UK Army Fictional
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/US 1-17 A.yaml

@@ -1,18 +0,0 @@
----
-name: US Army 17th Cavalry Regiment 3rd Squadron Troop C
-nickname: Crazy Horse
-female_pilot_percentage: 10
-country: USA
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery_set:
-  - US 3-17 C 001 Jasmine
-  - US 3-17 C 179 Presley Marie
-  - US 3-17 C 561 Ariel
-  - US 3-17 C 976 Jenny
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/US 1-17 B.yaml

@@ -1,16 +0,0 @@
----
-name: US Army 17th Cavalry Regiment 1st Squadron Troop B
-nickname: Bootleg
-female_pilot_percentage: 10
-country: USA
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery_set:
-  - US 1-17 B 024
-  - US 1-17 B 381
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/US 1-6 A.yaml

@@ -1,16 +0,0 @@
----
-name: US Army 6th Cavalry Regiment 1st Squadron Troop A
-nickname: Fighting Sixth
-female_pilot_percentage: 10
-country: USA
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery_set:
-  - US 1-6 A 161
-  - US 1-6 A 340
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/US 3-17 B.yaml

@@ -1,15 +0,0 @@
----
-name: US Army 17th Cavalry Regiment 3rd Squadron Troop B
-nickname: Blackjack
-female_pilot_percentage: 10
-country: USA
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery:
-  - US 3-17 B 937 Iraq
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/US 3-17 C.yaml

@@ -1,18 +0,0 @@
----
-name: US Army 17th Cavalry Regiment 3rd Squadron Troop C
-nickname: Crazy Horse
-female_pilot_percentage: 10
-country: USA
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery_set:
-  - US 3-17 C 001 Jasmine
-  - US 3-17 C 179 Presley Marie
-  - US 3-17 C 561 Ariel
-  - US 3-17 C 976 Jenny
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/US 6-17.yaml

@@ -1,17 +0,0 @@
----
-name: US Army 17th Cavalry Regiment 6th Squadron
-female_pilot_percentage: 10
-country: USA
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery_set:
-  - US 6-17 A 523 Iraq 2011
-  - US 6-17 A 571 Korea 2014
-  - US 6-17 B 366
-  - US 6-17 C 367
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/US 6-6.yaml

@@ -1,17 +0,0 @@
----
-name: US Army 6th Cavalry Regiment 6th Squadron
-nickname: Fighting Sixth
-female_pilot_percentage: 10
-country: USA
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery_set:
-  - US 6-6 C 179
-  - US 6-6 C 587
-  - US 6-6 C 971
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

resources/squadrons/OH58D/US 7-17 A.yaml

@@ -1,18 +0,0 @@
----
-name: US Army 17th Cavalry Regiment 7th Squadron Troop A
-nickname: Shadow
-female_pilot_percentage: 10
-country: USA
-role: Light Attack and Scout Helicopter
-aircraft: OH-58D(R) Kiowa Warrior
-livery_set:
-  - US 7-17 A 014 Bugs
-  - US 7-17 A 039 Lola
-  - US 7-17 A 964 Marvin
-  - US -17 A 604 Taz
-mission_types:
-  - BAI
-  - CAS
-  - DEAD
-  - Escort
-  - OCA/Aircraft

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

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

resources/units/aircraft/OH58D.yaml

@@ -1,37 +0,0 @@
-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
-  DEAD: 50
-  Escort: 10
-hit_points: 12