From 844f8595d137d62dbb16f55a63d83ce23adeb843 Mon Sep 17 00:00:00 2001 From: Khopa Date: Wed, 4 Nov 2020 21:07:28 +0100 Subject: [PATCH] Fixed ID of some units to match new pydcs data-export. --- game/db.py | 20 ++++++++++---------- gen/ground_forces/ai_ground_planner.py | 8 ++++---- resources/factions/allies_1944.json | 2 +- resources/factions/germany_1942.json | 2 +- resources/factions/germany_1944.json | 4 ++-- resources/factions/syria_1948.json | 2 +- resources/factions/uk_1944.json | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/game/db.py b/game/db.py index c19af009..a9bf7051 100644 --- a/game/db.py +++ b/game/db.py @@ -402,18 +402,18 @@ PRICES = { Armor.MT_Pz_Kpfw_V_Panther_Ausf_G:24, Armor.MT_Pz_Kpfw_IV_Ausf_H:16, Armor.HT_Pz_Kpfw_VI_Tiger_I:24, - Armor.HT_Pz_Kpfw_VI_Ausf__B__Tiger_II:26, + Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II:26, Armor.TD_Jagdpanther_G1: 18, Armor.TD_Jagdpanzer_IV: 11, Armor.Sd_Kfz_184_Elefant: 18, Armor.APC_Sd_Kfz_251:4, - Armor.IFV_Sd_Kfz_234_2_Puma:8, + Armor.AC_Sd_Kfz_234_2_Puma:8, Armor.MT_M4_Sherman:12, Armor.MT_M4A4_Sherman_Firefly:16, Armor.CT_Cromwell_IV:12, Armor.M30_Cargo_Carrier:2, Armor.APC_M2A1:4, - Armor.ST_Centaur_IV: 10, + Armor.CT_Centaur_IV: 10, Armor.HIT_Churchill_VII: 16, Armor.LAC_M8_Greyhound: 8, Armor.TD_M10_GMC: 14, @@ -743,13 +743,13 @@ UNIT_BY_TASK = { Armor.MT_Pz_Kpfw_V_Panther_Ausf_G, Armor.MT_Pz_Kpfw_IV_Ausf_H, Armor.HT_Pz_Kpfw_VI_Tiger_I, - Armor.HT_Pz_Kpfw_VI_Ausf__B__Tiger_II, + Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II, Armor.APC_Sd_Kfz_251, Armor.APC_Sd_Kfz_251, Armor.APC_Sd_Kfz_251, Armor.APC_Sd_Kfz_251, - Armor.IFV_Sd_Kfz_234_2_Puma, - Armor.IFV_Sd_Kfz_234_2_Puma, + Armor.AC_Sd_Kfz_234_2_Puma, + Armor.AC_Sd_Kfz_234_2_Puma, Armor.MT_M4_Sherman, Armor.MT_M4A4_Sherman_Firefly, Armor.CT_Cromwell_IV, @@ -762,12 +762,12 @@ UNIT_BY_TASK = { Armor.MT_Pz_Kpfw_V_Panther_Ausf_G, Armor.MT_Pz_Kpfw_IV_Ausf_H, Armor.HT_Pz_Kpfw_VI_Tiger_I, - Armor.HT_Pz_Kpfw_VI_Ausf__B__Tiger_II, + Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II, Armor.TD_Jagdpanther_G1, Armor.TD_Jagdpanzer_IV, Armor.Sd_Kfz_184_Elefant, Armor.APC_Sd_Kfz_251, - Armor.IFV_Sd_Kfz_234_2_Puma, + Armor.AC_Sd_Kfz_234_2_Puma, Armor.MT_M4_Sherman, Armor.MT_M4A4_Sherman_Firefly, Armor.CT_Cromwell_IV, @@ -776,8 +776,8 @@ UNIT_BY_TASK = { Armor.M30_Cargo_Carrier, Armor.APC_M2A1, Armor.APC_M2A1, - Armor.ST_Centaur_IV, - Armor.ST_Centaur_IV, + Armor.CT_Centaur_IV, + Armor.CT_Centaur_IV, Armor.HIT_Churchill_VII, Armor.LAC_M8_Greyhound, Armor.LAC_M8_Greyhound, diff --git a/gen/ground_forces/ai_ground_planner.py b/gen/ground_forces/ai_ground_planner.py index bda87407..02af7c6b 100644 --- a/gen/ground_forces/ai_ground_planner.py +++ b/gen/ground_forces/ai_ground_planner.py @@ -27,11 +27,11 @@ TYPE_TANKS = [ Armor.MT_Pz_Kpfw_V_Panther_Ausf_G, Armor.MT_Pz_Kpfw_IV_Ausf_H, Armor.HT_Pz_Kpfw_VI_Tiger_I, - Armor.HT_Pz_Kpfw_VI_Ausf__B__Tiger_II, + Armor.HT_Pz_Kpfw_VI_Ausf__B_Tiger_II, Armor.MT_M4_Sherman, Armor.MT_M4A4_Sherman_Firefly, Armor.StuG_IV, - Armor.ST_Centaur_IV, + Armor.CT_Centaur_IV, Armor.CT_Cromwell_IV, Armor.HIT_Churchill_VII, @@ -73,13 +73,13 @@ TYPE_IFV = [ Armor.IFV_Marder, Armor.IFV_MCV_80, Armor.IFV_LAV_25, - Armor.IFV_Sd_Kfz_234_2_Puma, + Armor.AC_Sd_Kfz_234_2_Puma, Armor.IFV_M2A2_Bradley, Armor.IFV_BMD_1, Armor.ZBD_04A, # WW2 - Armor.IFV_Sd_Kfz_234_2_Puma, + Armor.AC_Sd_Kfz_234_2_Puma, Armor.LAC_M8_Greyhound, # Mods diff --git a/resources/factions/allies_1944.json b/resources/factions/allies_1944.json index cc93ec03..e845527a 100644 --- a/resources/factions/allies_1944.json +++ b/resources/factions/allies_1944.json @@ -17,7 +17,7 @@ "MT_M4_Sherman", "APC_M2A1", "CT_Cromwell_IV", - "ST_Centaur_IV", + "CT_Centaur_IV", "HIT_Churchill_VII", "M30_Cargo_Carrier", "LAC_M8_Greyhound", diff --git a/resources/factions/germany_1942.json b/resources/factions/germany_1942.json index 9a641bc2..e0d94e26 100644 --- a/resources/factions/germany_1942.json +++ b/resources/factions/germany_1942.json @@ -12,7 +12,7 @@ "frontline_units": [ "MT_Pz_Kpfw_IV_Ausf_H", "APC_Sd_Kfz_251", - "IFV_Sd_Kfz_234_2_Puma", + "AC_Sd_Kfz_234_2_Puma", "TD_Jagdpanzer_IV" ], "artillery_units": [ diff --git a/resources/factions/germany_1944.json b/resources/factions/germany_1944.json index 7ff13b99..3aea568b 100644 --- a/resources/factions/germany_1944.json +++ b/resources/factions/germany_1944.json @@ -13,9 +13,9 @@ "MT_Pz_Kpfw_V_Panther_Ausf_G", "MT_Pz_Kpfw_IV_Ausf_H", "HT_Pz_Kpfw_VI_Tiger_I", - "HT_Pz_Kpfw_VI_Ausf__B__Tiger_II", + "HT_Pz_Kpfw_VI_Ausf__B_Tiger_II", "APC_Sd_Kfz_251", - "IFV_Sd_Kfz_234_2_Puma", + "AC_Sd_Kfz_234_2_Puma", "Sd_Kfz_184_Elefant", "TD_Jagdpanther_G1", "TD_Jagdpanzer_IV" diff --git a/resources/factions/syria_1948.json b/resources/factions/syria_1948.json index d9693bf1..1cbe6fa1 100644 --- a/resources/factions/syria_1948.json +++ b/resources/factions/syria_1948.json @@ -8,7 +8,7 @@ "SpitfireLFMkIXCW" ], "frontline_units": [ - "IFV_Sd_Kfz_234_2_Puma", + "AC_Sd_Kfz_234_2_Puma", "APC_Sd_Kfz_251", "MT_Pz_Kpfw_IV_Ausf_H", "MT_M4_Sherman" diff --git a/resources/factions/uk_1944.json b/resources/factions/uk_1944.json index 92c32f8c..91183b5e 100644 --- a/resources/factions/uk_1944.json +++ b/resources/factions/uk_1944.json @@ -17,7 +17,7 @@ "MT_M4_Sherman", "APC_M2A1", "CT_Cromwell_IV", - "ST_Centaur_IV", + "CT_Centaur_IV", "HIT_Churchill_VII" ], "artillery_units": [