Ground war rework

2025-11-10 15:41:24 +00:00 · 2020-05-24 20:32:45 +02:00
parent 5884d9d120
commit f57e453d8d
74 changed files with 1255 additions and 1965 deletions
--- a/game/factions/china_2000.py
+++ b/game/factions/china_2000.py
@@ -10,7 +10,9 @@ China_2000 = {

        MiG_21Bis, # Standing as J-7
        Su_30,
+        Su_33,
        J_11A,
+        JF_17,

        IL_76MD,
        IL_78M,
@@ -26,14 +28,17 @@ China_2000 = {
        AirDefence.SAM_SA_6_Kub_LN_2P25,
        AirDefence.HQ_7_Self_Propelled_LN,

-        Armor.MBT_T_72B, # Type 99
+        Armor.ZTZ_96B,
        Armor.MBT_T_55,
        Armor.ZBD_04A,
        Armor.IFV_BMP_1,
+        Artillery.MLRS_9A52_Smerch,
+        Artillery.SPH_2S9_Nona,

        Unarmed.Transport_Ural_375,
        Unarmed.Transport_UAZ_469,
        Infantry.Soldier_AK,
+        Infantry.Paratrooper_RPG_16,

        CV_1143_5_Admiral_Kuznetsov,
        Bulk_cargo_ship_Yakushev,
--- a/game/factions/france_1995.py
+++ b/game/factions/france_1995.py
@@ -23,6 +23,7 @@ France_1995 = {

        Unarmed.Transport_M818,
        Infantry.Infantry_M4,
+        Infantry.Infantry_M4,

        AirDefence.SAM_Roland_ADS,
        AirDefence.SAM_Hawk_PCP,
--- a/game/factions/russia_1955.py
+++ b/game/factions/russia_1955.py
@@ -1,6 +1,6 @@
 from dcs.planes import MiG_15bis, IL_76MD, IL_78M, An_26B, An_30M, Yak_40
 from dcs.ships import CV_1143_5_Admiral_Kuznetsov, Bulk_cargo_ship_Yakushev, Dry_cargo_ship_Ivanov, Tanker_Elnya_160
-from dcs.vehicles import AirDefence, Armor, Unarmed, Infantry
+from dcs.vehicles import AirDefence, Armor, Unarmed, Infantry, Artillery

 Russia_1955 = {
    "country": "Russia",
@@ -16,19 +16,23 @@ Russia_1955 = {

        AirDefence.AAA_ZU_23_Closed,
        AirDefence.AAA_ZU_23_on_Ural_375,
-
        Armor.ARV_BRDM_2,
        Armor.ARV_MTLB_U_BOMAN,
        Armor.APC_MTLB,
        Armor.MBT_T_55,
+        Artillery.MLRS_BM_21_Grad,

        Unarmed.Transport_Ural_375,
        Unarmed.Transport_UAZ_469,
-        Infantry.Soldier_AK,

        CV_1143_5_Admiral_Kuznetsov,
        Bulk_cargo_ship_Yakushev,
        Dry_cargo_ship_Ivanov,
-        Tanker_Elnya_160
+        Tanker_Elnya_160,
+
+        # Infantry squad
+        Infantry.Paratrooper_AKS,
+        Infantry.Infantry_Soldier_Rus,
+        Infantry.Paratrooper_RPG_16,
    ]
 }
--- a/game/factions/russia_1965.py
+++ b/game/factions/russia_1965.py
@@ -1,7 +1,7 @@
 from dcs.helicopters import Mi_8MT
 from dcs.planes import MiG_15bis, MiG_19P, MiG_21Bis, IL_76MD, IL_78M, An_26B, An_30M, Yak_40, A_50
 from dcs.ships import CV_1143_5_Admiral_Kuznetsov, Bulk_cargo_ship_Yakushev, Dry_cargo_ship_Ivanov, Tanker_Elnya_160
-from dcs.vehicles import AirDefence, Armor, Unarmed, Infantry
+from dcs.vehicles import AirDefence, Armor, Unarmed, Infantry, Artillery

 Russia_1965 = {
    "country": "Russia",
@@ -31,15 +31,21 @@ Russia_1965 = {
        Armor.IFV_BMD_1,
        Armor.IFV_BMP_1,
        Armor.MBT_T_55,
+        Artillery.MLRS_BM_21_Grad,

        Unarmed.Transport_Ural_375,
        Unarmed.Transport_UAZ_469,
-        Infantry.Soldier_AK,

        CV_1143_5_Admiral_Kuznetsov,
        Bulk_cargo_ship_Yakushev,
        Dry_cargo_ship_Ivanov,
-        Tanker_Elnya_160
+        Tanker_Elnya_160,
+
+        # Infantry squad
+        Infantry.Paratrooper_AKS,
+        Infantry.Infantry_Soldier_Rus,
+        Infantry.Paratrooper_RPG_16,
+
    ],
    "shorad":[
        AirDefence.AAA_ZU_23_Closed
--- a/game/factions/russia_1975.py
+++ b/game/factions/russia_1975.py
@@ -2,7 +2,7 @@ from dcs.helicopters import Mi_8MT, Mi_24V
 from dcs.planes import MiG_21Bis, MiG_23MLD, MiG_25PD, MiG_29A, Su_17M4, Su_24M, Su_25, IL_76MD, IL_78M, An_26B, An_30M, \
    Yak_40, A_50
 from dcs.ships import *
-from dcs.vehicles import AirDefence, Armor, Unarmed, Infantry
+from dcs.vehicles import AirDefence, Armor, Unarmed, Infantry, Artillery

 Russia_1975 = {
    "country": "Russia",
@@ -39,14 +39,22 @@ Russia_1975 = {
        Armor.IFV_BMP_1,
        Armor.MBT_T_55,

+        Artillery.SPH_2S9_Nona,
+        Artillery.SPH_2S1_Gvozdika,
+
        Unarmed.Transport_Ural_375,
        Unarmed.Transport_UAZ_469,
-        Infantry.Soldier_AK,

        CV_1143_5_Admiral_Kuznetsov,
        Bulk_cargo_ship_Yakushev,
        Dry_cargo_ship_Ivanov,
-        Tanker_Elnya_160
+        Tanker_Elnya_160,
+
+        # Infantry squad
+        Infantry.Paratrooper_AKS,
+        Infantry.Infantry_Soldier_Rus,
+        Infantry.Paratrooper_RPG_16,
+
    ],
    "shorad": [
        AirDefence.AAA_ZU_23_Emplacement,
--- a/game/factions/russia_1990.py
+++ b/game/factions/russia_1990.py
@@ -16,7 +16,6 @@ Russia_1990 = {
        Su_27,

        Su_24M,
-        Su_24MR,
        Su_25,

        IL_76MD,
@@ -39,15 +38,21 @@ Russia_1990 = {
        Armor.IFV_BMD_1,
        Armor.IFV_BMP_1,
        Armor.MBT_T_55,
+        Artillery.MLRS_9K57_Uragan_BM_27,
+        Artillery.SPH_2S19_Msta,

        Unarmed.Transport_Ural_375,
        Unarmed.Transport_UAZ_469,
-        Infantry.Soldier_AK,

        CV_1143_5_Admiral_Kuznetsov,
        Bulk_cargo_ship_Yakushev,
        Dry_cargo_ship_Ivanov,
-        Tanker_Elnya_160
+        Tanker_Elnya_160,
+
+        # Infantry squad
+        Infantry.Paratrooper_AKS,
+        Infantry.Infantry_Soldier_Rus,
+        Infantry.Paratrooper_RPG_16,
    ],
    "shorad":[
        AirDefence.SAM_SA_9_Strela_1_9P31,
--- a/game/factions/russia_2010.py
+++ b/game/factions/russia_2010.py
@@ -16,7 +16,7 @@ Russia_2010 = {

        Su_25T,
        Su_34,
-        Su_24MR,
+        Su_24M,
        L_39ZA,

        IL_76MD,
@@ -38,13 +38,21 @@ Russia_2010 = {
        Armor.MBT_T_80U,
        Armor.MBT_T_72B,

+        Artillery.MLRS_9K57_Uragan_BM_27,
+        Artillery.SPH_2S19_Msta,
+
        Unarmed.Transport_Ural_375,
        Unarmed.Transport_UAZ_469,
-        Infantry.Soldier_AK,
+
        CV_1143_5_Admiral_Kuznetsov,
        Bulk_cargo_ship_Yakushev,
        Dry_cargo_ship_Ivanov,
        Tanker_Elnya_160,
+
+        # Infantry squad
+        Infantry.Paratrooper_AKS,
+        Infantry.Infantry_Soldier_Rus,
+        Infantry.Paratrooper_RPG_16,
    ],
    "shorad":[
        AirDefence.SAM_SA_19_Tunguska_2S6,
--- a/game/factions/usa_1944.py
+++ b/game/factions/usa_1944.py
@@ -15,6 +15,8 @@ USA_1944 = {
        Armor.MT_M4A4_Sherman_Firefly,
        Armor.M30_Cargo_Carrier,
        Armor.APC_M2A1,
+        Armor.CT_Cromwell_IV,
+        Artillery.M12_GMC,

        Infantry.Infantry_M1_Garand,

--- a/game/factions/usa_1960.py
+++ b/game/factions/usa_1960.py
@@ -22,6 +22,7 @@ USA_1960 = {

        Unarmed.Transport_M818,
        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,

        AirDefence.AAA_Vulcan_M163,

--- a/game/factions/usa_1965.py
+++ b/game/factions/usa_1965.py
@@ -24,6 +24,7 @@ USA_1965 = {
        Armor.APC_M113,
        Unarmed.Transport_M818,
        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,

        AirDefence.SAM_Chaparral_M48,
        AirDefence.SAM_Hawk_PCP,
--- a/game/factions/usa_1990.py
+++ b/game/factions/usa_1990.py
@@ -31,6 +31,7 @@ USA_1990 = {
        Armor.ATGM_M1134_Stryker,
        Unarmed.Transport_M818,
        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,

        AirDefence.SAM_Hawk_PCP,

--- a/game/factions/usa_2005.py
+++ b/game/factions/usa_2005.py
@@ -11,6 +11,7 @@ USA_2005 = {
        F_14B,
        FA_18C_hornet,
        F_16C_50,
+        JF_17,

        A_10C,
        AV8BNA,
@@ -32,8 +33,12 @@ USA_2005 = {
        Armor.APC_M1043_HMMWV_Armament,
        Armor.ATGM_M1045_HMMWV_TOW,

+        Artillery.MLRS_M270,
+        Artillery.SPH_M109_Paladin,
+
        Unarmed.Transport_M818,
        Infantry.Infantry_M4,
+        Infantry.Soldier_M249,

        AirDefence.SAM_Hawk_PCP,
        AirDefence.SAM_Patriot_EPP_III,