From e129c02109a88122ee9a8bf93abca845a6547e8f Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Sat, 11 Mar 2023 14:42:30 -0800 Subject: [PATCH] Update pydcs. Includes the new A-10C radios. Will follow up to make Liberation actually use them. This manually removes some weapons from mod files that were removed from DCS. Those mods may need re-exporting, and may also need updating by their authors, but for now this should keep them functioning. --- changelog.md | 2 +- pydcs_extensions/f104/f104.py | 2 -- pydcs_extensions/f4/f4.py | 12 ------------ requirements.txt | 2 +- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/changelog.md b/changelog.md index 859cf0ce..d71febf1 100644 --- a/changelog.md +++ b/changelog.md @@ -4,7 +4,7 @@ Saves from 6.x are not compatible with 7.0. ## Features/Improvements -* **[Engine]** Support for DCS 2.8.2.35632. +* **[Engine]** Support for DCS 2.8.3.37556. * **[Engine]** Saved games are now a zip file of save assets for easier bug reporting. The new extension is .liberation.zip. Drag and drop that file into bug reports. * **[Flight Planning]** Package TOT and composition can be modified after advancing time in Liberation. * **[Mission Generation]** Units on the front line are now hidden on MFDs. diff --git a/pydcs_extensions/f104/f104.py b/pydcs_extensions/f104/f104.py index f9bcf758..440d6a1a 100644 --- a/pydcs_extensions/f104/f104.py +++ b/pydcs_extensions/f104/f104.py @@ -613,7 +613,6 @@ class VSN_F104S(PlaneType): AIM_9M_Sidewinder_IR_AAM = (3, Weapons.AIM_9M_Sidewinder_IR_AAM) AIM_9P_Sidewinder_IR_AAM = (3, Weapons.AIM_9P_Sidewinder_IR_AAM) AIM_9P5_Sidewinder_IR_AAM = (3, Weapons.AIM_9P5_Sidewinder_IR_AAM) - AIM_7E_Sparrow_Semi_Active_Radar = (3, Weapons.AIM_7E_Sparrow_Semi_Active_Radar) AIM_7F_Sparrow_Semi_Active_Radar = (3, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) class Pylon4: @@ -659,7 +658,6 @@ class VSN_F104S(PlaneType): AIM_9M_Sidewinder_IR_AAM = (9, Weapons.AIM_9M_Sidewinder_IR_AAM) AIM_9P_Sidewinder_IR_AAM = (9, Weapons.AIM_9P_Sidewinder_IR_AAM) AIM_9P5_Sidewinder_IR_AAM = (9, Weapons.AIM_9P5_Sidewinder_IR_AAM) - AIM_7E_Sparrow_Semi_Active_Radar = (9, Weapons.AIM_7E_Sparrow_Semi_Active_Radar) AIM_7F_Sparrow_Semi_Active_Radar = (9, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) class Pylon10: diff --git a/pydcs_extensions/f4/f4.py b/pydcs_extensions/f4/f4.py index c203ee0c..b9543ec5 100644 --- a/pydcs_extensions/f4/f4.py +++ b/pydcs_extensions/f4/f4.py @@ -178,7 +178,6 @@ class VSN_F4B(PlaneType): LAU_105_2_AIM_9J = (3, Weapons.LAU_105_2_AIM_9J) LAU_105_2_AIM_9JULI = (3, Weapons.LAU_105_2_AIM_9JULI) AIM_7F_Sparrow_Semi_Active_Radar = (3, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) - AIM_7E_Sparrow_Semi_Active_Radar = (3, Weapons.AIM_7E_Sparrow_Semi_Active_Radar) Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = ( 3, Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets, @@ -196,11 +195,9 @@ class VSN_F4B(PlaneType): class Pylon4: AIM_7F_Sparrow_Semi_Active_Radar = (4, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) - AIM_7E_Sparrow_Semi_Active_Radar = (4, Weapons.AIM_7E_Sparrow_Semi_Active_Radar) class Pylon5: AIM_7F_Sparrow_Semi_Active_Radar = (5, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) - AIM_7E_Sparrow_Semi_Active_Radar = (5, Weapons.AIM_7E_Sparrow_Semi_Active_Radar) class Pylon6: Smokewinder___red = (6, Weapons.Smokewinder___red) @@ -227,11 +224,9 @@ class VSN_F4B(PlaneType): class Pylon7: AIM_7F_Sparrow_Semi_Active_Radar = (7, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) - AIM_7E_Sparrow_Semi_Active_Radar = (7, Weapons.AIM_7E_Sparrow_Semi_Active_Radar) class Pylon8: AIM_7F_Sparrow_Semi_Active_Radar = (8, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) - AIM_7E_Sparrow_Semi_Active_Radar = (8, Weapons.AIM_7E_Sparrow_Semi_Active_Radar) class Pylon9: GBU_10___2000lb_Laser_Guided_Bomb = ( @@ -277,7 +272,6 @@ class VSN_F4B(PlaneType): LAU_105_2_AIM_9J = (9, Weapons.LAU_105_2_AIM_9J) LAU_105_2_AIM_9JULI = (9, Weapons.LAU_105_2_AIM_9JULI) AIM_7F_Sparrow_Semi_Active_Radar = (9, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) - AIM_7E_Sparrow_Semi_Active_Radar = (9, Weapons.AIM_7E_Sparrow_Semi_Active_Radar) Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = ( 9, Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets, @@ -486,7 +480,6 @@ class VSN_F4C(PlaneType): LAU_105_2_AIM_9J = (3, Weapons.LAU_105_2_AIM_9J) LAU_105_2_AIM_9JULI = (3, Weapons.LAU_105_2_AIM_9JULI) AIM_7F_Sparrow_Semi_Active_Radar = (3, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) - AIM_7E_Sparrow_Semi_Active_Radar = (3, Weapons.AIM_7E_Sparrow_Semi_Active_Radar) Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = ( 3, Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets, @@ -504,11 +497,9 @@ class VSN_F4C(PlaneType): class Pylon4: AIM_7F_Sparrow_Semi_Active_Radar = (4, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) - AIM_7E_Sparrow_Semi_Active_Radar = (4, Weapons.AIM_7E_Sparrow_Semi_Active_Radar) class Pylon5: AIM_7F_Sparrow_Semi_Active_Radar = (5, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) - AIM_7E_Sparrow_Semi_Active_Radar = (5, Weapons.AIM_7E_Sparrow_Semi_Active_Radar) class Pylon6: Smokewinder___red = (6, Weapons.Smokewinder___red) @@ -535,11 +526,9 @@ class VSN_F4C(PlaneType): class Pylon7: AIM_7F_Sparrow_Semi_Active_Radar = (7, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) - AIM_7E_Sparrow_Semi_Active_Radar = (7, Weapons.AIM_7E_Sparrow_Semi_Active_Radar) class Pylon8: AIM_7F_Sparrow_Semi_Active_Radar = (8, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) - AIM_7E_Sparrow_Semi_Active_Radar = (8, Weapons.AIM_7E_Sparrow_Semi_Active_Radar) class Pylon9: GBU_10___2000lb_Laser_Guided_Bomb = ( @@ -585,7 +574,6 @@ class VSN_F4C(PlaneType): LAU_105_2_AIM_9J = (9, Weapons.LAU_105_2_AIM_9J) LAU_105_2_AIM_9JULI = (9, Weapons.LAU_105_2_AIM_9JULI) AIM_7F_Sparrow_Semi_Active_Radar = (9, Weapons.AIM_7F_Sparrow_Semi_Active_Radar) - AIM_7E_Sparrow_Semi_Active_Radar = (9, Weapons.AIM_7E_Sparrow_Semi_Active_Radar) Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = ( 9, Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets, diff --git a/requirements.txt b/requirements.txt index 4bf03ada..f6335143 100644 --- a/requirements.txt +++ b/requirements.txt @@ -32,7 +32,7 @@ platformdirs==2.6.2 pluggy==1.0.0 pre-commit==2.21.0 pydantic==1.10.3 --e git+https://github.com/pydcs/dcs@88fe2e90696491ae59d3cf7be88e9dc25b4f3774#egg=pydcs +-e git+https://github.com/pydcs/dcs@7fd426bbd08794cb14a6c3371b61aff92b501853#egg=pydcs pyinstaller==5.7.0 pyinstaller-hooks-contrib==2022.14 pyproj==3.4.1