Generate AA & armor to defend airbase. Destruction status correctly tracked.

2025-11-10 15:41:24 +00:00 · 2019-10-14 01:25:48 +02:00
parent bd66dcb39e
commit 09b8ff6b93
55 changed files with 289 additions and 117 deletions
--- a/game/factions/china_2000.py
+++ b/game/factions/china_2000.py
@@ -22,8 +22,6 @@ China_2000 = {

        Mi_8MT,

-        AirDefence.AAA_ZU_23_Closed,
-        AirDefence.Rapier_FSA_Launcher, # Standing as PL-9C Shorad
        AirDefence.SAM_SA_10_S_300PS_LN_5P85C, # Standing as HQ-9+
        AirDefence.SAM_SA_6_Kub_LN_2P25,
        AirDefence.HQ_7_Self_Propelled_LN,
@@ -41,5 +39,10 @@ China_2000 = {
        Bulk_cargo_ship_Yakushev,
        Dry_cargo_ship_Ivanov,
        Tanker_Elnya_160
+    ],
+    "shorad":[
+        AirDefence.AAA_ZU_23_Closed,
+        AirDefence.Rapier_FSA_Launcher, # Standing as PL-9C Shorad
+        AirDefence.HQ_7_Self_Propelled_LN
    ]
 }
--- a/game/factions/france_1995.py
+++ b/game/factions/france_1995.py
@@ -31,5 +31,9 @@ France_1995 = {
        CVN_74_John_C__Stennis,
        LHA_1_Tarawa,
        Armed_speedboat,
+        
+    ], "shorad":[
+        AirDefence.HQ_7_Self_Propelled_LN,
+        AirDefence.SAM_Roland_ADS
    ]
 }
--- a/game/factions/germany_1990.py
+++ b/game/factions/germany_1990.py
@@ -27,12 +27,15 @@ Germany_1990 = {
        Unarmed.Transport_M818,
        Infantry.Infantry_M4,

-        AirDefence.SPAAA_Gepard,
        AirDefence.SAM_Roland_ADS,
        AirDefence.SAM_Hawk_PCP,

        CVN_74_John_C__Stennis,
        LHA_1_Tarawa,
        Armed_speedboat,
+    ],
+    "shorad":[
+        AirDefence.SPAAA_Gepard,
+        AirDefence.SAM_Roland_ADS,
    ]
 }
--- a/game/factions/india_2010.py
+++ b/game/factions/india_2010.py
@@ -31,12 +31,17 @@ India_2010 = {

        AirDefence.SAM_SA_6_Kub_LN_2P25,
        AirDefence.SAM_SA_3_S_125_LN_5P73,
-        AirDefence.SAM_SA_8_Osa_9A33,
-        AirDefence.SAM_SA_13_Strela_10M3_9A35M3,
-        AirDefence.SAM_SA_19_Tunguska_2S6,

        CVN_74_John_C__Stennis,
        LHA_1_Tarawa,
        Armed_speedboat,
+    ],
+    "shorad":[
+        AirDefence.SAM_SA_8_Osa_9A33,
+        AirDefence.AAA_ZU_23_Emplacement,
+        AirDefence.SPAAA_ZSU_23_4_Shilka,
+        AirDefence.SAM_SA_13_Strela_10M3_9A35M3,
+        AirDefence.SAM_SA_8_Osa_9A33,
+        AirDefence.SAM_SA_19_Tunguska_2S6
    ]
 }
--- a/game/factions/iran_2015.py
+++ b/game/factions/iran_2015.py
@@ -48,5 +48,9 @@ Iran_2015 = {
        Bulk_cargo_ship_Yakushev,
        Dry_cargo_ship_Ivanov,
        Tanker_Elnya_160
+    ],
+    "shorad":[
+        AirDefence.HQ_7_Self_Propelled_LN,
+        AirDefence.AAA_ZU_23_Insurgent_Closed
    ]
 }
--- a/game/factions/israel_2000.py
+++ b/game/factions/israel_2000.py
@@ -30,5 +30,8 @@ Israel_2000 = {
        CVN_74_John_C__Stennis,
        LHA_1_Tarawa,
        Armed_speedboat,
+    ],
+    "shorad":[
+        AirDefence.SAM_Avenger_M1097
    ]
 }
--- a/game/factions/italy_1990.py
+++ b/game/factions/italy_1990.py
@@ -31,5 +31,7 @@ Italy_1990 = {
         CVN_74_John_C__Stennis,
         LHA_1_Tarawa,
         Armed_speedboat,
-     ]
+     ], "shorad":[
+        AirDefence.SAM_Avenger_M1097,
+    ]
 }
--- a/game/factions/netherlands_1990.py
+++ b/game/factions/netherlands_1990.py
@@ -29,5 +29,8 @@ Netherlands_1990 = {
        CVN_74_John_C__Stennis,
        LHA_1_Tarawa,
        Armed_speedboat,
+    ],
+    "shorad":[
+        AirDefence.SAM_Avenger_M1097
    ]
 }
--- a/game/factions/north_korea_2000.py
+++ b/game/factions/north_korea_2000.py
@@ -42,5 +42,9 @@ NorthKorea_2000 = {
        Bulk_cargo_ship_Yakushev,
        Dry_cargo_ship_Ivanov,
        Tanker_Elnya_160
+    ],
+    "shorad":[
+        AirDefence.AAA_ZU_23_Emplacement,
+        AirDefence.SPAAA_ZSU_23_4_Shilka
    ]
 }
--- a/game/factions/russia_1965.py
+++ b/game/factions/russia_1965.py
@@ -21,7 +21,6 @@ Russia_1965 = {

        Mi_8MT,

-        AirDefence.AAA_ZU_23_Closed,
        AirDefence.SAM_SA_6_Kub_LN_2P25,
        AirDefence.SAM_SA_2_LN_SM_90,
        AirDefence.SAM_SA_3_S_125_LN_5P73,
@@ -41,5 +40,8 @@ Russia_1965 = {
        Bulk_cargo_ship_Yakushev,
        Dry_cargo_ship_Ivanov,
        Tanker_Elnya_160
+    ],
+    "shorad":[
+        AirDefence.AAA_ZU_23_Closed
    ]
 }
--- a/game/factions/russia_1975.py
+++ b/game/factions/russia_1975.py
@@ -47,5 +47,9 @@ Russia_1975 = {
        Bulk_cargo_ship_Yakushev,
        Dry_cargo_ship_Ivanov,
        Tanker_Elnya_160
+    ],
+    "shorad":[
+        AirDefence.AAA_ZU_23_Emplacement,
+        AirDefence.SPAAA_ZSU_23_4_Shilka
    ]
 }
--- a/game/factions/russia_1990.py
+++ b/game/factions/russia_1990.py
@@ -48,5 +48,10 @@ Russia_1990 = {
        Bulk_cargo_ship_Yakushev,
        Dry_cargo_ship_Ivanov,
        Tanker_Elnya_160
+    ],
+    "shorad":[
+        AirDefence.SAM_SA_9_Strela_1_9P31,
+        AirDefence.SAM_SA_13_Strela_10M3_9A35M3,
+        AirDefence.SPAAA_ZSU_23_4_Shilka
    ]
 }
--- a/game/factions/russia_2010.py
+++ b/game/factions/russia_2010.py
@@ -29,7 +29,6 @@ Russia_2010 = {
        Ka_50,
        Mi_8MT,

-        AirDefence.SPAAA_ZSU_23_4_Shilka,
        AirDefence.SAM_SA_19_Tunguska_2S6,
        AirDefence.SAM_SA_11_Buk_LN_9A310M1,
        AirDefence.SAM_SA_10_S_300PS_LN_5P85C,
@@ -46,5 +45,9 @@ Russia_2010 = {
        Bulk_cargo_ship_Yakushev,
        Dry_cargo_ship_Ivanov,
        Tanker_Elnya_160,
+    ],
+    "shorad":[
+        AirDefence.SAM_SA_19_Tunguska_2S6,
+        AirDefence.SAM_SA_13_Strela_10M3_9A35M3
    ]
 }
--- a/game/factions/spain_1990.py
+++ b/game/factions/spain_1990.py
@@ -28,5 +28,7 @@ Spain_1990 = {
        CVN_74_John_C__Stennis,
        LHA_1_Tarawa,
        Armed_speedboat,
+    ], "shorad":[
+        AirDefence.SAM_Avenger_M1097,
    ]
 }
--- a/game/factions/turkey_2005.py
+++ b/game/factions/turkey_2005.py
@@ -21,7 +21,7 @@ Turkey_2005 = {

        Armor.MBT_Leopard_2,
        Armor.MBT_Leopard_1A3,
-        Armor.MBT_M60A3_Patton, # Standing as VAB
+        Armor.MBT_M60A3_Patton,
        Armor.APC_Cobra,
        Armor.APC_BTR_80,

@@ -33,5 +33,8 @@ Turkey_2005 = {
        CVN_74_John_C__Stennis,
        LHA_1_Tarawa,
        Armed_speedboat,
+    ], "shorad":[
+        AirDefence.AAA_ZU_23_Emplacement,
+        AirDefence.SPAAA_ZSU_23_4_Shilka
    ]
 }
--- a/game/factions/usa_1960.py
+++ b/game/factions/usa_1960.py
@@ -28,5 +28,8 @@ USA_1960 = {
        CVN_74_John_C__Stennis,
        LHA_1_Tarawa,
        Armed_speedboat,
+    ],
+    "shorad":[
+        AirDefence.AAA_Vulcan_M163
    ]
 }
--- a/game/factions/usa_1965.py
+++ b/game/factions/usa_1965.py
@@ -25,12 +25,15 @@ USA_1965 = {
        Unarmed.Transport_M818,
        Infantry.Infantry_M4,

-        AirDefence.AAA_Vulcan_M163,
        AirDefence.SAM_Chaparral_M48,
        AirDefence.SAM_Hawk_PCP,

        CVN_74_John_C__Stennis,
        LHA_1_Tarawa,
        Armed_speedboat,
+    ],
+    "shorad":[
+        AirDefence.AAA_Vulcan_M163,
+        AirDefence.SAM_Chaparral_M48
    ]
 }
--- a/game/factions/usa_1990.py
+++ b/game/factions/usa_1990.py
@@ -33,10 +33,12 @@ USA_1990 = {
        Infantry.Infantry_M4,

        AirDefence.SAM_Hawk_PCP,
-        AirDefence.SAM_Avenger_M1097,
+

        CVN_74_John_C__Stennis,
        LHA_1_Tarawa,
        Armed_speedboat,
+    ], "shorad":[
+        AirDefence.SAM_Avenger_M1097,
    ]
 }
--- a/game/factions/usa_2005.py
+++ b/game/factions/usa_2005.py
@@ -38,5 +38,7 @@ USA_2005 = {
        CVN_74_John_C__Stennis,
        LHA_1_Tarawa,
        Armed_speedboat,
+    ], "shorad":[
+        AirDefence.SAM_Avenger_M1097,
    ]
 }
--- a/game/operation/operation.py
+++ b/game/operation/operation.py
@@ -170,7 +170,7 @@ class Operation:
        else:
            self.current_mission.groundControl.red_tactical_commander = self.ca_slots

-        self.extra_aagen.generate()
+        #self.extra_aagen.generate()

        # triggers
        if self.game.is_player_attack(self.conflict.attackers_country):