diff --git a/dcs/countries.py b/dcs/countries.py index c65edab2..e0719cf1 100644 --- a/dcs/countries.py +++ b/dcs/countries.py @@ -3335,6 +3335,7 @@ class Unarmed: Predator_GCS = vehicles.Unarmed.Predator_GCS Predator_TrojanSpirit = vehicles.Unarmed.Predator_TrojanSpirit Tigr_233036 = vehicles.Unarmed.Tigr_233036 + GD_20 = vehicles.Unarmed.GD_20 class Armor: Sd_Kfz_251 = vehicles.Armor.Sd_Kfz_251 @@ -3415,6 +3416,9 @@ class MissilesSS: Scud_B = vehicles.MissilesSS.Scud_B Hy_launcher = vehicles.MissilesSS.Hy_launcher Silkworm_SR = vehicles.MissilesSS.Silkworm_SR + SD10_Loadout = vehicles.MissilesSS.SD10_Loadout + PL5EII_Loadout = vehicles.MissilesSS.PL5EII_Loadout + PL8_Loadout = vehicles.MissilesSS.PL8_Loadout class Locomotive: Electric_locomotive = vehicles.Locomotive.Electric_locomotive @@ -10614,6 +10618,7 @@ class Unarmed: R11_volvo_drivable = vehicles.Unarmed.R11_volvo_drivable Tacr2a = vehicles.Unarmed.Tacr2a LARC_V = vehicles.Unarmed.LARC_V + GD_20 = vehicles.Unarmed.GD_20 class Armor: BMP_1 = vehicles.Armor.BMP_1 @@ -10629,6 +10634,9 @@ class Armor: class MissilesSS: Hy_launcher = vehicles.MissilesSS.Hy_launcher Silkworm_SR = vehicles.MissilesSS.Silkworm_SR + SD10_Loadout = vehicles.MissilesSS.SD10_Loadout + PL5EII_Loadout = vehicles.MissilesSS.PL5EII_Loadout + PL8_Loadout = vehicles.MissilesSS.PL8_Loadout class Locomotive: ES44AH = vehicles.Locomotive.ES44AH @@ -30499,6 +30507,7 @@ class Unarmed: Predator_GCS = vehicles.Unarmed.Predator_GCS Predator_TrojanSpirit = vehicles.Unarmed.Predator_TrojanSpirit Tigr_233036 = vehicles.Unarmed.Tigr_233036 + GD_20 = vehicles.Unarmed.GD_20 class Armor: Sd_Kfz_251 = vehicles.Armor.Sd_Kfz_251 @@ -30579,6 +30588,9 @@ class MissilesSS: Scud_B = vehicles.MissilesSS.Scud_B Hy_launcher = vehicles.MissilesSS.Hy_launcher Silkworm_SR = vehicles.MissilesSS.Silkworm_SR + SD10_Loadout = vehicles.MissilesSS.SD10_Loadout + PL5EII_Loadout = vehicles.MissilesSS.PL5EII_Loadout + PL8_Loadout = vehicles.MissilesSS.PL8_Loadout class Locomotive: Electric_locomotive = vehicles.Locomotive.Electric_locomotive @@ -31331,6 +31343,7 @@ class Unarmed: Predator_GCS = vehicles.Unarmed.Predator_GCS Predator_TrojanSpirit = vehicles.Unarmed.Predator_TrojanSpirit Tigr_233036 = vehicles.Unarmed.Tigr_233036 + GD_20 = vehicles.Unarmed.GD_20 class Armor: Sd_Kfz_251 = vehicles.Armor.Sd_Kfz_251 @@ -31411,6 +31424,9 @@ class MissilesSS: Scud_B = vehicles.MissilesSS.Scud_B Hy_launcher = vehicles.MissilesSS.Hy_launcher Silkworm_SR = vehicles.MissilesSS.Silkworm_SR + SD10_Loadout = vehicles.MissilesSS.SD10_Loadout + PL5EII_Loadout = vehicles.MissilesSS.PL5EII_Loadout + PL8_Loadout = vehicles.MissilesSS.PL8_Loadout class Locomotive: Electric_locomotive = vehicles.Locomotive.Electric_locomotive @@ -32163,6 +32179,7 @@ class Unarmed: Predator_GCS = vehicles.Unarmed.Predator_GCS Predator_TrojanSpirit = vehicles.Unarmed.Predator_TrojanSpirit Tigr_233036 = vehicles.Unarmed.Tigr_233036 + GD_20 = vehicles.Unarmed.GD_20 class Armor: Sd_Kfz_251 = vehicles.Armor.Sd_Kfz_251 @@ -32243,6 +32260,9 @@ class MissilesSS: Scud_B = vehicles.MissilesSS.Scud_B Hy_launcher = vehicles.MissilesSS.Hy_launcher Silkworm_SR = vehicles.MissilesSS.Silkworm_SR + SD10_Loadout = vehicles.MissilesSS.SD10_Loadout + PL5EII_Loadout = vehicles.MissilesSS.PL5EII_Loadout + PL8_Loadout = vehicles.MissilesSS.PL8_Loadout class Locomotive: Electric_locomotive = vehicles.Locomotive.Electric_locomotive diff --git a/dcs/statics.py b/dcs/statics.py index 90587286..e170a399 100644 --- a/dcs/statics.py +++ b/dcs/statics.py @@ -1107,7 +1107,7 @@ class Stanley_LightHouse(unittype.StaticType): class X_345_Excavator(unittype.StaticType): id = "345 Excavator" name = "Excavator" - shape_name = "cat_345l" + shape_name = "cat_345L" rate = 3 class Tower_Crane(unittype.StaticType): diff --git a/dcs/vehicles.py b/dcs/vehicles.py index 5692f5a5..17c8bbab 100644 --- a/dcs/vehicles.py +++ b/dcs/vehicles.py @@ -1434,6 +1434,13 @@ class Blitz_36_6700A(unittype.VehicleType): threat_range = 0 air_weapon_dist = 0 + class GD_20(unittype.VehicleType): + id = "GD-20" + name = "GD-20 Lift Truck" + detection_range = 0 + threat_range = 0 + air_weapon_dist = 0 + class Kubelwagen_82(unittype.VehicleType): id = "Kubelwagen_82" name = "LUV Kubelwagen Jeep" @@ -2027,6 +2034,27 @@ class Silkworm_SR(unittype.VehicleType): threat_range = 0 air_weapon_dist = 0 + class SD10_Loadout(unittype.VehicleType): + id = "SD10 Loadout" + name = "Payload SD-10" + detection_range = 0 + threat_range = 0 + air_weapon_dist = 0 + + class PL5EII_Loadout(unittype.VehicleType): + id = "PL5EII Loadout" + name = "Payload PL-5EII" + detection_range = 0 + threat_range = 0 + air_weapon_dist = 0 + + class PL8_Loadout(unittype.VehicleType): + id = "PL8 Loadout" + name = "Payload PL-8" + detection_range = 0 + threat_range = 0 + air_weapon_dist = 0 + class V1_launcher(unittype.VehicleType): id = "v1_launcher" name = "V-1 Launch Ramp" @@ -2397,6 +2425,10 @@ class German_tank_wagon(unittype.VehicleType): "HQ-7_STR_SP": AirDefence.HQ_7_STR_SP, "PLZ05": Artillery.PLZ05, "TYPE-59": Armor.TYPE_59, + "GD-20": Unarmed.GD_20, + "SD10 Loadout": MissilesSS.SD10_Loadout, + "PL5EII Loadout": MissilesSS.PL5EII_Loadout, + "PL8 Loadout": MissilesSS.PL8_Loadout, "Kubelwagen_82": Unarmed.Kubelwagen_82, "Sd_Kfz_2": Unarmed.Sd_Kfz_2, "Sd_Kfz_7": Unarmed.Sd_Kfz_7, diff --git a/dcs/weapons_data.py b/dcs/weapons_data.py index a478b95f..e4f8d1ea 100644 --- a/dcs/weapons_data.py +++ b/dcs/weapons_data.py @@ -427,7 +427,7 @@ class Weapons: DIS_CM_802AKG_AI = {"clsid": "DIS_CM-802AKG_AI", "name": "CM802AKG (DIS) for AI", "weight": 720} DIS_C_701IR = {"clsid": "DIS_C-701IR", "name": "C-701IR", "weight": 170} DIS_C_701T = {"clsid": "DIS_C-701T", "name": "C-701T", "weight": 170} - DIS_C_802AK = {"clsid": "DIS_C-802AK", "name": "C802AK", "weight": 765} + DIS_C_802AK = {"clsid": "DIS_C-802AK", "name": "C-802AK", "weight": 765} DIS_DF4A_KD20 = {"clsid": "DIS_DF4A_KD20", "name": "KD-20", "weight": 1750} DIS_DF4B_YJ12 = {"clsid": "DIS_DF4B_YJ12", "name": "YJ-12", "weight": 1800} DIS_GB6 = {"clsid": "DIS_GB6", "name": "GB-6", "weight": 672} @@ -440,7 +440,7 @@ class Weapons: DIS_GBU_16 = {"clsid": "DIS_GBU_16", "name": "GBU-16", "weight": 564} DIS_GDJ_KD63 = {"clsid": "DIS_GDJ_KD63", "name": "KD-63", "weight": 2050} DIS_GDJ_KD63B = {"clsid": "DIS_GDJ_KD63B", "name": "KD-63B", "weight": 2050} - DIS_GDJ_YJ83K = {"clsid": "DIS_GDJ_YJ83K", "name": "YJ83K", "weight": 765} + DIS_GDJ_YJ83K = {"clsid": "DIS_GDJ_YJ83K", "name": "YJ-83K", "weight": 765} DIS_H6_250_2_N12 = {"clsid": "DIS_H6_250_2_N12", "name": "12 x 250-2 - 250kg GP Bombs HD", "weight": 3000} DIS_H6_250_2_N24 = {"clsid": "DIS_H6_250_2_N24", "name": "24 x 250-2 - 250kg GP Bombs HD", "weight": 6000} DIS_HJ_12 = {"clsid": "DIS_HJ-12", "name": "HJ-12", "weight": 22} @@ -494,8 +494,7 @@ class Weapons: DIS_TYPE200_DUAL_L = {"clsid": "DIS_TYPE200_DUAL_L", "name": "TYPE-200A Dual", "weight": 400} DIS_TYPE200_DUAL_R = {"clsid": "DIS_TYPE200_DUAL_R", "name": "TYPE-200A Dual", "weight": 400} DIS_WMD7 = {"clsid": "DIS_WMD7", "name": "AVIC WMD7 FLIR/LDT POD", "weight": 295} - DIS_YJ83K = {"clsid": "DIS_YJ83K", "name": "YJ83K", "weight": 715} - DIS_YU_6 = {"clsid": "DIS_YU_6", "name": "YU-6", "weight": 1558} + DIS_YJ83K = {"clsid": "DIS_YJ83K", "name": "YJ-83K", "weight": 715} Dipole_Antanna__aesthetic_ = {"clsid": "{SA342_Dipole}", "name": "Dipole Antanna (aesthetic)", "weight": 5} DWS39_MJ1 = {"clsid": "{DWS39_MJ1}", "name": "DWS39 MJ1", "weight": 605} DWS39_MJ1_MJ2 = {"clsid": "{DWS39_MJ1_MJ2}", "name": "DWS39 MJ1-MJ2", "weight": 605} @@ -2239,7 +2238,6 @@ class Weapons: "DIS_TYPE200_DUAL_R": Weapons.DIS_TYPE200_DUAL_R, "DIS_WMD7": Weapons.DIS_WMD7, "DIS_YJ83K": Weapons.DIS_YJ83K, - "DIS_YU_6": Weapons.DIS_YU_6, "{SA342_Dipole}": Weapons.Dipole_Antanna__aesthetic_, "{DWS39_MJ1}": Weapons.DWS39_MJ1, "{DWS39_MJ1_MJ2}": Weapons.DWS39_MJ1_MJ2,