diff --git a/dcs/countries.py b/dcs/countries.py index ff5a61ba..df792c77 100644 --- a/dcs/countries.py +++ b/dcs/countries.py @@ -251,6 +251,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -336,6 +337,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -1217,6 +1219,7 @@ class Plane: AJS37 = planes.AJS37 C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter F_15ESE = planes.F_15ESE @@ -1303,6 +1306,7 @@ class Plane: Plane.AJS37, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.F_15ESE, @@ -1657,6 +1661,7 @@ class Plane: KC130 = planes.KC130 C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -1721,6 +1726,7 @@ class Plane: Plane.KC130, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -2067,6 +2073,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -2130,6 +2137,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -2473,6 +2481,7 @@ class Plane: AV8BNA = planes.AV8BNA C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -2541,6 +2550,7 @@ class Plane: Plane.AV8BNA, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -2962,6 +2972,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -3027,6 +3038,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -3621,6 +3633,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 J_11A = planes.J_11A JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter @@ -3758,6 +3771,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.J_11A, Plane.JF_17, Plane.Falcon_Gyrocopter, @@ -4245,6 +4259,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -4304,6 +4319,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -4626,6 +4642,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -4691,6 +4708,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -5044,6 +5062,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -5107,6 +5126,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -5442,6 +5462,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -5503,6 +5524,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -5817,6 +5839,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -5878,6 +5901,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -6188,6 +6212,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -6249,6 +6274,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -6575,6 +6601,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -6639,6 +6666,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -7012,6 +7040,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -7073,6 +7102,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -7401,6 +7431,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -7456,6 +7487,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -8315,6 +8347,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -8380,6 +8413,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -8710,6 +8744,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -8769,6 +8804,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -9405,6 +9441,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -9460,6 +9497,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -10209,6 +10247,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -10272,6 +10311,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -11004,6 +11044,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 WingLoong_I = planes.WingLoong_I H_6J = planes.H_6J @@ -11070,6 +11111,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.WingLoong_I, Plane.H_6J, @@ -11711,6 +11753,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -11772,6 +11815,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -12534,6 +12578,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -12596,6 +12641,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -13358,6 +13404,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -13421,6 +13468,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -13784,6 +13832,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -13850,6 +13899,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -14213,6 +14263,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -14277,6 +14328,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -14622,6 +14674,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -14679,6 +14732,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -15834,6 +15888,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II F_15ESE = planes.F_15ESE @@ -15896,6 +15951,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, Plane.F_15ESE, @@ -16257,6 +16313,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -16322,6 +16379,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -16684,6 +16742,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -16744,6 +16803,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -17070,6 +17130,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -17131,6 +17192,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -18227,6 +18289,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -18287,6 +18350,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -18576,6 +18640,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -18634,6 +18699,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -19372,6 +19438,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -19430,6 +19497,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -20138,6 +20206,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -20195,6 +20264,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -20480,6 +20550,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -20535,6 +20606,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -20830,6 +20902,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -20888,6 +20961,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -21192,6 +21266,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -21251,6 +21326,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -21532,6 +21608,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -21589,6 +21666,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -21893,6 +21971,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -21952,6 +22031,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -22240,6 +22320,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -22296,6 +22377,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -22594,6 +22676,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -22650,6 +22733,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -22965,6 +23049,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -23025,6 +23110,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -23338,6 +23424,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -23397,6 +23484,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -23732,6 +23820,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -23794,6 +23883,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -24079,6 +24169,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -24134,6 +24225,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -24802,6 +24894,7 @@ class Plane: KC130 = planes.KC130 C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -24863,6 +24956,7 @@ class Plane: Plane.KC130, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -25177,6 +25271,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -25233,6 +25328,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -27445,6 +27541,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -27516,6 +27613,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -27841,6 +27939,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -27898,6 +27997,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -28565,6 +28665,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -28622,6 +28723,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -28943,6 +29045,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -29002,6 +29105,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -29296,6 +29400,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -29355,6 +29460,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -30067,6 +30173,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -30127,6 +30234,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, @@ -31546,6 +31654,7 @@ class Plane: Yak_40 = planes.Yak_40 C_130 = planes.C_130 MiG_29S = planes.MiG_29S + C_130J_30 = planes.C_130J_30 Mirage_2000_5 = planes.Mirage_2000_5 P_51D_30_NA = planes.P_51D_30_NA F_16C_bl_50 = planes.F_16C_bl_50 @@ -31683,6 +31792,7 @@ class Plane: Plane.Yak_40, Plane.C_130, Plane.MiG_29S, + Plane.C_130J_30, Plane.Mirage_2000_5, Plane.P_51D_30_NA, Plane.F_16C_bl_50, @@ -32435,6 +32545,7 @@ class Plane: Yak_40 = planes.Yak_40 C_130 = planes.C_130 MiG_29S = planes.MiG_29S + C_130J_30 = planes.C_130J_30 Mirage_2000_5 = planes.Mirage_2000_5 P_51D_30_NA = planes.P_51D_30_NA F_16C_bl_50 = planes.F_16C_bl_50 @@ -32572,6 +32683,7 @@ class Plane: Plane.Yak_40, Plane.C_130, Plane.MiG_29S, + Plane.C_130J_30, Plane.Mirage_2000_5, Plane.P_51D_30_NA, Plane.F_16C_bl_50, @@ -33324,6 +33436,7 @@ class Plane: Yak_40 = planes.Yak_40 C_130 = planes.C_130 MiG_29S = planes.MiG_29S + C_130J_30 = planes.C_130J_30 Mirage_2000_5 = planes.Mirage_2000_5 P_51D_30_NA = planes.P_51D_30_NA F_16C_bl_50 = planes.F_16C_bl_50 @@ -33461,6 +33574,7 @@ class Plane: Plane.Yak_40, Plane.C_130, Plane.MiG_29S, + Plane.C_130J_30, Plane.Mirage_2000_5, Plane.P_51D_30_NA, Plane.F_16C_bl_50, @@ -33851,6 +33965,7 @@ class Plane: KC135MPRS = planes.KC135MPRS C_101EB = planes.C_101EB C_101CC = planes.C_101CC + C_130J_30 = planes.C_130J_30 JF_17 = planes.JF_17 Falcon_Gyrocopter = planes.Falcon_Gyrocopter Christen_Eagle_II = planes.Christen_Eagle_II @@ -33907,6 +34022,7 @@ class Plane: Plane.KC135MPRS, Plane.C_101EB, Plane.C_101CC, + Plane.C_130J_30, Plane.JF_17, Plane.Falcon_Gyrocopter, Plane.Christen_Eagle_II, diff --git a/dcs/planes.py b/dcs/planes.py index 5905232d..5e50a008 100644 --- a/dcs/planes.py +++ b/dcs/planes.py @@ -9927,6 +9927,253 @@ class Pylon7: task_default = task.CAS +class C_130J_30(PlaneType): + id = "C-130J-30" + flyable = True + height = 11.84 + width = 40.41 + length = 44.36 + fuel_max = 19692 + max_speed = 630 + chaff = 220 + flare = 200 + charge_total = 420 + chaff_charge_size = 1 + flare_charge_size = 1 + tacan = True + radio_frequency = 305 + + panel_radio = { + 1: { + "channels": { + 1: 305, + 2: 259, + 4: 256, + 8: 257, + 16: 261, + 17: 267, + 9: 255, + 18: 251, + 5: 254, + 10: 262, + 20: 266, + 11: 275, + 3: 265, + 6: 250, + 12: 252, + 13: 269, + 7: 270, + 14: 260, + 19: 253, + 15: 263 + }, + }, + 2: { + "channels": { + 7: 119, + 1: 130, + 2: 131, + 4: 116, + 8: 120, + 9: 121, + 5: 117, + 10: 122, + 3: 121, + 6: 118 + }, + }, + } + + property_defaults: Dict[str, Any] = { + "NetCrewControlPriority": 0, + "pre_flight_complete": False, + "ramp_down": False, + "save_custom_data": True, + "allow_air_load": False, + "cargo_1": None, + "cargo_2": None, + "cargo_3": None, + "cargo_4": None, + "cargo_5": None, + "cargo_6": None, + "cargo_7": None, + "cargo_8": None, + "cargo_9": None, + "cargo_10": None, + } + + class Properties: + + class NetCrewControlPriority: + id = "NetCrewControlPriority" + + class Values: + Pilot = 0 + Copilot = 1 + Ask_Always = -1 + Equally_Responsible = -2 + + class pre_flight_complete: + id = "pre_flight_complete" + + class ramp_down: + id = "ramp_down" + + class save_custom_data: + id = "save_custom_data" + + class allow_air_load: + id = "allow_air_load" + + class cargo_1: + id = "cargo_1" + + class cargo_2: + id = "cargo_2" + + class cargo_3: + id = "cargo_3" + + class cargo_4: + id = "cargo_4" + + class cargo_5: + id = "cargo_5" + + class cargo_6: + id = "cargo_6" + + class cargo_7: + id = "cargo_7" + + class cargo_8: + id = "cargo_8" + + class cargo_9: + id = "cargo_9" + + class cargo_10: + id = "cargo_10" + + properties = { + "NetCrewControlPriority": UnitPropertyDescription( + identifier="NetCrewControlPriority", + control="comboList", + label="Aircraft Control Priority", + player_only=True, + default=0, + values={ + 0: "Pilot", + 1: "Copilot", + -1: "Ask Always", + -2: "Equally Responsible", + }, + ), + "pre_flight_complete": UnitPropertyDescription( + identifier="pre_flight_complete", + control="checkbox", + label="Pre-flight Complete", + default=False, + ), + "ramp_down": UnitPropertyDescription( + identifier="ramp_down", + control="checkbox", + label="Set Ramp Open", + default=False, + ), + "save_custom_data": UnitPropertyDescription( + identifier="save_custom_data", + control="checkbox", + label="Save Custom Data Entries", + default=True, + ), + "allow_air_load": UnitPropertyDescription( + identifier="allow_air_load", + control="checkbox", + label="Allow Cargo Loading In Flight", + default=False, + ), + "cargo_1": UnitPropertyDescription( + identifier="cargo_1", + control="editbox", + label="Cargo 1", + player_only=True, + ), + "cargo_2": UnitPropertyDescription( + identifier="cargo_2", + control="editbox", + label="Cargo 2", + player_only=True, + ), + "cargo_3": UnitPropertyDescription( + identifier="cargo_3", + control="editbox", + label="Cargo 3", + player_only=True, + ), + "cargo_4": UnitPropertyDescription( + identifier="cargo_4", + control="editbox", + label="Cargo 4", + player_only=True, + ), + "cargo_5": UnitPropertyDescription( + identifier="cargo_5", + control="editbox", + label="Cargo 5", + player_only=True, + ), + "cargo_6": UnitPropertyDescription( + identifier="cargo_6", + control="editbox", + label="Cargo 6", + player_only=True, + ), + "cargo_7": UnitPropertyDescription( + identifier="cargo_7", + control="editbox", + label="Cargo 7", + player_only=True, + ), + "cargo_8": UnitPropertyDescription( + identifier="cargo_8", + control="editbox", + label="Cargo 8", + player_only=True, + ), + "cargo_9": UnitPropertyDescription( + identifier="cargo_9", + control="editbox", + label="Cargo 9", + player_only=True, + ), + "cargo_10": UnitPropertyDescription( + identifier="cargo_10", + control="editbox", + label="Cargo 10", + player_only=True, + ), + } + + livery_name = "C-130J-30" # from type + + class Pylon1: + Fuel_Tank_8900_pounds = (1, Weapons.Fuel_Tank_8900_pounds) +#ERRR + + class Pylon2: + Fuel_Tank_8900_pounds_ = (2, Weapons.Fuel_Tank_8900_pounds_) +#ERRR + + class Pylon3: + Cargo_Bay_M4 = (3, Weapons.Cargo_Bay_M4) + + pylons: Set[int] = {1, 2, 3} + + tasks = [task.Transport, task.GroundAttack, task.Refueling] + task_default = task.Transport + + class J_11A(PlaneType): id = "J-11A" flyable = True @@ -11809,7 +12056,7 @@ class UseReferenceAircraft: id = "UseReferenceAircraft" class Values: - Random = 0 + Default = 0 Reference = 1 Persistent = 2 @@ -11930,7 +12177,7 @@ class LaserCodeDigit4: player_only=True, default=0, values={ - 0: "Random", + 0: "Default", 1: "Reference", 2: "Persistent", }, @@ -12732,7 +12979,7 @@ class UseReferenceAircraft: id = "UseReferenceAircraft" class Values: - Random = 0 + Default = 0 Reference = 1 Persistent = 2 @@ -12853,7 +13100,7 @@ class LaserCodeDigit4: player_only=True, default=0, values={ - 0: "Random", + 0: "Default", 1: "Reference", 2: "Persistent", }, @@ -15681,9 +15928,9 @@ class F4U_1D_CW(PlaneType): "F4U_GunsConvergence_Mid": 2, "F4U_GunsConvergence_Outer": 2, "F4U_CW_number": True, - "F4U_CW_number_1": 8, - "F4U_CW_number_2": 2, - "F4U_CW_number_3": 1, + "F4U_CW_number_1": 3, + "F4U_CW_number_2": 4, + "F4U_CW_number_3": 9, } class Properties: @@ -15831,7 +16078,7 @@ class Values: identifier="F4U_CW_number_1", control="comboList", label="1st number", - default=8, + default=3, values={ 0: "0", 1: "1", @@ -15849,7 +16096,7 @@ class Values: identifier="F4U_CW_number_2", control="comboList", label="2nd number", - default=2, + default=4, values={ 0: "0", 1: "1", @@ -15867,7 +16114,7 @@ class Values: identifier="F4U_CW_number_3", control="comboList", label="3rd number", - default=1, + default=9, values={ 0: "0", 1: "1", @@ -18910,6 +19157,9 @@ class MiG_29_Fulcrum(PlaneType): } property_defaults: Dict[str, Any] = { + "HUDLanguage": 0, + "AvionicsLanguage": 0, + "AvionicsUnits": 0, "Realistic_INS": 1, "IMU_alignment_type": 1, "SPOMode": 1, @@ -18919,6 +19169,30 @@ class MiG_29_Fulcrum(PlaneType): class Properties: + class HUDLanguage: + id = "HUDLanguage" + + class Values: + User = 0 + Russian__Native = 1 + English = 2 + + class AvionicsLanguage: + id = "AvionicsLanguage" + + class Values: + User = 0 + Russian__Native = 1 + English = 2 + + class AvionicsUnits: + id = "AvionicsUnits" + + class Values: + User = 0 + Metric__Native = 1 + Imperial = 2 + class Realistic_INS: id = "Realistic INS" @@ -18951,6 +19225,45 @@ class Values: HMS = 1 properties = { + "HUDLanguage": UnitPropertyDescription( + identifier="HUDLanguage", + control="comboList", + label="HUD/HDD Language", + player_only=True, + default=0, + w_ctrl=150, + values={ + 0: "User", + 1: "Russian (Native)", + 2: "English", + }, + ), + "AvionicsLanguage": UnitPropertyDescription( + identifier="AvionicsLanguage", + control="comboList", + label="Avionics Language", + player_only=True, + default=0, + w_ctrl=150, + values={ + 0: "User", + 1: "Russian (Native)", + 2: "English", + }, + ), + "AvionicsUnits": UnitPropertyDescription( + identifier="AvionicsUnits", + control="comboList", + label="Avionics Units", + player_only=True, + default=0, + w_ctrl=150, + values={ + 0: "User", + 1: "Metric (Native)", + 2: "Imperial", + }, + ), "Realistic INS": UnitPropertyDescription( identifier="Realistic INS", control="comboList", @@ -34038,6 +34351,7 @@ class C_47(PlaneType): "KC135MPRS": KC135MPRS, "C-101EB": C_101EB, "C-101CC": C_101CC, + "C-130J-30": C_130J_30, "J-11A": J_11A, "JF-17": JF_17, "KJ-2000": KJ_2000, diff --git a/dcs/ships.py b/dcs/ships.py index 76808656..88235bc2 100644 --- a/dcs/ships.py +++ b/dcs/ships.py @@ -165,7 +165,7 @@ class SOM(unittype.ShipType): class CHAP_Project22160(unittype.ShipType): id = "CHAP_Project22160" - name = "Project 22160 Patrol Ship [CH]" + name = "Patrol Ship 22160 Vasily Bykov [CH]" plane_num = 0 helicopter_num = 1 parking = 1 @@ -176,7 +176,7 @@ class CHAP_Project22160(unittype.ShipType): class CHAP_Project22160_TorM2KM(unittype.ShipType): id = "CHAP_Project22160_TorM2KM" - name = "Project 22160 Patrol Ship with Tor M2KM [CH]" + name = "Patrol ship 22160 Vasily Bykov with Tor M2KM [CH]" plane_num = 0 helicopter_num = 0 parking = 0 diff --git a/dcs/statics.py b/dcs/statics.py index e84a1625..dfe37c02 100644 --- a/dcs/statics.py +++ b/dcs/statics.py @@ -462,6 +462,36 @@ class Beer_Bomb(unittype.StaticType): shape_name = "barrelofbeer_support" rate = 5 + class Drop_Zone_Marker_A(unittype.StaticType): + id = "Drop Zone Marker A" + name = "Drop Zone Marker A" + shape_name = "asc_drop_marker_tent" + rate = 1 + + class Drop_Zone_Marker_B(unittype.StaticType): + id = "Drop Zone Marker B" + name = "Drop Zone Marker B" + shape_name = "asc_drop_marker_cylinder" + rate = 1 + + class Drop_Zone_Marker_C(unittype.StaticType): + id = "Drop Zone Marker C" + name = "Drop Zone Marker C" + shape_name = "asc_drop_marker_triangle" + rate = 1 + + class Drop_Zone_Marker_D(unittype.StaticType): + id = "Drop Zone Marker D" + name = "Drop Zone Marker D" + shape_name = "asc_drop_marker_vertical_tall" + rate = 1 + + class Drop_Zone_Marker_E(unittype.StaticType): + id = "Drop Zone Marker E" + name = "Drop Zone Marker E" + shape_name = "asc_drop_marker_vertical_short" + rate = 1 + class AM32a_60_01(unittype.StaticType): id = "AM32a-60_01" name = "M92 AM32a-60-01" @@ -1433,6 +1463,11 @@ class Freya_Shelter_Concrete(unittype.StaticType): "Black_Tyre_WF": Fortification.Black_Tyre_WF, "Windsock": Fortification.Windsock, "Beer Bomb": Fortification.Beer_Bomb, + "Drop Zone Marker A": Fortification.Drop_Zone_Marker_A, + "Drop Zone Marker B": Fortification.Drop_Zone_Marker_B, + "Drop Zone Marker C": Fortification.Drop_Zone_Marker_C, + "Drop Zone Marker D": Fortification.Drop_Zone_Marker_D, + "Drop Zone Marker E": Fortification.Drop_Zone_Marker_E, "AM32a-60_01": Fortification.AM32a_60_01, "AM32a-60_02": Fortification.AM32a_60_02, "APFC fuel": Fortification.APFC_fuel, @@ -1791,6 +1826,62 @@ class Gbu_43b_airdrop(unittype.StaticType): rate = 100 can_cargo = True + class Cds_crate(unittype.StaticType): + id = "cds_crate" + name = "CDS Crate" + shape_name = "cds_crate" + category = "Cargos" + rate = 1200 + can_cargo = True + + class Cds_barrels(unittype.StaticType): + id = "cds_barrels" + name = "CDS Barrels" + shape_name = "cds_barrels" + category = "Cargos" + rate = 1200 + can_cargo = True + + class X_463_Pallet(unittype.StaticType): + id = "463_Pallet" + name = "463 Pallet" + shape_name = "463_Pallet" + category = "Cargos" + rate = 100 + can_cargo = True + + class M92_Concrete_Barrier_Cargo(unittype.StaticType): + id = "M92_Concrete_Barrier_Cargo" + name = "Concrete Barrier" + shape_name = "M92_barrierb" + category = "Cargos" + rate = 1 + can_cargo = True + + class M92_MRE_Pallet(unittype.StaticType): + id = "M92_MRE_Pallet" + name = "MRE Pallet" + shape_name = "M92_Cargo01" + category = "Cargos" + rate = 1 + can_cargo = True + + class M92_Ammo_Pallet(unittype.StaticType): + id = "M92_Ammo_Pallet" + name = "Ammo Pallet" + shape_name = "M92_Cargo03" + category = "Cargos" + rate = 1 + can_cargo = True + + class M92_10Ft_Container(unittype.StaticType): + id = "M92_10Ft_Container" + name = "10ft Container" + shape_name = "M92_Container_10ft" + category = "Cargos" + rate = 1 + can_cargo = True + class L118(unittype.StaticType): id = "l118" name = "L118 Light Artillery" @@ -1816,5 +1907,12 @@ class L118(unittype.StaticType): "trunks_small_cargo": Cargo.Trunks_small_cargo, "trunks_long_cargo": Cargo.Trunks_long_cargo, "gbu_43b_airdrop": Cargo.Gbu_43b_airdrop, + "cds_crate": Cargo.Cds_crate, + "cds_barrels": Cargo.Cds_barrels, + "463_Pallet": Cargo.X_463_Pallet, + "M92_Concrete_Barrier_Cargo": Cargo.M92_Concrete_Barrier_Cargo, + "M92_MRE_Pallet": Cargo.M92_MRE_Pallet, + "M92_Ammo_Pallet": Cargo.M92_Ammo_Pallet, + "M92_10Ft_Container": Cargo.M92_10Ft_Container, "l118": Cargo.L118, } diff --git a/dcs/weapons_data.py b/dcs/weapons_data.py index 424d91e7..c916fcdd 100644 --- a/dcs/weapons_data.py +++ b/dcs/weapons_data.py @@ -377,6 +377,7 @@ class Weapons: B_8V20A_OM = {"clsid": "B_8V20A_OM", "name": "B-8V20A - 20 x UnGd Rkts, 80 mm S-8OM IL", "weight": 364} B_8V20A___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag = {"clsid": "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}", "name": "B-8V20A - 20 x UnGd Rkts, 80 mm S-8KOM HEAT/Frag", "weight": 348} CATM_9M = {"clsid": "CATM-9M", "name": "Captive AIM-9M for ACM", "weight": 85.73} + Cargo_Bay_M4 = {"clsid": "{C130-Cargo-Bay-M4}", "name": "Cargo-Bay-M4", "weight": 1} CBLS_200 = {"clsid": "CBLS-200", "name": "4*BDU-33 - AF/B37K Rack with 4*25lb Practice Bomb LD", "weight": 84.4} CBM___28_x_Mk_82_AIR_Ballute___500lb_GP_Bomb_HD = {"clsid": "{CBM_Mk82AIR}", "name": "CBM - 28 x Mk-82 AIR Ballute - 500lb GP Bomb HD", "weight": 8211.4} CBU87_10 = {"clsid": "CBU87*10", "name": "SECBM - 10 x CBU-87 - 202 x CEM Cluster Bomb", "weight": 5477.3} @@ -545,6 +546,8 @@ class Weapons: Fuel_Tank_490_L_Central__21_ = {"clsid": "{PTB_490C_MIG21}", "name": "Fuel Tank 490 L Central (21)", "weight": 434} Fuel_Tank_490_L__21_ = {"clsid": "{PTB_490_MIG21}", "name": "Fuel Tank 490 L (21)", "weight": 434} Fuel_Tank_800_L__21_ = {"clsid": "{PTB_800_MIG21}", "name": "Fuel Tank 800 L (21)", "weight": 682} + Fuel_Tank_8900_pounds = {"clsid": "{C130J_Ext_Tank_L}", "name": "Fuel Tank 8900 pounds", "weight": 4145.83088} + Fuel_Tank_8900_pounds_ = {"clsid": "{C130J_Ext_Tank_R}", "name": "Fuel Tank 8900 pounds", "weight": 4145.83088} Fuel_Tank_FT600 = {"clsid": "Fuel_Tank_FT600", "name": "Fuel tank FT600", "weight": 1925} Fuel_tank_1150L = {"clsid": "{414E383A-59EB-41BC-8566-2B5E0788ED1F}", "name": "Fuel tank 1150L", "weight": 975.25} Fuel_tank_1150L_MiG_29 = {"clsid": "{C0FF4842-FBAC-11d5-9190-00A0249B6F00}", "name": "Fuel tank 1150L MiG-29", "weight": 975.25} @@ -905,6 +908,7 @@ class Weapons: M134_SIDE_L = {"clsid": "M134_SIDE_L", "name": "M134 - 6 x 7.62mm MiniGun left door", "weight": 270.4} M134_SIDE_R = {"clsid": "M134_SIDE_R", "name": "M134 - 6 x 7.62mm MiniGun right door", "weight": 270.4} M134___6_x_7_62mm_MiniGun_right_door = {"clsid": "{SA342_M134_SIDE_R}", "name": "M134 - 6 x 7.62mm MiniGun right door", "weight": 270.4} + M18_Sidearm = {"clsid": "{C130-M18-Sidearm}", "name": "M18-Sidearm", "weight": 4.3} M2000_Fuel_tank = {"clsid": "{414DA830-B61A-4F9E-B71B-C2F6832E1D7A}", "name": "M2000 Fuel tank", "weight": 1050} M240H = {"clsid": "{CH47_PORT_M240H}", "name": "M240H", "weight": 150.4} M240H_ = {"clsid": "{CH47_STBD_M240H}", "name": "M240H", "weight": 150.4} @@ -2187,6 +2191,7 @@ class Weapons: "B_8V20A_OM": Weapons.B_8V20A_OM, "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}": Weapons.B_8V20A___20_x_UnGd_Rkts__80_mm_S_8KOM_HEAT_Frag, "CATM-9M": Weapons.CATM_9M, + "{C130-Cargo-Bay-M4}": Weapons.Cargo_Bay_M4, "CBLS-200": Weapons.CBLS_200, "{CBM_Mk82AIR}": Weapons.CBM___28_x_Mk_82_AIR_Ballute___500lb_GP_Bomb_HD, "CBU87*10": Weapons.CBU87_10, @@ -2355,6 +2360,8 @@ class Weapons: "{PTB_490C_MIG21}": Weapons.Fuel_Tank_490_L_Central__21_, "{PTB_490_MIG21}": Weapons.Fuel_Tank_490_L__21_, "{PTB_800_MIG21}": Weapons.Fuel_Tank_800_L__21_, + "{C130J_Ext_Tank_L}": Weapons.Fuel_Tank_8900_pounds, + "{C130J_Ext_Tank_R}": Weapons.Fuel_Tank_8900_pounds_, "Fuel_Tank_FT600": Weapons.Fuel_Tank_FT600, "{414E383A-59EB-41BC-8566-2B5E0788ED1F}": Weapons.Fuel_tank_1150L, "{C0FF4842-FBAC-11d5-9190-00A0249B6F00}": Weapons.Fuel_tank_1150L_MiG_29, @@ -2715,6 +2722,7 @@ class Weapons: "M134_SIDE_L": Weapons.M134_SIDE_L, "M134_SIDE_R": Weapons.M134_SIDE_R, "{SA342_M134_SIDE_R}": Weapons.M134___6_x_7_62mm_MiniGun_right_door, + "{C130-M18-Sidearm}": Weapons.M18_Sidearm, "{414DA830-B61A-4F9E-B71B-C2F6832E1D7A}": Weapons.M2000_Fuel_tank, "{CH47_PORT_M240H}": Weapons.M240H, "{CH47_STBD_M240H}": Weapons.M240H_, diff --git a/tools/pydcs_export.lua b/tools/pydcs_export.lua index 36b4aa0d..bdb69ed6 100644 --- a/tools/pydcs_export.lua +++ b/tools/pydcs_export.lua @@ -231,6 +231,7 @@ flyable["AJS37"] = true flyable["AV8BNA"] = true flyable["C-101CC"] = true flyable["C-101EB"] = true +flyable["C-130J-30"] = true flyable["F-14A-135-GR"] = true flyable["F-14A-135-GR-EARLY"] = true flyable["F-14B"] = true