Skip to content

Commit

Permalink
Data export for DCS 2.8.6.41066.
Browse files Browse the repository at this point in the history
  • Loading branch information
@DanAlbert
DanAlbert committed Jun 12, 2023
1 parent e74c388 commit 2c53098
Show file tree
Hide file tree
Showing 4 changed files with 421 additions and 261 deletions.
16 changes: 16 additions & 0 deletions dcs/countries.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10359,6 +10359,12 @@ class AirDefence:
FPS_117 = vehicles.AirDefence.FPS_117
FPS_117_ECS = vehicles.AirDefence.FPS_117_ECS
FPS_117_Dome = vehicles.AirDefence.FPS_117_Dome
Patriot_AMG = vehicles.AirDefence.Patriot_AMG
Patriot_ECS = vehicles.AirDefence.Patriot_ECS
Patriot_ln = vehicles.AirDefence.Patriot_ln
Patriot_EPP = vehicles.AirDefence.Patriot_EPP
Patriot_cp = vehicles.AirDefence.Patriot_cp
Patriot_str = vehicles.AirDefence.Patriot_str
RD_75 = vehicles.AirDefence.RD_75

class Fortification:
Expand Down Expand Up @@ -10436,6 +10442,9 @@ class Plane:
SpitfireLFMkIXCW = planes.SpitfireLFMkIXCW
M_2000C = planes.M_2000C
WingLoong_I = planes.WingLoong_I
F_16C_bl_50 = planes.F_16C_bl_50
F_16C_bl_52d = planes.F_16C_bl_52d
IL_76MD = planes.IL_76MD
FW_190A8 = planes.FW_190A8
Bf_109K_4 = planes.Bf_109K_4
P_47D_30 = planes.P_47D_30
Expand Down Expand Up @@ -10481,6 +10490,9 @@ class Plane:
Plane.SpitfireLFMkIXCW,
Plane.M_2000C,
Plane.WingLoong_I,
Plane.F_16C_bl_50,
Plane.F_16C_bl_52d,
Plane.IL_76MD,
Plane.FW_190A8,
Plane.Bf_109K_4,
Plane.P_47D_30,
Expand Down Expand Up @@ -10527,6 +10539,8 @@ class Helicopter:
SA342Mistral = helicopters.SA342Mistral
SA342Minigun = helicopters.SA342Minigun
AH_64D_BLK_II = helicopters.AH_64D_BLK_II
Mi_8MT = helicopters.Mi_8MT
Mi_24V = helicopters.Mi_24V

helicopters = [
Helicopter.Ka_50,
Expand All @@ -10539,6 +10553,8 @@ class Helicopter:
Helicopter.SA342Mistral,
Helicopter.SA342Minigun,
Helicopter.AH_64D_BLK_II,
Helicopter.Mi_8MT,
Helicopter.Mi_24V,
]

class Ship:
Expand Down
156 changes: 120 additions & 36 deletions dcs/helicopters.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1575,10 +1575,10 @@ class Pylon2:
B_8V20A_OFP2 = (2, Weapons.B_8V20A_OFP2)
B_8V20A_OM = (2, Weapons.B_8V20A_OM)
UB_32A_24_pod___32_x_S_5KO = (2, Weapons.UB_32A_24_pod___32_x_S_5KO)
_2_x_9M114_Shturm_V__AT_6_Spiral____ATGM__SACLOS__HEAT = (2, Weapons._2_x_9M114_Shturm_V__AT_6_Spiral____ATGM__SACLOS__HEAT)
_2_x_9M120_Ataka__AT_9_Spiral_2____ATGM__SACLOS__Tandem_HEAT = (2, Weapons._2_x_9M120_Ataka__AT_9_Spiral_2____ATGM__SACLOS__Tandem_HEAT)
_2_x_9M120F_Ataka__AT_9_Spiral_2____AGM__SACLOS__HE = (2, Weapons._2_x_9M120F_Ataka__AT_9_Spiral_2____AGM__SACLOS__HE)
_2_x_9M220O_Ataka__AT_9_Spiral_2____AAM__SACLOS__Frag = (2, Weapons._2_x_9M220O_Ataka__AT_9_Spiral_2____AAM__SACLOS__Frag)
_2_x_9M114_Shturm_V__AT_6_Spiral____ATGM__SACLOS__HEAT_ = (2, Weapons._2_x_9M114_Shturm_V__AT_6_Spiral____ATGM__SACLOS__HEAT_)
_2_x_9M120_Ataka__AT_9_Spiral_2____ATGM__SACLOS__Tandem_HEAT_ = (2, Weapons._2_x_9M120_Ataka__AT_9_Spiral_2____ATGM__SACLOS__Tandem_HEAT_)
_2_x_9M120F_Ataka__AT_9_Spiral_2____AGM__SACLOS__HE_ = (2, Weapons._2_x_9M120F_Ataka__AT_9_Spiral_2____AGM__SACLOS__HE_)
_2_x_9M220O_Ataka__AT_9_Spiral_2____AAM__SACLOS__Frag_ = (2, Weapons._2_x_9M220O_Ataka__AT_9_Spiral_2____AAM__SACLOS__Frag_)
B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (2, Weapons.B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag)
Fuel_tank_PTB_450 = (2, Weapons.Fuel_tank_PTB_450)
B_8V20A___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (2, Weapons.B_8V20A___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag)
Expand Down Expand Up @@ -1641,10 +1641,10 @@ class Pylon5:
B_8V20A_OFP2 = (5, Weapons.B_8V20A_OFP2)
B_8V20A_OM = (5, Weapons.B_8V20A_OM)
UB_32A_24_pod___32_x_S_5KO = (5, Weapons.UB_32A_24_pod___32_x_S_5KO)
_2_x_9M114_Shturm_V__AT_6_Spiral____ATGM__SACLOS__HEAT = (5, Weapons._2_x_9M114_Shturm_V__AT_6_Spiral____ATGM__SACLOS__HEAT)
_2_x_9M120_Ataka__AT_9_Spiral_2____ATGM__SACLOS__Tandem_HEAT = (5, Weapons._2_x_9M120_Ataka__AT_9_Spiral_2____ATGM__SACLOS__Tandem_HEAT)
_2_x_9M120F_Ataka__AT_9_Spiral_2____AGM__SACLOS__HE = (5, Weapons._2_x_9M120F_Ataka__AT_9_Spiral_2____AGM__SACLOS__HE)
_2_x_9M220O_Ataka__AT_9_Spiral_2____AAM__SACLOS__Frag = (5, Weapons._2_x_9M220O_Ataka__AT_9_Spiral_2____AAM__SACLOS__Frag)
_2_x_9M114_Shturm_V__AT_6_Spiral____ATGM__SACLOS__HEAT_ = (5, Weapons._2_x_9M114_Shturm_V__AT_6_Spiral____ATGM__SACLOS__HEAT_)
_2_x_9M120_Ataka__AT_9_Spiral_2____ATGM__SACLOS__Tandem_HEAT_ = (5, Weapons._2_x_9M120_Ataka__AT_9_Spiral_2____ATGM__SACLOS__Tandem_HEAT_)
_2_x_9M120F_Ataka__AT_9_Spiral_2____AGM__SACLOS__HE_ = (5, Weapons._2_x_9M120F_Ataka__AT_9_Spiral_2____AGM__SACLOS__HE_)
_2_x_9M220O_Ataka__AT_9_Spiral_2____AAM__SACLOS__Frag_ = (5, Weapons._2_x_9M220O_Ataka__AT_9_Spiral_2____AAM__SACLOS__Frag_)
B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag = (5, Weapons.B_13L_pod___5_x_S_13_OF__122mm_UnGd_Rkts__Blast_Frag)
Fuel_tank_PTB_450 = (5, Weapons.Fuel_tank_PTB_450)
B_8V20A___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = (5, Weapons.B_8V20A___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag)
Expand Down Expand Up @@ -1710,35 +1710,51 @@ class SA342M(HelicopterType):

property_defaults: Dict[str, Any] = {
"NS430allow": True,
"RemoveTablet": False,
}

class Properties:

class NS430allow:
id = "NS430allow"

class RemoveTablet:
id = "RemoveTablet"

livery_name = "SA342M" # from type

class Pylon1:
HOT3_ = (1, Weapons.HOT3_)
HOT3_x1__ = (1, Weapons.HOT3_x1__)
HOT3_x2__ = (1, Weapons.HOT3_x2__)

class Pylon2:
HOT3 = (2, Weapons.HOT3)
HOT3_x1___ = (2, Weapons.HOT3_x1___)
HOT3_x2___ = (2, Weapons.HOT3_x2___)

class Pylon3:
HOT3_ = (3, Weapons.HOT3_)
Sand_Filter = (3, Weapons.Sand_Filter)

class Pylon4:
HOT3 = (4, Weapons.HOT3)
IR_Deflector = (4, Weapons.IR_Deflector)

class Pylon5:
Sand_Filter = (5, Weapons.Sand_Filter)
Dipole_Antanna__aesthetic_ = (5, Weapons.Dipole_Antanna__aesthetic_)

class Pylon6:
IR_Deflector = (6, Weapons.IR_Deflector)
Smoke_Generator___red_ = (6, Weapons.Smoke_Generator___red_)
Smoke_Generator___green_ = (6, Weapons.Smoke_Generator___green_)
Smoke_Generator___blue_ = (6, Weapons.Smoke_Generator___blue_)
Smoke_Generator___white_ = (6, Weapons.Smoke_Generator___white_)
Smoke_Generator___yellow_ = (6, Weapons.Smoke_Generator___yellow_)
Smoke_Generator___orange_ = (6, Weapons.Smoke_Generator___orange_)

class Pylon7:
Dipole_Antanna__aesthetic_ = (7, Weapons.Dipole_Antanna__aesthetic_)
Smoke_Generator___red_ = (7, Weapons.Smoke_Generator___red_)
Smoke_Generator___green_ = (7, Weapons.Smoke_Generator___green_)
Smoke_Generator___blue_ = (7, Weapons.Smoke_Generator___blue_)
Smoke_Generator___white_ = (7, Weapons.Smoke_Generator___white_)
Smoke_Generator___yellow_ = (7, Weapons.Smoke_Generator___yellow_)
Smoke_Generator___orange_ = (7, Weapons.Smoke_Generator___orange_)

pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7}

Expand Down Expand Up @@ -1780,6 +1796,7 @@ class SA342L(HelicopterType):
property_defaults: Dict[str, Any] = {
"NS430allow": True,
"SA342RemoveDoors": False,
"RemoveTablet": False,
}

class Properties:
Expand All @@ -1790,8 +1807,34 @@ class NS430allow:
class SA342RemoveDoors:
id = "SA342RemoveDoors"

class RemoveTablet:
id = "RemoveTablet"

livery_name = "SA342L" # from type
#ERRR {GIAT_M621G}

class Pylon1:
GIAT_M621__240x_Combat_mix_4x_AP_1x_HE_ = (1, Weapons.GIAT_M621__240x_Combat_mix_4x_AP_1x_HE_)
GIAT_M621__240x_combat_mix_4x_HE_1x_AP_ = (1, Weapons.GIAT_M621__240x_combat_mix_4x_HE_1x_AP_)
GIAT_M621__240x_HE_ = (1, Weapons.GIAT_M621__240x_HE_)
GIAT_M621__240x_AP_ = (1, Weapons.GIAT_M621__240x_AP_)
GIAT_M621__240x_SAPHEI_ = (1, Weapons.GIAT_M621__240x_SAPHEI_)
Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_250_F1B_TP_SM = (1, Weapons.Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_250_F1B_TP_SM)
Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_251_H1_HE = (1, Weapons.Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_251_H1_HE)
Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_252_H1_TP = (1, Weapons.Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_252_H1_TP)
Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_253_H1_HEAT_ = (1, Weapons.Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_253_H1_HEAT_)
Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_254_H1_SM_Red = (1, Weapons.Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_254_H1_SM_Red)
Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_254_H1_SM_Yellow = (1, Weapons.Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_254_H1_SM_Yellow)
Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_254_H1_SM_Green = (1, Weapons.Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_254_H1_SM_Green)
Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_256_H1_HE_Frag = (1, Weapons.Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_256_H1_HE_Frag)
Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_257_H1_HE_Frag_Lg_Whd = (1, Weapons.Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_257_H1_HE_Frag_Lg_Whd)
Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_259E_H1_IL = (1, Weapons.Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_259E_H1_IL)
FN_HMP400__400rnds_ = (1, Weapons.FN_HMP400__400rnds_)
FN_HMP400__200rnds_ = (1, Weapons.FN_HMP400__200rnds_)
FN_HMP400__100rnds_ = (1, Weapons.FN_HMP400__100rnds_)
_1xMistral_ATAM_ = (1, Weapons._1xMistral_ATAM_)
_2xMistral_ATAM = (1, Weapons._2xMistral_ATAM)
HOT3_x1 = (1, Weapons.HOT3_x1)
HOT3_x2 = (1, Weapons.HOT3_x2)

class Pylon2:
Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_250_F1B_TP_SM = (2, Weapons.Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_250_F1B_TP_SM)
Expand All @@ -1804,18 +1847,40 @@ class Pylon2:
Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_256_H1_HE_Frag = (2, Weapons.Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_256_H1_HE_Frag)
Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_257_H1_HE_Frag_Lg_Whd = (2, Weapons.Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_257_H1_HE_Frag_Lg_Whd)
Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_259E_H1_IL = (2, Weapons.Telson_8___8_x_UnGd_Rkts__68_mm_SNEB_Type_259E_H1_IL)
FN_HMP400__400rnds_ = (2, Weapons.FN_HMP400__400rnds_)
FN_HMP400__200rnds_ = (2, Weapons.FN_HMP400__200rnds_)
FN_HMP400__100rnds_ = (2, Weapons.FN_HMP400__100rnds_)
_2xMistral_ATAM_ = (2, Weapons._2xMistral_ATAM_)
_1xMistral_ATAM = (2, Weapons._1xMistral_ATAM)
HOT3_x1_ = (2, Weapons.HOT3_x1_)
HOT3_x2_ = (2, Weapons.HOT3_x2_)

class Pylon3:
Sand_Filter = (3, Weapons.Sand_Filter)

class Pylon4:
IR_Deflector = (4, Weapons.IR_Deflector)

class Pylon5:
Sand_Filter = (5, Weapons.Sand_Filter)
Dipole_Antanna__aesthetic_ = (5, Weapons.Dipole_Antanna__aesthetic_)

class Pylon6:
IR_Deflector = (6, Weapons.IR_Deflector)
Smoke_Generator___red_ = (6, Weapons.Smoke_Generator___red_)
Smoke_Generator___green_ = (6, Weapons.Smoke_Generator___green_)
Smoke_Generator___blue_ = (6, Weapons.Smoke_Generator___blue_)
Smoke_Generator___white_ = (6, Weapons.Smoke_Generator___white_)
Smoke_Generator___yellow_ = (6, Weapons.Smoke_Generator___yellow_)
Smoke_Generator___orange_ = (6, Weapons.Smoke_Generator___orange_)

class Pylon7:
Dipole_Antanna__aesthetic_ = (7, Weapons.Dipole_Antanna__aesthetic_)
#ERRR {SA342_Doors}
Smoke_Generator___red_ = (7, Weapons.Smoke_Generator___red_)
Smoke_Generator___green_ = (7, Weapons.Smoke_Generator___green_)
Smoke_Generator___blue_ = (7, Weapons.Smoke_Generator___blue_)
Smoke_Generator___white_ = (7, Weapons.Smoke_Generator___white_)
Smoke_Generator___yellow_ = (7, Weapons.Smoke_Generator___yellow_)
Smoke_Generator___orange_ = (7, Weapons.Smoke_Generator___orange_)

pylons: Set[int] = {1, 2, 5, 6, 7, 8}
pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7}

tasks = [task.CAS, task.GroundAttack, task.AFAC, task.Escort, task.Reconnaissance]
task_default = task.CAS
Expand Down Expand Up @@ -1854,26 +1919,22 @@ class SA342Mistral(HelicopterType):

property_defaults: Dict[str, Any] = {
"NS430allow": True,
"RemoveTablet": False,
}

class Properties:

class NS430allow:
id = "NS430allow"

livery_name = "SA342MISTRAL" # from type

class Pylon1:
Mistral_ = (1, Weapons.Mistral_)

class Pylon2:
Mistral = (2, Weapons.Mistral)
class RemoveTablet:
id = "RemoveTablet"

class Pylon3:
Mistral_ = (3, Weapons.Mistral_)

class Pylon4:
Mistral = (4, Weapons.Mistral)
livery_name = "SA342MISTRAL" # from type
#ERRR {MBDA_MistralD}
#ERRR {MBDA_MistralG}
#ERRR {MBDA_MistralD}
#ERRR {MBDA_MistralG}

class Pylon5:
Sand_Filter = (5, Weapons.Sand_Filter)
Expand Down Expand Up @@ -1923,23 +1984,46 @@ class SA342Minigun(HelicopterType):

property_defaults: Dict[str, Any] = {
"NS430allow": True,
"RemoveTablet": False,
}

class Properties:

class NS430allow:
id = "NS430allow"

class RemoveTablet:
id = "RemoveTablet"

livery_name = "SA342MINIGUN" # from type
#ERRR {MINIGUN}

class Pylon3:
Sand_Filter = (3, Weapons.Sand_Filter)

class Pylon4:
IR_Deflector = (4, Weapons.IR_Deflector)

class Pylon5:
Sand_Filter = (5, Weapons.Sand_Filter)
Dipole_Antanna__aesthetic_ = (5, Weapons.Dipole_Antanna__aesthetic_)

class Pylon6:
IR_Deflector = (6, Weapons.IR_Deflector)
Smoke_Generator___red_ = (6, Weapons.Smoke_Generator___red_)
Smoke_Generator___green_ = (6, Weapons.Smoke_Generator___green_)
Smoke_Generator___blue_ = (6, Weapons.Smoke_Generator___blue_)
Smoke_Generator___white_ = (6, Weapons.Smoke_Generator___white_)
Smoke_Generator___yellow_ = (6, Weapons.Smoke_Generator___yellow_)
Smoke_Generator___orange_ = (6, Weapons.Smoke_Generator___orange_)

pylons: Set[int] = {1, 5, 6}
class Pylon7:
Smoke_Generator___red_ = (7, Weapons.Smoke_Generator___red_)
Smoke_Generator___green_ = (7, Weapons.Smoke_Generator___green_)
Smoke_Generator___blue_ = (7, Weapons.Smoke_Generator___blue_)
Smoke_Generator___white_ = (7, Weapons.Smoke_Generator___white_)
Smoke_Generator___yellow_ = (7, Weapons.Smoke_Generator___yellow_)
Smoke_Generator___orange_ = (7, Weapons.Smoke_Generator___orange_)

pylons: Set[int] = {1, 3, 4, 5, 6, 7}

tasks = [task.CAS, task.GroundAttack, task.AFAC, task.Escort, task.Reconnaissance]
task_default = task.CAS
Expand Down
Loading

0 comments on commit 2c53098

Please sign in to comment.