Merge branch 'develop' into patch-4

changelog.md

@@ -4,6 +4,8 @@ Saves from 10.x are not compatible with 11.0.0.
 
 ## Features/Improvements
 
+* **[Engine]** Support for DCS 2.9.3.51704 Open Beta. 
+
 ## Fixes
 
 # 10.0.0

requirements.txt

@@ -20,7 +20,7 @@ httptools==0.6.1
 identify==2.5.32
 idna==3.6
 iniconfig==2.0.0
-Jinja2==3.1.2
+Jinja2==3.1.3
 MarkupSafe==2.1.3
 mypy==1.7.1
 mypy-extensions==1.0.0
@@ -29,14 +29,14 @@ numpy==1.26.2
 packaging==23.2
 pathspec==0.11.2
 pefile==2023.2.7
-Pillow==10.0.1
+Pillow==10.2.0
 platformdirs==4.0.0
 pluggy==1.3.0
 pre-commit==3.5.0
 pydantic==2.5.2
 pydantic-settings==2.1.0
 pydantic_core==2.14.5
-pydcs @ git+https://github.com/pydcs/dcs@1092fc419d3f879e8e7951b25e15d8b7c9938627
+pydcs @ git+https://github.com/pydcs/dcs@7eeec23ea428846ebbbd0ea4c746f8eafea04e0d
 pyinstaller==5.13.1
 pyinstaller-hooks-contrib==2023.6
 pyproj==3.6.1

resources/campaigns/exercise_bright_star.yaml

@@ -1,155 +1,155 @@
----
-name: Sinai - Exercise Bright Star
-theater: Sinai
-authors: Starfire
-recommended_player_faction: Bluefor Modern
-recommended_enemy_faction: Egypt 2000s
-description:
-  <p>For over 4 decades, the United States and Egypt have run a series of
-  biannual joint military exercises called Bright Star. Over the years, the
-  number of participating countries has grown substantially. Exercise Bright
-  Star 2025 boasts 8 participant nations and 14 observer nations. The United
-  States and a portion of the exercise coalition will play the part of a
-  fictional hostile nation dubbed Orangeland, staging a mock invasion against
-  Cairo. Israel, having for the first time accepted the invitation to observe,
-  is hosting the aggressor faction of the exercise coalition at its
-  airfields.</p>
-miz: exercise_bright_star.miz
-performance: 1
-recommended_start_date: 2025-09-01
-version: "11.0"
-squadrons:
-  Blue CV-1:
-    - primary: SEAD
-      secondary: any
-      aircraft:
-        - F/A-18C Hornet (Lot 20)
-      size: 24
-    - primary: AEW&C
-      aircraft:
-        - E-2D Advanced Hawkeye
-      size: 2
-    - primary: Refueling
-      aircraft:
-        - S-3B Tanker
-      size: 4
-  Bombers from RAF Fairford:
-    - primary: Anti-ship
-      secondary: air-to-ground
-      aircraft:
-        - B-52H Stratofortress
-      size: 8
-    - primary: Strike
-      secondary: air-to-ground
-      aircraft:
-        - B-1B Lancer
-      size: 8
-  # Hatzerim (141)
-  7:
-    - primary: Escort
-      secondary: any
-      aircraft:
-        - F-15C Eagle
-      size: 20
-    - primary: OCA/Runway
-      secondary: any
-      aircraft:
-        - F-15E Strike Eagle (Suite 4+)
-      size: 16
-    - primary: DEAD
-      secondary: any
-      aircraft:
-        - F-16CM Fighting Falcon (Block 50)
-      size: 20
-    - primary: BAI
-      secondary: any
-      aircraft:
-        - JF-17 Thunder
-      size: 16
-    - primary: BARCAP
-      secondary: any
-      aircraft:
-        - Mirage 2000C
-      size: 12
-  # Kedem
-  12:
-    - primary: Transport
-      secondary: any
-      aircraft:
-        - CH-47D
-      size: 20
-    - primary: Air Assault
-      secondary: any
-      aircraft:
-        - UH-60L
-        - UH-60A
-      size: 4
-  # Nevatim (106)
-  8:
-    - primary: AEW&C
-      aircraft:
-        - E-3A
-      size: 2
-    - primary: Refueling
-      aircraft:
-        - KC-135 Stratotanker
-      size: 2
-    - primary: CAS
-      secondary: air-to-ground
-      aircraft:
-        - A-10C Thunderbolt II (Suite 7)
-      size: 8
-  # Melez (30)
-  5:
-    - primary: CAS
-      secondary: air-to-ground
-      aircraft:
-        - Ka-50 Hokum (Blackshark 3)
-      size: 4
-    - primary: BAI
-      secondary: any
-      aircraft:
-        - Mirage 2000C
-      size: 12
-    - primary: Escort
-      secondary: any
-      aircraft:
-        - MiG-21bis Fishbed-N
-      size: 12
-  # Wadi al Jandali (72)
-  13:
-    - primary: AEW&C
-      aircraft:
-        - E-2C Hawkeye
-      size: 2
-    - primary: SEAD
-      secondary: any
-      aircraft:
-        - F-4E Phantom II
-      size: 20
-    - primary: DEAD
-      secondary: any
-      aircraft:
-        - F-16CM Fighting Falcon (Block 50)
-      size: 20
-    - primary: Air Assault
-      secondary: any
-      aircraft:
-        - Mi-24P Hind-F
-      size: 4
-    - primary: OCA/Aircraft
-      secondary: any
-      aircraft:
-        - SA 342L Gazelle
-      size: 4
-  # Cairo West (95)
-  18:
-    - primary: Transport
-      aircraft:
-        - C-130
-      size: 8
-    - primary: BARCAP
-      secondary: air-to-air
-      aircraft:
-        - MiG-29S Fulcrum-C
+---
+name: Sinai - Exercise Bright Star
+theater: Sinai
+authors: Starfire
+recommended_player_faction: Bluefor Modern
+recommended_enemy_faction: Egypt 2000s
+description:
+  <p>For over 4 decades, the United States and Egypt have run a series of
+  biannual joint military exercises called Bright Star. Over the years, the
+  number of participating countries has grown substantially. Exercise Bright
+  Star 2025 boasts 8 participant nations and 14 observer nations. The United
+  States and a portion of the exercise coalition will play the part of a
+  fictional hostile nation dubbed Orangeland, staging a mock invasion against
+  Cairo. Israel, having for the first time accepted the invitation to observe,
+  is hosting the aggressor faction of the exercise coalition at its
+  airfields.</p>
+miz: exercise_bright_star.miz
+performance: 1
+recommended_start_date: 2025-09-01
+version: "11.0"
+squadrons:
+  Blue CV-1:
+    - primary: SEAD
+      secondary: any
+      aircraft:
+        - F/A-18C Hornet (Lot 20)
+      size: 24
+    - primary: AEW&C
+      aircraft:
+        - E-2D Advanced Hawkeye
+      size: 2
+    - primary: Refueling
+      aircraft:
+        - S-3B Tanker
+      size: 4
+  Bombers from RAF Fairford:
+    - primary: Anti-ship
+      secondary: air-to-ground
+      aircraft:
+        - B-52H Stratofortress
+      size: 8
+    - primary: Strike
+      secondary: air-to-ground
+      aircraft:
+        - B-1B Lancer
+      size: 8
+  # Hatzerim (141)
+  7:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - A-10C Thunderbolt II (Suite 7)
+      size: 6
+    - primary: Escort
+      secondary: any
+      aircraft:
+        - F-15C Eagle
+      size: 20
+    - primary: OCA/Runway
+      secondary: any
+      aircraft:
+        - F-15E Strike Eagle (Suite 4+)
+      size: 16
+    - primary: DEAD
+      secondary: any
+      aircraft:
+        - F-16CM Fighting Falcon (Block 50)
+      size: 20
+    - primary: BAI
+      secondary: any
+      aircraft:
+        - JF-17 Thunder
+      size: 16
+    - primary: BARCAP
+      secondary: any
+      aircraft:
+        - Mirage 2000C
+      size: 12
+  # Kedem
+  12:
+    - primary: Transport
+      secondary: any
+      aircraft:
+        - CH-47D
+      size: 20
+    - primary: Air Assault
+      secondary: any
+      aircraft:
+        - UH-60L
+        - UH-60A
+      size: 4
+  # Nevatim (106)
+#  8:
+#    - primary: AEW&C
+#      aircraft:
+#        - E-3A
+#      size: 2
+#    - primary: Refueling
+#      aircraft:
+#        - KC-135 Stratotanker
+#      size: 2
+  # Melez (30)
+  5:
+    - primary: CAS
+      secondary: air-to-ground
+      aircraft:
+        - Ka-50 Hokum (Blackshark 3)
+      size: 4
+    - primary: BAI
+      secondary: any
+      aircraft:
+        - Mirage 2000C
+      size: 12
+    - primary: Escort
+      secondary: any
+      aircraft:
+        - MiG-21bis Fishbed-N
+      size: 12
+  # Wadi al Jandali (72)
+  13:
+    - primary: AEW&C
+      aircraft:
+        - E-2C Hawkeye
+      size: 2
+    - primary: SEAD
+      secondary: any
+      aircraft:
+        - F-4E Phantom II
+      size: 20
+    - primary: DEAD
+      secondary: any
+      aircraft:
+        - F-16CM Fighting Falcon (Block 50)
+      size: 20
+    - primary: Air Assault
+      secondary: any
+      aircraft:
+        - Mi-24P Hind-F
+      size: 4
+    - primary: OCA/Aircraft
+      secondary: any
+      aircraft:
+        - SA 342L Gazelle
+      size: 4
+  # Cairo West (95)
+  18:
+    - primary: Transport
+      aircraft:
+        - C-130
+      size: 8
+    - primary: BARCAP
+      secondary: air-to-air
+      aircraft:
+        - MiG-29S Fulcrum-C
       size: 20