Faction rework, working :)

resources/factions/china_2010.json

@@ -35,11 +35,11 @@
     "Infantry_Soldier_Rus",
     "Paratrooper_RPG_16"
   ],
-  "shorad_units": [
-    "SAM_SA_9_Strela_1_9P31",
-    "SAM_SA_13_Strela_10M3_9A35M3",
-    "SPAAA_ZSU_23_4_Shilka",
-    "AAA_ZU_23_Closed"
+  "shorads": [
+    "SA9Generator",
+    "SA13Generator",
+    "ZSU23Generator",
+    "ZU23Generator"
   ],
   "sams": [
     "HQ7Generator",
@@ -65,7 +65,7 @@
     "Wuzhi Shan",
     "Wudang Shan"
   ],
-  "destroyer": [
+  "destroyers": [
     "Type_052B_Destroyer",
     "Type_052C_Destroyer"
   ],

resources/factions/russia_1990.json

@@ -38,11 +38,11 @@
     "Infantry_Soldier_Rus",
     "Paratrooper_RPG_16"
   ],
-  "shorad_units": [
-    "SAM_SA_9_Strela_1_9P31",
-    "SAM_SA_13_Strela_10M3_9A35M3",
-    "SPAAA_ZSU_23_4_Shilka",
-    "AAA_ZU_23_Closed"
+  "shorads": [
+    "SA9Generator",
+    "SA13Generator",
+    "ZSU23Generator",
+    "ZU23Generator"
   ],
   "sams": [
     "SA6Generator",
@@ -55,10 +55,10 @@
   ],
   "lhanames": [
   ],
-  "destroyer": [
+  "destroyers": [
     "FF_1135M_Rezky"
   ],
-  "cruiser": [
+  "cruisers": [
     "FSG_1241_1MP_Molniya"
   ],
   "requirements": {},

resources/factions/russia_2010.json

@@ -45,9 +45,9 @@
     "Infantry_Soldier_Rus",
     "Paratrooper_RPG_16"
   ],
-  "shorad_units": [
-    "SAM_SA_19_Tunguska_2S6",
-    "SAM_SA_13_Strela_10M3_9A35M3"
+  "shorads": [
+    "SA19Generator",
+    "SA13Generator"
   ],
   "sams": [
     "SA11Generator",
@@ -62,10 +62,10 @@
   ],
   "lhanames": [
   ],
-  "destroyer": [
+  "destroyers": [
     "FF_1135M_Rezky"
   ],
-  "cruiser": [
+  "cruisers": [
     "FSG_1241_1MP_Molniya"
   ],
   "requirements": {},

resources/factions/usa_2005.json

@@ -40,8 +40,8 @@
     "Infantry_M4",
     "Soldier_M249"
   ],
-  "shorad_units": [
-    "SAM_Avenger_M1097"
+  "shorads": [
+    "AvengerGenerator"
   ],
   "sams": [
     "HawkGenerator",
@@ -53,10 +53,10 @@
   "helicopter_carrier": [
     "LHA_1_Tarawa"
   ],
-  "destroyer": [
+  "destroyers": [
     "USS_Arleigh_Burke_IIa"
   ],
-  "cruiser": [
+  "cruisers": [
     "Ticonderoga_class"
   ],
   "requirements": {},

resources/tools/generate_loadout_check.py

@@ -20,7 +20,7 @@ for t, uts in db.UNIT_BY_TASK.items():
         pos.x += 10000
         for ut in uts:
             pos.y += 5000
-            ctr = mis.country([v["country"] for k, v in db.FACTIONS.items() if ut in v["units"]][0])
+            ctr = mis.country([v["country"] for k, v in db.FACTIONS.items() if ut in v.units][0])
 
             g = mis.flight_group_inflight(
                 country=ctr,