weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

pydcs update: refactored livery-scanner

Browse Source
This commit is contained in:
Raffson 2023-05-16 20:48:20 +02:00
parent 1b1090d78f
commit f00a3fb1d2
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
23 changed files with 4 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
game/migrator.py
View File

@ -96,7 +96,8 @@ class Migrator:
for cp in self.game.theater.controlpoints:
for s in cp.squadrons:
preferred_task = max(
s.aircraft.task_priorities, key=lambda x: s.aircraft.task_priorities[x]
s.aircraft.task_priorities,
key=lambda x: s.aircraft.task_priorities[x],
)
try_set_attr(s, "primary_task", preferred_task)
try_set_attr(s, "max_size", 12)

11
pydcs_extensions/SWPack/SWPack.py
View File

@ -1,7 +1,6 @@
from typing import Set
from dcs import task
from dcs.liveries_scanner import Liveries
from dcs.planes import PlaneType
from dcs.weapons_data import Weapons
from dcs import unittype
@ -104,7 +103,6 @@ class XWING(PlaneType):
radio_frequency = 127.5
livery_name = "XWING" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
PROTONM = (1, SWWeapons.PROTONM)
@ -158,7 +156,6 @@ class YWING(PlaneType):
radio_frequency = 127.5
livery_name = "YWING" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
PROTONB = (1, SWWeapons.PROTONB)
@ -264,7 +261,6 @@ class CORVETTE(PlaneType):
radio_frequency = 127.5
livery_name = "CORVETTE" # from type
Liveries = Liveries()[livery_name]
class Pylon3:
PROTONM3 = (3, SWWeapons.PROTONM3)
@ -314,7 +310,6 @@ class AWING(PlaneType):
radio_frequency = 127.5
livery_name = "AWING" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
PROTONM1 = (1, SWWeapons.PROTONM1)
@ -358,7 +353,6 @@ class FAUCON(PlaneType):
radio_frequency = 127.5
livery_name = "FAUCON" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
PROTONF = (1, SWWeapons.PROTONF)
@ -396,7 +390,6 @@ class TIE(PlaneType):
radio_frequency = 127.5
livery_name = "TIE" # from type
Liveries = Liveries()[livery_name]
class Pylon2:
ENERGY_CELL_ = (2, SWWeapons.ENERGY_CELL_)
@ -434,7 +427,6 @@ class HUNTER(PlaneType):
radio_frequency = 127.5
livery_name = "HUNTER" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
PROTONM2 = (1, SWWeapons.PROTONM2)
@ -478,7 +470,6 @@ class TIE_INTER(PlaneType):
radio_frequency = 127.5
livery_name = "TIE_INTER" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
PROTONM1 = (1, SWWeapons.PROTONM1)
@ -522,7 +513,6 @@ class naboo_starfighter(PlaneType):
radio_frequency = 127.5
livery_name = "NABOO_STARFIGHTER" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
PROTONM = (1, SWWeapons.PROTONM)
@ -580,7 +570,6 @@ class tie_bomber_2(PlaneType):
radio_frequency = 127.5
livery_name = "TIE_BOMBER_2" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
PROTONM1 = (1, SWWeapons.PROTONM1)

2
pydcs_extensions/a4ec/a4ec.py
View File

@ -1,7 +1,6 @@
from typing import Any, Dict, Set
from dcs import task
from dcs.liveries_scanner import Liveries
from dcs.planes import PlaneType
from dcs.weapons_data import Weapons
@ -579,7 +578,6 @@ class A_4E_C(PlaneType):
x_14_seconds = 7
livery_name = "A-4E-C" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
LAU_7_with_AIM_9B_Sidewinder_IR_AAM = (

2
pydcs_extensions/a6a/a6a.py
View File

@ -3,7 +3,6 @@ from typing import Set
from dcs import task
from dcs.planes import PlaneType
from dcs.weapons_data import Weapons
from dcs.liveries_scanner import Liveries
from game.modsupport import planemod
@ -26,7 +25,6 @@ class VSN_A6A(PlaneType):
radio_frequency = 250.5
livery_name = "VSN_A6A" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
F_5_275Gal_Fuel_tank = (1, Weapons.F_5_275Gal_Fuel_tank)

2
pydcs_extensions/a7e/a7e.py
View File

@ -2,7 +2,6 @@ from typing import Set
from dcs import task
from dcs.planes import PlaneType
from dcs.liveries_scanner import Liveries
from dcs.weapons_data import Weapons
from game.modsupport import planemod
@ -498,7 +497,6 @@ class A_7E(PlaneType):
radio_frequency = 124
livery_name = "A-7E" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
AGM_62_Walleye_II___Guided_Weapon_Mk_5__TV_Guided_ = (

2
pydcs_extensions/f100/f100.py
View File

@ -1,7 +1,6 @@
from typing import Set
from dcs import task
from dcs.liveries_scanner import Liveries
from dcs.planes import PlaneType
from dcs.weapons_data import Weapons
@ -52,7 +51,6 @@ class VSN_F100(PlaneType):
category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F}
livery_name = "VSN_F100" # from type
Liveries = Liveries()[livery_name]
class Pylon2:
L_081_Fantasmagoria_ELINT_pod = (2, Weapons.L_081_Fantasmagoria_ELINT_pod)

5
pydcs_extensions/f104/f104.py
View File

@ -1,7 +1,6 @@
from typing import Set
from dcs import task
from dcs.liveries_scanner import Liveries
from dcs.planes import PlaneType
from dcs.weapons_data import Weapons
@ -67,7 +66,6 @@ class VSN_F104C(PlaneType):
category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F}
livery_name = "VSN_F104C" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
Smoke_Generator___red_ = (1, Weapons.Smoke_Generator___red_)
@ -321,7 +319,6 @@ class VSN_F104G(PlaneType):
category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F}
livery_name = "VSN_F104G" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
Smoke_Generator___red_ = (1, Weapons.Smoke_Generator___red_)
@ -584,7 +581,6 @@ class VSN_F104S(PlaneType):
category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F}
livery_name = "VSN_F104S" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
Smoke_Generator___red_ = (1, Weapons.Smoke_Generator___red_)
@ -717,7 +713,6 @@ class VSN_F104S_AG(PlaneType):
category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F}
livery_name = "VSN_F104S_AG" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
Smoke_Generator___red_ = (1, Weapons.Smoke_Generator___red_)

3
pydcs_extensions/f105/f105.py
View File

@ -1,7 +1,6 @@
from typing import Set
from dcs import task
from dcs.liveries_scanner import Liveries
from dcs.planes import PlaneType
from dcs.weapons_data import Weapons
@ -64,7 +63,6 @@ class VSN_F105G(PlaneType):
category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F}
livery_name = "VSN_F105G" # from type
Liveries = Liveries()[livery_name]
class Pylon3:
Smoke_Generator___red_ = (3, Weapons.Smoke_Generator___red_)
@ -239,7 +237,6 @@ class VSN_F105D(PlaneType):
category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F}
livery_name = "VSN_F105D" # from type
Liveries = Liveries()[livery_name]
class Pylon3:
Smoke_Generator___red_ = (3, Weapons.Smoke_Generator___red_)

2
pydcs_extensions/f15d/f15d.py
View File

@ -1,7 +1,6 @@
from typing import Set
from dcs import task
from dcs.liveries_scanner import Liveries
from dcs.planes import PlaneType
from dcs.weapons_data import Weapons
@ -56,7 +55,6 @@ class F_15D(PlaneType):
radio_frequency = 127.5
livery_name = "F-15D" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
AIM_120B_AMRAAM___Active_Rdr_AAM = (1, Weapons.AIM_120B_AMRAAM___Active_Rdr_AAM)

8
pydcs_extensions/f16i_idf/f16i_idf.py
View File

@ -1,7 +1,6 @@
from typing import Dict, List, Set, Any
from dcs import task
from dcs.liveries_scanner import Liveries
from dcs.planes import F_16C_50, PlaneType
from dcs.weapons_data import Weapons
@ -512,7 +511,6 @@ class F_16D_52(PlaneType):
NVG = 2
livery_name = "F-16D_52" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
AIM_9M_Sidewinder_IR_AAM = (1, Weapons.AIM_9M_Sidewinder_IR_AAM)
@ -1382,7 +1380,6 @@ class F_16D_50(PlaneType):
NVG = 2
livery_name = "F-16D_50" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
AIM_9M_Sidewinder_IR_AAM = (1, Weapons.AIM_9M_Sidewinder_IR_AAM)
@ -2252,7 +2249,6 @@ class F_16D_52_NS(PlaneType):
NVG = 2
livery_name = "F-16D_52_NS" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
AIM_9M_Sidewinder_IR_AAM = (1, Weapons.AIM_9M_Sidewinder_IR_AAM)
@ -3121,7 +3117,6 @@ class F_16D_50_NS(PlaneType):
NVG = 2
livery_name = "F-16D_50_NS" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
AIM_9M_Sidewinder_IR_AAM = (1, Weapons.AIM_9M_Sidewinder_IR_AAM)
@ -3990,7 +3985,6 @@ class F_16D_Barak_40(PlaneType):
NVG = 2
livery_name = "F-16D_BARAK_40" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
AIM_9M_Sidewinder_IR_AAM = (1, Weapons.AIM_9M_Sidewinder_IR_AAM)
@ -4834,7 +4828,6 @@ class F_16D_Barak_30(PlaneType):
NVG = 2
livery_name = "F-16D_BARAK_30" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
AIM_9M_Sidewinder_IR_AAM = (1, Weapons.AIM_9M_Sidewinder_IR_AAM)
@ -5678,7 +5671,6 @@ class F_16I(PlaneType):
NVG = 2
livery_name = "F-16I" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
AIM_9M_Sidewinder_IR_AAM = (1, Weapons.AIM_9M_Sidewinder_IR_AAM)

2
pydcs_extensions/f22a/f22a.py
View File

@ -1,7 +1,6 @@
from typing import Any, Dict, Set
from dcs import task
from dcs.liveries_scanner import Liveries
from dcs.planes import PlaneType
from dcs.weapons_data import Weapons
@ -44,7 +43,6 @@ class F_22A(PlaneType):
id = "BAY_DOOR_OPTION"
livery_name = "F-22A" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
AIM_9X_Sidewinder_IR_AAM = (1, Weapons.AIM_9X_Sidewinder_IR_AAM)

3
pydcs_extensions/f4b/f4b.py
View File

@ -1,7 +1,6 @@
from dcs import task
from dcs.planes import PlaneType
from dcs.weapons_data import Weapons
from dcs.liveries_scanner import Liveries
from game.modsupport import planemod
from pydcs_extensions.weapon_injector import inject_weapons
@ -71,7 +70,6 @@ class VSN_F4B(PlaneType):
radio_frequency = 127.5
livery_name = "VSN_F4B" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
Smoke_Generator___red_ = (1, Weapons.Smoke_Generator___red_)
@ -397,7 +395,6 @@ class VSN_F4C(PlaneType):
radio_frequency = 127.5
livery_name = "VSN_F4C" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
Smoke_Generator___red_ = (1, Weapons.Smoke_Generator___red_)

2
pydcs_extensions/f84g/f84g.py
View File

@ -1,7 +1,6 @@
from typing import Set
from dcs import task
from dcs.liveries_scanner import Liveries
from dcs.planes import PlaneType
from dcs.weapons_data import Weapons
@ -29,7 +28,6 @@ class VSN_F84G(PlaneType):
radio_frequency = 127.5
livery_name = "VSN_F84G" # from type
Liveries = Liveries()[livery_name]
class Pylon2:
Tank = (2, WeaponsF84G.Tank)

4
pydcs_extensions/fa18efg/fa18efg.py
View File

@ -3,7 +3,6 @@ from typing import Dict, List, Set, Any
from dcs import task
from dcs.planes import PlaneType
from dcs.weapons_data import Weapons
from dcs.liveries_scanner import Liveries
from game.modsupport import planemod
from pydcs_extensions.weapon_injector import inject_weapons
@ -147,7 +146,6 @@ class FA_18E(PlaneType):
NVG = 2
livery_name = "FA-18E" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
AIM_9M_Sidewinder_IR_AAM = (1, Weapons.AIM_9M_Sidewinder_IR_AAM)
@ -1134,7 +1132,6 @@ class FA_18F(PlaneType):
NVG = 2
livery_name = "FA-18F" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
AIM_9M_Sidewinder_IR_AAM = (1, Weapons.AIM_9M_Sidewinder_IR_AAM)
@ -2121,7 +2118,6 @@ class EA_18G(PlaneType):
NVG = 2
livery_name = "EA-18G" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
FPU_12_Fuel_Tank_480_gallons = (1, WeaponsFA18EFG.FPU_12_Fuel_Tank_480_gallons)

2
pydcs_extensions/hercules/hercules.py
View File

@ -1,7 +1,6 @@
from typing import Set
from dcs import task
from dcs.liveries_scanner import Liveries
from dcs.planes import PlaneType
from dcs.weapons_data import Weapons
@ -730,7 +729,6 @@ class Hercules(PlaneType):
}
livery_name = "HERCULES" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
Herc_JATO = (1, HerculesWeapons.Herc_JATO)

4
pydcs_extensions/jas39/jas39.py
View File

@ -1,7 +1,6 @@
from typing import Set
from dcs import task
from dcs.liveries_scanner import Liveries
from dcs.planes import PlaneType
from dcs.weapons_data import Weapons
@ -300,7 +299,6 @@ class JAS39Gripen(PlaneType):
radio_frequency = 127.5
livery_name = "JAS39GRIPEN" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
IRIS_T_IR_AAM = (1, JAS39GripenWeapons.IRIS_T_IR_AAM)
@ -557,7 +555,6 @@ class JAS39Gripen_BVR(PlaneType):
radio_frequency = 127.5
livery_name = "JAS39GRIPEN_BVR" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
IRIS_T_IR_AAM = (1, JAS39GripenWeapons.IRIS_T_IR_AAM)
@ -814,7 +811,6 @@ class JAS39Gripen_AG(PlaneType):
radio_frequency = 127.5
livery_name = "JAS39GRIPEN_AG" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
IRIS_T_IR_AAM = (1, JAS39GripenWeapons.IRIS_T_IR_AAM)

2
pydcs_extensions/ov10a/ov10a.py
View File

@ -1,7 +1,6 @@
from typing import Set
from dcs import task
from dcs.liveries_scanner import Liveries
from dcs.planes import PlaneType
from dcs.weapons_data import Weapons
@ -42,7 +41,6 @@ class Bronco_OV_10A(PlaneType):
}
livery_name = "BRONCO-OV-10A" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
LAU_7_with_AIM_9P_Sidewinder_IR_AAM = (

5
pydcs_extensions/su30/su30.py
View File

@ -1,7 +1,6 @@
from typing import Dict, Any, Set
from dcs import task
from dcs.liveries_scanner import Liveries
from dcs.planes import PlaneType
from dcs.weapons_data import Weapons
@ -208,7 +207,6 @@ class Su_30MKI(PlaneType):
id = "MOUNTSURA"
livery_name = "SU-30MKI" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
R_73__AA_11_Archer____Infra_Red = (1, Weapons.R_73__AA_11_Archer____Infra_Red)
@ -860,7 +858,6 @@ class Su_30MKA(PlaneType):
id = "MOUNTSURA"
livery_name = "SU-30MKA" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
R_73__AA_11_Archer____Infra_Red = (1, Weapons.R_73__AA_11_Archer____Infra_Red)
@ -1462,7 +1459,6 @@ class Su_30MKM(PlaneType):
Equally_Responsible = -2
livery_name = "SU-30MKM" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
R_73__AA_11_Archer____Infra_Red = (1, Weapons.R_73__AA_11_Archer____Infra_Red)
@ -2069,7 +2065,6 @@ class Su_30SM(PlaneType):
id = "MOUNTSURA"
livery_name = "SU-30SM" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
R_73__AA_11_Archer____Infra_Red = (1, Weapons.R_73__AA_11_Archer____Infra_Red)

2
pydcs_extensions/su57/su57.py
View File

@ -1,7 +1,6 @@
from typing import Set
from dcs import task
from dcs.liveries_scanner import Liveries
from dcs.planes import PlaneType
from dcs.weapons_data import Weapons
@ -42,7 +41,6 @@ class Su_57(PlaneType):
category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F}
livery_name = "SU-57" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
R_73__AA_11_Archer____Infra_Red = (1, Weapons.R_73__AA_11_Archer____Infra_Red)

2
pydcs_extensions/swedishmilitaryassetspack/swedishmilitaryassetspack.py
View File

@ -6,7 +6,6 @@ from typing import Set
from dcs import unittype, task
from dcs.helicopters import HelicopterType
from dcs.liveries_scanner import Liveries
from game.modsupport import vehiclemod, shipmod, helicoptermod
@ -410,7 +409,6 @@ class HKP15B(HelicopterType):
}
livery_name = "HKP15B" # from type
Liveries = Liveries()[livery_name]
pylons: Set[int] = set()

3
pydcs_extensions/uh60l/uh60l.py
View File

@ -2,7 +2,6 @@ from typing import Any, Dict, Set
from dcs import task
from dcs.helicopters import HelicopterType
from dcs.liveries_scanner import Liveries
from dcs.planes import PlaneType
from game.modsupport import helicoptermod, planemod
@ -114,7 +113,6 @@ class UH_60L(HelicopterType):
Equally_Responsible = -2
livery_name = "UH-60L" # from type
Liveries = Liveries()[livery_name]
class Pylon1:
CEFS_Fuel_Tank_200_gallons = (1, WeaponsUH60L.CEFS_Fuel_Tank_200_gallons)
@ -170,7 +168,6 @@ class KC130J(PlaneType):
category = "Tankers" # {8A302789-A55D-4897-B647-66493FA6826F}
livery_name = "KC130J" # from type
Liveries = Liveries()[livery_name]
pylons: Set[int] = set()

2
qt_ui/windows/AirWingConfigurationDialog.py
View File

@ -145,7 +145,7 @@ class SquadronLiverySelector(QComboBox):
liveries = set()
cc = squadron.coalition.faction.country_shortname
aircraft_liveries = self.aircraft_type.dcs_unit_type.Liveries
aircraft_liveries = set(self.aircraft_type.dcs_unit_type.iter_liveries())
if len(aircraft_liveries) == 0:
logging.info(f"Liveries for {self.aircraft_type} is empty!")
for livery in aircraft_liveries:

2
requirements.txt
View File

@ -30,7 +30,7 @@ platformdirs==3.5.1
pluggy==1.0.0
pre-commit==3.3.1
pydantic==1.10.7
-e git+https://github.com/dcs-retribution/pydcs@af21d553503eaa781f93abd0f1016c817c621547#egg=pydcs
-e git+https://github.com/dcs-retribution/pydcs@2b3d68c74ef97d7b12be86cc864f65a952a57d21#egg=pydcs
pyinstaller==5.11.0
pyinstaller-hooks-contrib==2023.3
pyparsing==3.0.9