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 for Phantom II

Browse Source 
Save compat changes included
This commit is contained in:
Raffson
2024-05-24 19:14:12 +02:00
parent c947ac0ef1
commit c09a5b68d5
14 changed files with 139 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
game/campaignloader/mizcampaignloader.py
View File

@@ -56,7 +56,7 @@ class MizCampaignLoader:
OFFSHORE_STRIKE_TARGET_UNIT_TYPE = Fortification.Oil_platform.id
SHIP_UNIT_TYPE = USS_Arleigh_Burke_IIa.id
MISSILE_SITE_UNIT_TYPE = MissilesSS.Scud_B.id
COASTAL_DEFENSE_UNIT_TYPE = MissilesSS.Hy_launcher.id
COASTAL_DEFENSE_UNIT_TYPE = MissilesSS.hy_launcher.id
COMMAND_CENTER_UNIT_TYPE = Fortification._Command_Center.id
CONNECTION_NODE_UNIT_TYPE = Fortification.Comms_tower_M.id
@@ -73,23 +73,23 @@ class MizCampaignLoader:
MEDIUM_RANGE_SAM_UNIT_TYPES = {
AirDefence.Hawk_ln.id,
AirDefence.S_75M_Volhov.id,
AirDefence.X_5p73_s_125_ln.id,
AirDefence.x_5p73_s_125_ln.id,
}
SHORT_RANGE_SAM_UNIT_TYPES = {
AirDefence.M1097_Avenger.id,
AirDefence.Rapier_fsa_launcher.id,
AirDefence.X_2S6_Tunguska.id,
AirDefence.rapier_fsa_launcher.id,
AirDefence.x_2S6_Tunguska.id,
AirDefence.Strela_1_9P31.id,
}
AAA_UNIT_TYPES = {
AirDefence.Flak18.id,
AirDefence.flak18.id,
AirDefence.Vulcan.id,
AirDefence.ZSU_23_4_Shilka.id,
}
EWR_UNIT_TYPE = AirDefence.X_1L13_EWR.id
EWR_UNIT_TYPE = AirDefence.x_1L13_EWR.id
ARMOR_GROUP_UNIT_TYPE = Armor.M_1_Abrams.id

14
game/data/alic.py
View File

@@ -5,8 +5,8 @@ from game.theater.theatergroup import TheaterUnit
class AlicCodes:
CODES = {
AirDefence.X_1L13_EWR.id: 101,
AirDefence.X_55G6_EWR.id: 102,
AirDefence.x_1L13_EWR.id: 101,
AirDefence.x_55G6_EWR.id: 102,
AirDefence.S_300PS_40B6MD_sr.id: 103,
AirDefence.S_300PS_64H6E_sr.id: 104,
AirDefence.SA_11_Buk_SR_9S18M1.id: 107,
@@ -17,12 +17,12 @@ class AlicCodes:
AirDefence.Osa_9A33_ln.id: 117,
AirDefence.Strela_10M3.id: 118,
AirDefence.Tor_9A331.id: 119,
AirDefence.X_2S6_Tunguska.id: 120,
AirDefence.x_2S6_Tunguska.id: 120,
AirDefence.ZSU_23_4_Shilka.id: 121,
AirDefence.P_19_s_125_sr.id: 122,
AirDefence.Snr_s_125_tr.id: 123,
AirDefence.Rapier_fsa_blindfire_radar.id: 124,
AirDefence.Rapier_fsa_launcher.id: 125,
AirDefence.p_19_s_125_sr.id: 122,
AirDefence.snr_s_125_tr.id: 123,
AirDefence.rapier_fsa_blindfire_radar.id: 124,
AirDefence.rapier_fsa_launcher.id: 125,
AirDefence.SNR_75V.id: 126,
AirDefence.HQ_7_LN_SP.id: 127,
AirDefence.HQ_7_STR_SP.id: 128,

24
game/data/radar_db.py
View File

@@ -26,7 +26,7 @@ from dcs.vehicles import AirDefence
from pydcs_extensions import highdigitsams as hds
TELARS = {
AirDefence.X_2S6_Tunguska,
AirDefence.x_2S6_Tunguska,
AirDefence.SA_11_Buk_LN_9A310M1,
AirDefence.Osa_9A33_ln,
AirDefence.Tor_9A331,
@@ -36,14 +36,14 @@ TELARS = {
TRACK_RADARS = {
AirDefence.Kub_1S91_str,
AirDefence.Snr_s_125_tr,
AirDefence.snr_s_125_tr,
AirDefence.S_300PS_40B6M_tr,
AirDefence.S_300PS_5H63C_30H6_tr,
AirDefence.Hawk_tr,
AirDefence.Patriot_str,
AirDefence.SNR_75V,
AirDefence.RPC_5N62V,
AirDefence.Rapier_fsa_blindfire_radar,
AirDefence.rapier_fsa_blindfire_radar,
AirDefence.HQ_7_STR_SP,
AirDefence.NASAMS_Radar_MPQ64F1,
hds.SAM_SA_10B_S_300PS_30N6_TR,
@@ -55,7 +55,7 @@ TRACK_RADARS = {
LAUNCHER_TRACKER_PAIRS = {
AirDefence.Kub_2P25_ln: (AirDefence.Kub_1S91_str,),
AirDefence.X_5p73_s_125_ln: (AirDefence.Snr_s_125_tr,),
AirDefence.x_5p73_s_125_ln: (AirDefence.snr_s_125_tr,),
AirDefence.S_300PS_5P85C_ln: (
AirDefence.S_300PS_40B6M_tr,
AirDefence.S_300PS_5H63C_30H6_tr,
@@ -67,14 +67,14 @@ LAUNCHER_TRACKER_PAIRS = {
AirDefence.Hawk_ln: (AirDefence.Hawk_tr,),
AirDefence.Patriot_ln: (AirDefence.Patriot_str,),
AirDefence.S_75M_Volhov: (AirDefence.SNR_75V,),
AirDefence.Rapier_fsa_launcher: (AirDefence.Rapier_fsa_blindfire_radar,),
AirDefence.rapier_fsa_launcher: (AirDefence.rapier_fsa_blindfire_radar,),
AirDefence.HQ_7_LN_SP: (AirDefence.HQ_7_STR_SP,),
AirDefence.S_200_Launcher: (AirDefence.RPC_5N62V,),
AirDefence.NASAMS_LN_B: (AirDefence.NASAMS_Radar_MPQ64F1,),
AirDefence.NASAMS_LN_C: (AirDefence.NASAMS_Radar_MPQ64F1,),
hds.SAM_SA_2__V759__LN_SM_90: (AirDefence.SNR_75V,),
hds.SAM_HQ_2_LN_SM_90: (AirDefence.SNR_75V,),
hds.SAM_SA_3__V_601P__LN_5P73: (AirDefence.Snr_s_125_tr,),
hds.SAM_SA_3__V_601P__LN_5P73: (AirDefence.snr_s_125_tr,),
hds.SAM_SA_10B_S_300PS_5P85SE_LN: (hds.SAM_SA_10B_S_300PS_30N6_TR,),
hds.SAM_SA_10B_S_300PS_5P85SU_LN: (hds.SAM_SA_10B_S_300PS_30N6_TR,),
hds.SAM_SA_12_S_300V_9A82_LN: (hds.SAM_SA_12_S_300V_9S32_TR,),
@@ -88,7 +88,7 @@ LAUNCHER_TRACKER_PAIRS = {
UNITS_WITH_RADAR = {
# Radars
AirDefence.X_2S6_Tunguska,
AirDefence.x_2S6_Tunguska,
AirDefence.SA_11_Buk_LN_9A310M1,
AirDefence.Osa_9A33_ln,
AirDefence.Tor_9A331,
@@ -96,11 +96,11 @@ UNITS_WITH_RADAR = {
AirDefence.Vulcan,
AirDefence.Roland_ADS,
AirDefence.ZSU_23_4_Shilka,
AirDefence.X_1L13_EWR,
AirDefence.x_1L13_EWR,
AirDefence.Kub_1S91_str,
AirDefence.S_300PS_40B6M_tr,
AirDefence.S_300PS_40B6MD_sr,
AirDefence.X_55G6_EWR,
AirDefence.x_55G6_EWR,
AirDefence.S_300PS_64H6E_sr,
AirDefence.SA_11_Buk_SR_9S18M1,
AirDefence.Dog_Ear_radar,
@@ -108,13 +108,13 @@ UNITS_WITH_RADAR = {
AirDefence.Hawk_sr,
AirDefence.Patriot_str,
AirDefence.Hawk_cwar,
AirDefence.P_19_s_125_sr,
AirDefence.p_19_s_125_sr,
AirDefence.Roland_Radar,
AirDefence.Snr_s_125_tr,
AirDefence.snr_s_125_tr,
AirDefence.SNR_75V,
AirDefence.RLS_19J6,
AirDefence.RPC_5N62V,
AirDefence.Rapier_fsa_blindfire_radar,
AirDefence.rapier_fsa_blindfire_radar,
AirDefence.HQ_7_LN_SP,
AirDefence.HQ_7_STR_SP,
AirDefence.FuMG_401,

19
game/persistency.py
View File

@@ -74,6 +74,25 @@ class MigrationUnpickler(pickle.Unpickler):
return ELM2084_MMR_AD_RT
elif name == "IRON_DOME_CP":
return Iron_Dome_David_Sling_CP
if module == "dcs.terrain.kola.airports":
if name == "Lakselv":
from dcs.terrain.kola.airports import Banak
return Banak
elif name == "Severomorsk1":
from dcs.terrain.kola.airports import Severomorsk_1
return Severomorsk_1
elif name == "Severomorsk3":
from dcs.terrain.kola.airports import Severomorsk_3
return Severomorsk_3
elif name == "Olenegorsk":
from dcs.terrain.kola.airports import Olenya
return Olenya
if module == "dcs.vehicles":
try:
return super().find_class(module, name)
except AttributeError:
alternate = name.split('.')[:-1] + [name.split('.')[-1][0].lower() + name.split('.')[-1][1:]]
name = '.'.join(alternate)
return super().find_class(module, name)
# fmt: on

8
game/theater/controlpoint.py
View File

@@ -28,7 +28,7 @@ from uuid import UUID
from dcs.mapping import Point
from dcs.ships import (
Ara_vdm,
ara_vdm,
CVN_71,
CVN_72,
CVN_73,
@@ -39,7 +39,7 @@ from dcs.ships import (
LHA_Tarawa,
Stennis,
Type_071,
Hms_invincible,
hms_invincible,
)
from dcs.terrain.terrain import Airport, ParkingSlot
from dcs.unitgroup import ShipGroup, StaticGroup
@@ -1385,13 +1385,13 @@ class NavalControlPoint(
for group in self.find_main_tgo().groups:
for u in group.units:
if u.alive and u.type in [
Ara_vdm,
ara_vdm,
Forrestal,
Stennis,
LHA_Tarawa,
KUZNECOW,
Type_071,
Hms_invincible,
hms_invincible,
L02,
L52,
L61,