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

tests/resources/invalid_faction_country.json

@@ -57,11 +57,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": {"mod": "Some mod is required"},
   "carrier_names": [

tests/resources/valid_faction.json

@@ -59,11 +59,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": {"mod": "Some mod is required"},
   "carrier_names": [

tests/test_factions.py

@@ -25,9 +25,9 @@ from dcs.planes import (
 from dcs.ships import (
     CVN_74_John_C__Stennis,
     LHA_1_Tarawa,
-    Oliver_Hazzard_Perry_class,
-    USS_Arleigh_Burke_IIa,
-    Ticonderoga_class,
+    FFG_Oliver_Hazzard_Perry,
+    DDG_Arleigh_Burke_IIa,
+    CG_Ticonderoga,
 )
 from dcs.vehicles import Armor, Unarmed, Infantry, Artillery
 
@@ -99,9 +99,9 @@ class TestFactionLoader(unittest.TestCase):
 
             self.assertIn(CVN_74_John_C__Stennis, faction.aircraft_carrier)
             self.assertIn(LHA_1_Tarawa, faction.helicopter_carrier)
-            self.assertIn(Oliver_Hazzard_Perry_class, faction.destroyers)
-            self.assertIn(USS_Arleigh_Burke_IIa, faction.destroyers)
-            self.assertIn(Ticonderoga_class, faction.cruisers)
+            self.assertIn(FFG_Oliver_Hazzard_Perry, faction.destroyers)
+            self.assertIn(DDG_Arleigh_Burke_IIa, faction.destroyers)
+            self.assertIn(CG_Ticonderoga, faction.cruisers)
 
             self.assertIn("mod", faction.requirements.keys())
             self.assertIn("Some mod is required", faction.requirements.values())