From 63584321c6f967e86b2c3f8d503db9658596e0f7 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Sun, 1 Oct 2023 11:46:24 -0700 Subject: [PATCH] Bump campaign version for squadron sizes. The old mode where squadrons started empty and had no size limit is going away. I bumped the campaign versions for the ones that claimed support and tested a handful. All of Fuzzle's campaigns actually had the wrong version in the yaml. They claim support for this but none that I tested actually fit within the limits (despite having sizes defined). Either it was supposed to be 10.7, or maybe the airports lost some parking. --- game/version.py | 5 +- resources/campaigns/battle_of_abu_dhabi.yaml | 2 +- resources/campaigns/black_sea.yaml | 2 +- resources/campaigns/caen_to_evreux.yaml | 4 +- resources/campaigns/exercise_bright_star.yaml | 27 ++-- resources/campaigns/exercise_vegas_nerve.yaml | 23 ++-- resources/campaigns/final_countdown_2.yaml | 36 +++-- resources/campaigns/golan_heights_lite.yaml | 129 +++++++++--------- resources/campaigns/grabthars_hammer.yaml | 16 +-- .../campaigns/operation_noisy_cricket.yaml | 2 +- .../campaigns/operation_peace_spring.yaml | 29 ++-- .../campaigns/operation_vectrons_claw.yaml | 2 +- 12 files changed, 159 insertions(+), 118 deletions(-) diff --git a/game/version.py b/game/version.py index f1623176..c7d1a004 100644 --- a/game/version.py +++ b/game/version.py @@ -188,4 +188,7 @@ VERSION = _build_version_string() #: #: Version 10.11 #: * Support for ferry-only bases. -CAMPAIGN_FORMAT_VERSION = (10, 10) +#: +#: Version 11.0 +#: * The squadron sizes introduced in 10.7 are required. +CAMPAIGN_FORMAT_VERSION = (11, 0) diff --git a/resources/campaigns/battle_of_abu_dhabi.yaml b/resources/campaigns/battle_of_abu_dhabi.yaml index 85e334e0..67387a85 100644 --- a/resources/campaigns/battle_of_abu_dhabi.yaml +++ b/resources/campaigns/battle_of_abu_dhabi.yaml @@ -9,7 +9,7 @@ description: pushing south.

miz: battle_of_abu_dhabi.miz performance: 2 -version: "10.9" +version: "11.0" squadrons: # Blue CPs: # The default faction is Iran, but the F-14B is given higher precedence so diff --git a/resources/campaigns/black_sea.yaml b/resources/campaigns/black_sea.yaml index 143a8425..f5744f84 100644 --- a/resources/campaigns/black_sea.yaml +++ b/resources/campaigns/black_sea.yaml @@ -9,7 +9,7 @@ recommended_enemy_faction: Russia 2010 recommended_start_date: 2004-01-07 miz: black_sea.miz performance: 2 -version: "10.9" +version: "11.0" squadrons: # Anapa-Vityazevo 12: diff --git a/resources/campaigns/caen_to_evreux.yaml b/resources/campaigns/caen_to_evreux.yaml index a76206fc..fcb8eeaa 100644 --- a/resources/campaigns/caen_to_evreux.yaml +++ b/resources/campaigns/caen_to_evreux.yaml @@ -12,7 +12,7 @@ recommended_enemy_faction: Germany 1944 recommended_start_date: 1944-07-04 miz: caen_to_evreux.miz performance: 1 -version: "10.9" +version: "11.0" squadrons: # Evreux 26: @@ -53,7 +53,7 @@ squadrons: - primary: OCA/Runway secondary: air-to-ground aircraft: - - Boston Mk.III + - Boston Mk.III - A-20G Havoc size: 10 # Ford_AF diff --git a/resources/campaigns/exercise_bright_star.yaml b/resources/campaigns/exercise_bright_star.yaml index 3224b104..96b8a39a 100644 --- a/resources/campaigns/exercise_bright_star.yaml +++ b/resources/campaigns/exercise_bright_star.yaml @@ -4,11 +4,20 @@ theater: Sinai authors: Starfire recommended_player_faction: Bluefor Modern recommended_enemy_faction: Egypt 2000s -description:

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.

+description: +

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.

miz: exercise_bright_star.miz performance: 1 recommended_start_date: 2025-09-01 -version: "10.9" +version: "11.0" squadrons: Blue CV-1: - primary: SEAD @@ -29,7 +38,7 @@ squadrons: aircraft: - SH-60B Seahawk size: 2 -# Hatzerim (141) + # Hatzerim (141) 7: - primary: Escort secondary: air-to-air @@ -61,7 +70,7 @@ squadrons: aircraft: - Mirage 2000C size: 12 -# Kedem + # Kedem 12: - primary: Transport aircraft: @@ -72,7 +81,7 @@ squadrons: aircraft: - UH-1H Iroquois size: 4 -# Nevatim (106) + # Nevatim (106) 8: - primary: AEW&C aircraft: @@ -91,7 +100,7 @@ squadrons: aircraft: - A-10C Thunderbolt II (Suite 7) size: 8 -# Melez (30) + # Melez (30) 5: - primary: CAS secondary: air-to-ground @@ -108,7 +117,7 @@ squadrons: aircraft: - Mirage 2000C size: 12 -# Wadi al Jandali (72) + # Wadi al Jandali (72) 13: - primary: AEW&C aircraft: @@ -134,7 +143,7 @@ squadrons: aircraft: - SA 342L Gazelle size: 4 -# Cairo West (95) + # Cairo West (95) 18: - primary: Transport aircraft: @@ -149,4 +158,4 @@ squadrons: secondary: any aircraft: - J-7B - size: 20 \ No newline at end of file + size: 20 diff --git a/resources/campaigns/exercise_vegas_nerve.yaml b/resources/campaigns/exercise_vegas_nerve.yaml index d1fe23e4..31e05b98 100644 --- a/resources/campaigns/exercise_vegas_nerve.yaml +++ b/resources/campaigns/exercise_vegas_nerve.yaml @@ -4,13 +4,20 @@ theater: Nevada authors: Starfire recommended_player_faction: USA 2005 recommended_enemy_faction: Redfor (China) 2010 -description:

Welcome to Vegas Nerve, an asymmetrical Red Flag Exercise scenario. You are starting off in control of the two Tonopah airports, and will push south from there. For the duration of this exercise, Creech AFB has been cleared of all fixed wing aircraft and will function as a FARP for rotor ops. OPFOR has a substantial resource advantage and an extensive IADS. Reducing that resource advantage while degrading their IADS will be vital to a successful completion of this exercise. Good luck, Commander.

+description: +

Welcome to Vegas Nerve, an asymmetrical Red Flag Exercise scenario. You are + starting off in control of the two Tonopah airports, and will push south from + there. For the duration of this exercise, Creech AFB has been cleared of all + fixed wing aircraft and will function as a FARP for rotor ops. OPFOR has a + substantial resource advantage and an extensive IADS. Reducing that resource + advantage while degrading their IADS will be vital to a successful completion + of this exercise. Good luck, Commander.

miz: exercise_vegas_nerve.miz performance: 1 recommended_start_date: 2011-02-24 -version: "10.9" +version: "11.0" squadrons: -# Tonopah Airport + # Tonopah Airport 17: - primary: TARCAP secondary: any @@ -26,7 +33,7 @@ squadrons: aircraft: - E-3A size: 1 -# Tonopah Test Range + # Tonopah Test Range 18: - primary: BAI secondary: air-to-ground @@ -53,7 +60,7 @@ squadrons: aircraft: - UH-1H Iroquois size: 2 -# Groom Lake + # Groom Lake 2: - primary: Escort secondary: air-to-air @@ -65,7 +72,7 @@ squadrons: aircraft: - Su-25T Frogfoot size: 20 -# Creech + # Creech Creech FARP: - primary: CAS secondary: air-to-ground @@ -77,7 +84,7 @@ squadrons: aircraft: - Mi-24P Hind-F size: 4 -# Nellis AFB + # Nellis AFB 4: - primary: Strike secondary: air-to-ground @@ -98,7 +105,7 @@ squadrons: aircraft: - Su-34 Fullback size: 20 -# Boulder City Airport + # Boulder City Airport 6: - primary: SEAD Escort secondary: any diff --git a/resources/campaigns/final_countdown_2.yaml b/resources/campaigns/final_countdown_2.yaml index a2a08b2b..95933d03 100644 --- a/resources/campaigns/final_countdown_2.yaml +++ b/resources/campaigns/final_countdown_2.yaml @@ -6,8 +6,7 @@ recommended_player_faction: country: Combined Joint Task Forces Blue name: D-Day Allied Forces 1944 and 1990 authors: Starfire - description: -

Faction for Final Countdown II

+ description:

Faction for Final Countdown II

locales: - en_US aircrafts: @@ -23,8 +22,8 @@ recommended_player_faction: awacs: - E-2C Hawkeye tankers: - - S-3B Tanker - frontline_units: + - S-3B Tanker + frontline_units: - A17 Light Tank Mk VII Tetrarch - A22 Infantry Tank MK IV Churchill VII - A27L Cruiser Tank MK VIII Centaur IV @@ -47,13 +46,13 @@ recommended_player_faction: - CVN-74 John C. Stennis missiles: [] air_defense_units: - - Bofors 40 mm Gun + - Bofors 40 mm Gun preset_groups: - - Ally Flak + - Ally Flak requirements: WW2 Asset Pack: https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/ carrier_names: - - CVN-71 Theodore Roosevelt + - CVN-71 Theodore Roosevelt has_jtac: true jtac_unit: MQ-9 Reaper unrestricted_satnav: true @@ -62,11 +61,22 @@ recommended_player_faction: cargo_ship: LST Mk.II recommended_enemy_faction: Germany 1944 description: -

While enroute to the Persian Gulf for Operation Desert Shield, the USS Theodore Roosevelt and its carrier strike group are engufled by an electrical vortex and transported through time and space to the English channel on the morning of the Normandy Landings - June 6th 1944. Seeking to reduce the cost in lives to the Allied Forces about to storm the beaches, the captain of the Roosevelt has elected to provide air support for the landings.

Note: This campaign has a custom faction that combines modern US naval forces with WW2 Allied forces. To play it as intended, you should carefully ration your use of modern aircraft and not replenish them if shot down (as you cannot get new Tomcats and Hornets in 1944). You can also choose to play it as a purely WW2 campaign by switching to one of the WW2 Ally factions.

+

While enroute to the Persian Gulf for Operation Desert Shield, the USS + Theodore Roosevelt and its carrier strike group are engufled by an electrical + vortex and transported through time and space to the English channel on the + morning of the Normandy Landings - June 6th 1944. Seeking to reduce the cost + in lives to the Allied Forces about to storm the beaches, the captain of the + Roosevelt has elected to provide air support for the + landings.

Note: This campaign has a custom faction that + combines modern US naval forces with WW2 Allied forces. To play it as + intended, you should carefully ration your use of modern aircraft and not + replenish them if shot down (as you cannot get new Tomcats and Hornets in + 1944). You can also choose to play it as a purely WW2 campaign by switching to + one of the WW2 Ally factions.

miz: final_countdown_2.miz performance: 2 recommended_start_date: 1944-06-06 -version: "10.9" +version: "11.0" squadrons: #Blue CV (90) Blue-CV: @@ -149,11 +159,11 @@ squadrons: - Ju 88 A-4 size: 8 #Broglie (32) - 68: + 68: - primary: Escort secondary: any aircraft: - - Bf 109 K-4 Kurfürst + - Bf 109 K-4 Kurfürst size: 24 #Saint-Andre-de-lEure (30) 70: @@ -168,9 +178,9 @@ squadrons: - Ju 88 A-4 size: 12 #Vilacoublay (76) - 42: + 42: - primary: BARCAP secondary: any aircraft: - - Fw 190 A-8 Anton + - Fw 190 A-8 Anton size: 20 diff --git a/resources/campaigns/golan_heights_lite.yaml b/resources/campaigns/golan_heights_lite.yaml index 6893a8ca..2106f936 100644 --- a/resources/campaigns/golan_heights_lite.yaml +++ b/resources/campaigns/golan_heights_lite.yaml @@ -4,98 +4,101 @@ theater: Syria authors: Khopa recommended_player_faction: Israel 2000 recommended_enemy_faction: Syria 2011 -description:

In this scenario, you start in Israel and the conflict is focused around the golan heights, an historically disputed territory.

This scenario is designed to be performance and helicopter friendly.

+description: +

In this scenario, you start in Israel and the conflict is focused around + the golan heights, an historically disputed territory.

This scenario + is designed to be performance and helicopter friendly.

miz: golan_heights_lite.miz performance: 1 -version: "10.9" +version: "11.0" advanced_iads: true # Campaign has connection_nodes / power_sources / command_centers iads_config: - LHA-1 Tarawa # A Naval Group without connections but still participating as EWR - Naval-2 # 2 Ship as EWR - CVN-74 John Stennis # Aircraft Carrier as EWR - Golan North-100: - - IADS_CN2 - - IADS_PS4 - - IADS_PS3 + - IADS_CN2 + - IADS_PS4 + - IADS_PS3 - Golan North-11: - - IADS_CN2 - - IADS_PS3 + - IADS_CN2 + - IADS_PS3 - Golan North-139: - - IADS_PS2 - - IADS_CN6 + - IADS_PS2 + - IADS_CN6 - Golan North-15: - - IADS_PS5 - - IADS_PS6 - - IADS_CN3 - - IADS_CN1 + - IADS_PS5 + - IADS_PS6 + - IADS_CN3 + - IADS_CN1 - Golan North-150: - - IADS_PS2 - - IADS_CN1 - - IADS_CN6 + - IADS_PS2 + - IADS_CN1 + - IADS_CN6 - Golan North-158: - - IADS_PS6 - - IADS_CN1 + - IADS_PS6 + - IADS_CN1 - Golan North-159: - - IADS_PS3 - - IADS_CN4 + - IADS_PS3 + - IADS_CN4 - Golan North-17: - - IADS_PS4 - - IADS_CN7 - - IADS_CN5 + - IADS_PS4 + - IADS_CN7 + - IADS_CN5 - Golan North-5: - - IADS_PS3 - - IADS_CN4 + - IADS_PS3 + - IADS_CN4 - Golan North-6: - - IADS_PS3 - - IADS_CN4 + - IADS_PS3 + - IADS_CN4 - Golan North-74: - - IADS_PS6 - - IADS_CN1 + - IADS_PS6 + - IADS_CN1 - Golan North-81: - - IADS_PS1 - - IADS_CN6 - - IADS_CN8 + - IADS_PS1 + - IADS_CN6 + - IADS_CN8 - Golan North-84: - - IADS_PS2 - - IADS_CN6 + - IADS_PS2 + - IADS_CN6 - Golan North-88: - - IADS_PS6 - - IADS_PS2 - - IADS_CN1 - - IADS_CN6 - - IADS_CN8 + - IADS_PS6 + - IADS_PS2 + - IADS_CN1 + - IADS_CN6 + - IADS_CN8 - Golan North-9: - - IADS_PS1 - - IADS_CN8 + - IADS_PS1 + - IADS_CN8 - Golan North-99: - - IADS_PS4 - - IADS_CN7 - - IADS_CN2 + - IADS_PS4 + - IADS_CN7 + - IADS_CN2 - Golan North-146: - - IADS_PS2 - - IADS_CN6 + - IADS_PS2 + - IADS_CN6 - Golan North-52: - - IADS_PS5 - - IADS_CN3 - - IADS_CN5 + - IADS_PS5 + - IADS_CN3 + - IADS_CN5 - Golan North-118: - - IADS_PS3 - - IADS_CN4 + - IADS_PS3 + - IADS_CN4 - Golan North-119: - - IADS_PS4 - - IADS_CN7 - - IADS_CN5 + - IADS_PS4 + - IADS_CN7 + - IADS_CN5 - Golan North-122: - - IADS_PS2 - - IADS_CN6 + - IADS_PS2 + - IADS_CN6 - IADS Blue Command Center: - - IADS_PS3 - - IADS_CN4 - - IADS_CN2 + - IADS_PS3 + - IADS_CN4 + - IADS_CN2 - IADS Red Command Center: - - IADS_PS1 - - IADS_CN6 - - IADS_CN8 + - IADS_PS1 + - IADS_CN6 + - IADS_CN8 squadrons: # Ramat-David 30: @@ -198,4 +201,4 @@ squadrons: secondary: air-to-ground aircraft: - Su-17M4 Fitter-K - size: 12 \ No newline at end of file + size: 12 diff --git a/resources/campaigns/grabthars_hammer.yaml b/resources/campaigns/grabthars_hammer.yaml index d81cd083..32e04da9 100644 --- a/resources/campaigns/grabthars_hammer.yaml +++ b/resources/campaigns/grabthars_hammer.yaml @@ -7,16 +7,16 @@ recommended_enemy_faction: Russia 2010 description:

An Argentinean extremist group has contracted the Sons of Warvan (SoW), an unusually well-equipped PMC with close ties to the Russian government, to - construct a beryllium bomb at the secret Omega 13 production facility in Ushaia - for use in its ongoing conflict with Chile. United States military forces have - established a foothold at San Julian. While the SoW are distracted up north, it - is up to the Marines to launch an assault upon Ushaia from an LHA in order to - disable the bomb production facility. Fortunately, Ushaia is lightly defended as - the SoW are trying to avoid unwanted attention.

+ construct a beryllium bomb at the secret Omega 13 production facility in + Ushaia for use in its ongoing conflict with Chile. United States military + forces have established a foothold at San Julian. While the SoW are distracted + up north, it is up to the Marines to launch an assault upon Ushaia from an LHA + in order to disable the bomb production facility. Fortunately, Ushaia is + lightly defended as the SoW are trying to avoid unwanted attention.

miz: grabthars_hammer.miz performance: 2 recommended_start_date: 1999-12-25 -version: "10.9" +version: "11.0" squadrons: #Mount Pleasant 2: @@ -145,4 +145,4 @@ squadrons: secondary: air-to-ground aircraft: - Mi-24P Hind-F - size: 8 \ No newline at end of file + size: 8 diff --git a/resources/campaigns/operation_noisy_cricket.yaml b/resources/campaigns/operation_noisy_cricket.yaml index 1593b6e9..3bd913fb 100644 --- a/resources/campaigns/operation_noisy_cricket.yaml +++ b/resources/campaigns/operation_noisy_cricket.yaml @@ -30,7 +30,7 @@ recommended_player_money: 0 recommended_enemy_money: 0 recommended_player_income_multiplier: 0.2 recommended_enemy_income_multiplier: 0.2 -version: "10.9" +version: "11.0" squadrons: Blue CV-1: - primary: SEAD diff --git a/resources/campaigns/operation_peace_spring.yaml b/resources/campaigns/operation_peace_spring.yaml index 43bb4461..62b386e3 100644 --- a/resources/campaigns/operation_peace_spring.yaml +++ b/resources/campaigns/operation_peace_spring.yaml @@ -4,13 +4,22 @@ theater: Syria authors: Starfire recommended_player_faction: Bluefor Modern recommended_enemy_faction: Iraq 1991 -description:

This is a semi-fictional what-if scenario for Operation Peace Spring, during which Turkish forces that crossed into Syria on an offensive against Kurdish militias were emboldened by early successes to continue pushing further southward. Attempts to broker a ceasefire have failed. Members of Operation Inherent Resolve have gathered at Ramat David Airbase in Israel to launch a counter-offensive.

Note: The default faction is set as Iraq 1991 in order to provide an opponent with a wider variety of units. While Turkey 2005 would be the historical faction (and has preset squadrons included), they only have two jets available (F-4 and F-16).

+description: +

This is a semi-fictional what-if scenario for Operation Peace Spring, + during which Turkish forces that crossed into Syria on an offensive against + Kurdish militias were emboldened by early successes to continue pushing + further southward. Attempts to broker a ceasefire have failed. Members of + Operation Inherent Resolve have gathered at Ramat David Airbase in Israel to + launch a counter-offensive.

Note: The default faction + is set as Iraq 1991 in order to provide an opponent with a wider variety of + units. While Turkey 2005 would be the historical faction (and has preset + squadrons included), they only have two jets available (F-4 and F-16).

miz: operation_peace_spring.miz performance: 1 recommended_start_date: 2019-12-23 -version: "10.9" +version: "11.0" squadrons: -# Ramat David + # Ramat David 30: - primary: CAS secondary: air-to-ground @@ -31,7 +40,7 @@ squadrons: aircraft: - E-3A size: 2 -# King Hussein Air College + # King Hussein Air College 19: - primary: DEAD secondary: any @@ -62,7 +71,7 @@ squadrons: aircraft: - UH-1H Iroquois size: 2 -# Damascus + # Damascus 7: - primary: TARCAP secondary: air-to-air @@ -82,7 +91,7 @@ squadrons: - OH-58D Kiowa Warrior - Mi-24P Hind-F size: 8 -# Tiyas + # Tiyas 39: - primary: SEAD secondary: air-to-ground @@ -90,7 +99,7 @@ squadrons: - F-16CM Fighting Falcon (Block 50) - Su-24M Fencer-D size: 20 -# Abu Al Duhur + # Abu Al Duhur 1: - primary: Strike secondary: air-to-ground @@ -98,7 +107,7 @@ squadrons: - F-4E Phantom II - H-6J Badger size: 20 -# Gaziantep + # Gaziantep 11: - primary: BARCAP secondary: any @@ -106,7 +115,7 @@ squadrons: - F-16CM Fighting Falcon (Block 50) - MiG-29A Fulcrum-A size: 12 -# Incirlik + # Incirlik 16: - primary: Strike secondary: air-to-ground @@ -128,4 +137,4 @@ squadrons: aircraft: - C-130 - IL-76MD - size: 4 \ No newline at end of file + size: 4 diff --git a/resources/campaigns/operation_vectrons_claw.yaml b/resources/campaigns/operation_vectrons_claw.yaml index 4a08c40b..fbb8f192 100644 --- a/resources/campaigns/operation_vectrons_claw.yaml +++ b/resources/campaigns/operation_vectrons_claw.yaml @@ -27,7 +27,7 @@ description: miz: operation_vectrons_claw.miz performance: 1 recommended_start_date: 2008-08-08 -version: "10.11" +version: "11.0" control_points: From Incirlik: ferry_only: true