Fixed weapons names in pdcs extensions, removed deprecated rafale mod, fixed many other compilation issues with pydcs 2.7+

2025-11-10 15:41:24 +00:00 · 2021-04-17 02:13:52 +02:00
parent 1e468cd3e0
commit 8091051bb4
77 changed files with 1017 additions and 3797 deletions
--- a/resources/factions/NATO_Desert_Storm.json
+++ b/resources/factions/NATO_Desert_Storm.json
@@ -80,10 +80,10 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "Oliver_Hazzard_Perry_class"
+    "FFG_Oliver_Hazzard_Perry"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {},
  "carrier_names": [
--- a/resources/factions/allies_1944.json
+++ b/resources/factions/allies_1944.json
@@ -32,7 +32,7 @@
    "SPG_M12_GMC_155mm"
  ],
  "logistics_units": [
-    "Bedford_MWD",
+    "Truck_Bedford",
    "CCKW_353"
  ],
  "infantry_units": [
--- a/resources/factions/allies_1944_free.json
+++ b/resources/factions/allies_1944_free.json
@@ -21,7 +21,7 @@
  "artillery_units": [
  ],
  "logistics_units": [
-    "Bedford_MWD"
+    "Truck_Bedford"
  ],
  "infantry_units": [
    "Paratrooper_AKS"
--- a/resources/factions/australia_2005.json
+++ b/resources/factions/australia_2005.json
@@ -46,7 +46,7 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "USS_Arleigh_Burke_IIa"
+    "DDG_Arleigh_Burke_IIa"
  ],
  "cruisers": [
  ],
--- a/resources/factions/bluefor_coldwar.json
+++ b/resources/factions/bluefor_coldwar.json
@@ -55,10 +55,10 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "USS_Arleigh_Burke_IIa"
+    "DDG_Arleigh_Burke_IIa"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {},
  "carrier_names": [
--- a/resources/factions/bluefor_coldwar_a4.json
+++ b/resources/factions/bluefor_coldwar_a4.json
@@ -56,10 +56,10 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "USS_Arleigh_Burke_IIa"
+    "DDG_Arleigh_Burke_IIa"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {
    "Community A-4E": "https://heclak.github.io/community-a4e-c/"
--- a/resources/factions/bluefor_coldwar_a4_mb339.json
+++ b/resources/factions/bluefor_coldwar_a4_mb339.json
@@ -57,10 +57,10 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "USS_Arleigh_Burke_IIa"
+    "DDG_Arleigh_Burke_IIa"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {
    "MB-339A/PAN by Frecce Tricolori Virtuali": "http://www.freccetricolorivirtuali.net/",
--- a/resources/factions/bluefor_modern.json
+++ b/resources/factions/bluefor_modern.json
@@ -75,10 +75,10 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "USS_Arleigh_Burke_IIa"
+    "DDG_Arleigh_Burke_IIa"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {},
  "carrier_names": [
--- a/resources/factions/canada_2005.json
+++ b/resources/factions/canada_2005.json
@@ -45,10 +45,10 @@
  "helicopter_carrier": [
  ],
  "destroyers": [
-    "USS_Arleigh_Burke_IIa"
+    "DDG_Arleigh_Burke_IIa"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {},
  "carrier_names": [
--- a/resources/factions/france_1985_frenchpack.json
+++ b/resources/factions/france_1985_frenchpack.json
@@ -54,10 +54,10 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "USS_Arleigh_Burke_IIa"
+    "DDG_Arleigh_Burke_IIa"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {
    "frenchpack V3.5": "https://forums.eagle.ru/showthread.php?t=279974"
--- a/resources/factions/france_1995.json
+++ b/resources/factions/france_1995.json
@@ -53,11 +53,11 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "USS_Arleigh_Burke_IIa",
-    "Oliver_Hazzard_Perry_class"
+    "DDG_Arleigh_Burke_IIa",
+    "FFG_Oliver_Hazzard_Perry"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {},
  "carrier_names": [
--- a/resources/factions/france_2005_frenchpack.json
+++ b/resources/factions/france_2005_frenchpack.json
@@ -58,10 +58,10 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "USS_Arleigh_Burke_IIa"
+    "DDG_Arleigh_Burke_IIa"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {
    "frenchpack V3.5": "https://forums.eagle.ru/showthread.php?t=279974"
--- a/resources/factions/france_2005_modded.json
+++ b/resources/factions/france_2005_modded.json
@@ -64,10 +64,10 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "USS_Arleigh_Burke_IIa"
+    "DDG_Arleigh_Burke_IIa"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {
    "frenchpack V3.5": "https://forums.eagle.ru/showthread.php?t=279974",
--- a/resources/factions/gdr_1985.json
+++ b/resources/factions/gdr_1985.json
@@ -54,7 +54,7 @@
  "helicopter_carrier": [],
  "destroyers": [],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {},
  "carrier_names": [],
--- a/resources/factions/germany_1942.json
+++ b/resources/factions/germany_1942.json
@@ -20,10 +20,10 @@
    "SPG_Sturmpanzer_IV_Brummbar"
  ],
  "logistics_units": [
-    "Blitz_3_6_6700A",
-    "Kübelwagen_82",
-    "Sd_Kfz_7",
-    "Sd_Kfz_2"
+    "Truck_Opel_Blitz",
+    "LUV_Kubelwagen_82",
+    "Carrier_Sd_Kfz_7_Tractor",
+    "LUV_Kettenrad"
  ],
  "infantry_units": [
    "Infantry_Mauser_98"
--- a/resources/factions/germany_1944.json
+++ b/resources/factions/germany_1944.json
@@ -28,10 +28,10 @@
    "SPG_Sturmpanzer_IV_Brummbar"
  ],
  "logistics_units": [
-    "Blitz_3_6_6700A",
-    "Kübelwagen_82",
-    "Sd_Kfz_7",
-    "Sd_Kfz_2"
+    "Truck_Opel_Blitz",
+    "LUV_Kubelwagen_82",
+    "Carrier_Sd_Kfz_7_Tractor",
+    "LUV_Kettenrad"
  ],
  "infantry_units": [
    "Infantry_Mauser_98"
--- a/resources/factions/germany_1944_free.json
+++ b/resources/factions/germany_1944_free.json
@@ -16,7 +16,7 @@
  "artillery_units": [
  ],
  "logistics_units": [
-    "Blitz_3_6_6700A"
+    "Truck_Opel_Blitz"
  ],
  "infantry_units": [
    "Infantry_AK_74_Rus"
--- a/resources/factions/germany_1990.json
+++ b/resources/factions/germany_1990.json
@@ -50,10 +50,10 @@
  "helicopter_carrier": [
  ],
  "destroyers": [
-    "Oliver_Hazzard_Perry_class"
+    "FFG_Oliver_Hazzard_Perry"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {},
  "carrier_names": [
--- a/resources/factions/india_2010.json
+++ b/resources/factions/india_2010.json
@@ -63,7 +63,7 @@
  "helicopter_carrier_names": [
  ],
  "destroyers": [
-    "FF_1135M_Rezky"
+    "Frigate_1135M_Rezky"
  ],
  "cruisers": [
  ],
--- a/resources/factions/iran_1988.json
+++ b/resources/factions/iran_1988.json
@@ -57,10 +57,10 @@
  "helicopter_carrier_names": [
  ],
  "destroyers": [
-    "FF_1135M_Rezky"
+    "Frigate_1135M_Rezky"
  ],
  "cruisers": [
-    "FSG_1241_1MP_Molniya"
+    "Corvette_1241_1_Molniya"
  ],
  "requirements": {},
  "carrier_names": [
--- a/resources/factions/iran_2015.json
+++ b/resources/factions/iran_2015.json
@@ -67,10 +67,10 @@
  "helicopter_carrier_names": [
  ],
  "destroyers": [
-    "FF_1135M_Rezky"
+    "Frigate_1135M_Rezky"
  ],
  "cruisers": [
-    "FSG_1241_1MP_Molniya"
+    "Corvette_1241_1_Molniya"
  ],
  "requirements": {},
  "carrier_names": [
--- a/resources/factions/italy_1990.json
+++ b/resources/factions/italy_1990.json
@@ -45,10 +45,10 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "Oliver_Hazzard_Perry_class"
+    "FFG_Oliver_Hazzard_Perry"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {
  },
--- a/resources/factions/italy_1990_mb339.json
+++ b/resources/factions/italy_1990_mb339.json
@@ -46,10 +46,10 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "Oliver_Hazzard_Perry_class"
+    "FFG_Oliver_Hazzard_Perry"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {
    "MB-339A/PAN by Frecce Tricolori Virtuali": "http://www.freccetricolorivirtuali.net/"
--- a/resources/factions/japan_2005.json
+++ b/resources/factions/japan_2005.json
@@ -52,10 +52,10 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "USS_Arleigh_Burke_IIa"
+    "DDG_Arleigh_Burke_IIa"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {
  },
--- a/resources/factions/libya_2011.json
+++ b/resources/factions/libya_2011.json
@@ -62,10 +62,10 @@
  ],
  "missiles_group_count": 1,
  "destroyers": [
-    "FF_1135M_Rezky"
+    "Frigate_1135M_Rezky"
  ],
  "cruisers": [
-    "FSG_1241_1MP_Molniya"
+    "Corvette_1241_1_Molniya"
  ],
  "requirements": {},
  "carrier_names": [
--- a/resources/factions/redfor_china_2010.json
+++ b/resources/factions/redfor_china_2010.json
@@ -103,12 +103,12 @@
    "Wudang Shan"
  ],
  "destroyers": [
-    "FF_1135M_Rezky",
+    "Frigate_1135M_Rezky",
    "Type_052B_Destroyer",
    "Type_052C_Destroyer"
  ],
  "cruiser": [
-    "FSG_1241_1MP_Molniya",
+    "Corvette_1241_1_Molniya",
    "Type_054A_Frigate"
  ],
  "requirements": {},
--- a/resources/factions/redfor_russia_2010.json
+++ b/resources/factions/redfor_russia_2010.json
@@ -94,12 +94,12 @@
    "Mitrofan Moskalenko"
  ],
  "destroyers": [
-    "FF_1135M_Rezky",
+    "Frigate_1135M_Rezky",
    "Type_052B_Destroyer",
    "Type_052C_Destroyer"
  ],
  "cruisers": [
-    "FSG_1241_1MP_Molniya",
+    "Corvette_1241_1_Molniya",
    "Type_054A_Frigate"
  ],
  "requirements": {},
--- a/resources/factions/russia_1990.json
+++ b/resources/factions/russia_1990.json
@@ -78,10 +78,10 @@
  "helicopter_carrier_names": [
  ],
  "destroyers": [
-    "FF_1135M_Rezky"
+    "Frigate_1135M_Rezky"
  ],
  "cruisers": [
-    "FSG_1241_1MP_Molniya"
+    "Corvette_1241_1_Molniya"
  ],
  "requirements": {},
  "carrier_names": [
--- a/resources/factions/russia_2010.json
+++ b/resources/factions/russia_2010.json
@@ -81,10 +81,10 @@
  "helicopter_carrier_names": [
  ],
  "destroyers": [
-    "FF_1135M_Rezky"
+    "Frigate_1135M_Rezky"
  ],
  "cruisers": [
-    "FSG_1241_1MP_Molniya"
+    "Corvette_1241_1_Molniya"
  ],
  "requirements": {},
  "carrier_names": [
--- a/resources/factions/russia_2010_hds.json
+++ b/resources/factions/russia_2010_hds.json
@@ -78,10 +78,10 @@
  "helicopter_carrier_names": [
  ],
  "destroyers": [
-    "FF_1135M_Rezky"
+    "Frigate_1135M_Rezky"
  ],
  "cruisers": [
-    "FSG_1241_1MP_Molniya"
+    "Corvette_1241_1_Molniya"
  ],
  "requirements": { "High Digit SAMs":  "https://github.com/Auranis/HighDigitSAMs/releases"},
  "carrier_names": [
--- a/resources/factions/russia_2020.json
+++ b/resources/factions/russia_2020.json
@@ -77,10 +77,10 @@
  "helicopter_carrier_names": [
  ],
  "destroyers": [
-    "FF_1135M_Rezky"
+    "Frigate_1135M_Rezky"
  ],
  "cruisers": [
-    "FSG_1241_1MP_Molniya"
+    "Corvette_1241_1_Molniya"
  ],
  "requirements": {
    "SU-57 Felon By CubanAce Simulations": "https://www.digitalcombatsimulator.com/fr/files/2539621/"
--- a/resources/factions/soviet_union_1943.json
+++ b/resources/factions/soviet_union_1943.json
@@ -18,7 +18,7 @@
    "MLRS_BM_21_Grad_122mm"
  ],
  "logistics_units": [
-    "Bedford_MWD",
+    "Truck_Bedford",
    "CCKW_353"
  ],
  "infantry_units": [
--- a/resources/factions/spain_1990.json
+++ b/resources/factions/spain_1990.json
@@ -48,10 +48,10 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "Oliver_Hazzard_Perry_class"
+    "FFG_Oliver_Hazzard_Perry"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {},
  "carrier_names": [
--- a/resources/factions/uk_1944.json
+++ b/resources/factions/uk_1944.json
@@ -28,7 +28,7 @@
  "artillery_units": [
  ],
  "logistics_units": [
-    "Bedford_MWD",
+    "Truck_Bedford",
    "CCKW_353"
  ],
  "infantry_units": [
--- a/resources/factions/uk_1990.json
+++ b/resources/factions/uk_1990.json
@@ -52,10 +52,10 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "Oliver_Hazzard_Perry_class"
+    "FFG_Oliver_Hazzard_Perry"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {},
  "carrier_names": [
--- a/resources/factions/usa_1990.json
+++ b/resources/factions/usa_1990.json
@@ -67,11 +67,11 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "Oliver_Hazzard_Perry_class",
-    "USS_Arleigh_Burke_IIa"
+    "FFG_Oliver_Hazzard_Perry",
+    "DDG_Arleigh_Burke_IIa"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {},
  "carrier_names": [
--- a/resources/factions/usa_2005.json
+++ b/resources/factions/usa_2005.json
@@ -68,10 +68,10 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "USS_Arleigh_Burke_IIa"
+    "DDG_Arleigh_Burke_IIa"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {},
  "carrier_names": [
--- a/resources/factions/usa_2005_c130.json
+++ b/resources/factions/usa_2005_c130.json
@@ -68,10 +68,10 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "USS_Arleigh_Burke_IIa"
+    "DDG_Arleigh_Burke_IIa"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "requirements": {
    "C-130J-30 Super Hercules Mod by Anubis": "https://forums.eagle.ru/topic/252075-dcs-super-hercules-mod-by-anubis/"
--- a/resources/factions/usa_2005_modded.json
+++ b/resources/factions/usa_2005_modded.json
@@ -69,10 +69,10 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "USS_Arleigh_Burke_IIa"
+    "DDG_Arleigh_Burke_IIa"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "carrier_names": [
    "CVN-71 Theodore Roosevelt",
--- a/resources/factions/usn_1985.json
+++ b/resources/factions/usn_1985.json
@@ -49,10 +49,10 @@
    "LHA_1_Tarawa"
  ],
  "destroyers": [
-    "Oliver_Hazzard_Perry_class"
+    "FFG_Oliver_Hazzard_Perry"
  ],
  "cruisers": [
-    "Ticonderoga_class"
+    "CG_Ticonderoga"
  ],
  "carrier_names": [
    "CVN-71 Theodore Roosevelt",