Merge branch 'release-candidate' into v2

scripts/batch/install.bat

@@ -34,6 +34,9 @@ if "%errorlevel%" == "9009" (
 	echo node.js is already installed, continuing installation!
 )
 
+echo Installing Visual Studio redistributables 
+"%CD%\dependencies\VC_redist.x64.exe" /install /passive /norestart
+
 echo Installing node modules for frontend application...
 cd .\frontend
 call npm install --omit=dev

scripts/python/.vscode/launch.json

@@ -6,7 +6,7 @@
     "configurations": [
         {
             "name": "Add missing units",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "addMissingUnits.py",
             "console": "integratedTerminal",
@@ -15,7 +15,7 @@
         },
         {
             "name": "Add liveries",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "addLiveries.py",
             "console": "integratedTerminal",
@@ -24,7 +24,7 @@
         },
         {
             "name": "Generate payload tables",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "generatePayloadTables.py",
             "console": "integratedTerminal",
@@ -33,7 +33,7 @@
         }, 
         {
             "name": "Add loadouts",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "addLoadouts.py",
             "console": "integratedTerminal",
@@ -42,7 +42,7 @@
         }, 
         {
             "name": "Add ranges",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "program": "addRanges.py",
             "console": "integratedTerminal",

scripts/python/addLiveries.py

@@ -78,11 +78,11 @@ if len(sys.argv) > 1:
                     "countries": [country for country in livery.countries] if livery.countries != None else "All"
                 }
         except Exception as e:
-            print(f"Could not find data for aircraft of type {unit_name}: {e}, skipping...")
+            print(f"Could not find data for unitof type {unit_name}: {e}, skipping...")
 
     # Dump everything in the database
-    with open(filename, "w") as f:
-        json.dump(database, f, indent=2)
+    with  open(filename, "w", encoding='utf8') as f:
+        json.dump(database, f, indent='\t', ensure_ascii=False)
 
     # Done!
     print("Done!")

scripts/python/addLoadouts.py

@@ -192,11 +192,11 @@ if len(sys.argv) > 1:
                 }
                 database[unit_name]["loadouts"].append(new_payload)
         except Exception as e:
-            print(f"Could not find data for aircraft of type {unit_name}: {e}, skipping...")
+            print(f"Could not find data for unitof type {unit_name}: {e}, skipping...")
 
     # Dump everything in the database
-    with open(filename, "w") as f:
-        json.dump(database, f, indent=2)
+    with  open(filename, "w", encoding='utf8') as f:
+        json.dump(database, f, indent='\t', ensure_ascii=False)
 
     # Done!
     print("Done!")

scripts/python/addMissingUnits.py

@@ -36,8 +36,8 @@ if len(sys.argv) > 1:
                 "name": unit.id,
                 "coalition": "",
                 "era": "",
-                "label": unit.livery_name,
-                "shortLabel": unit.livery_name,
+                "label": unit.livery_name if hasattr(unit, "livery_name") else unit.name,
+                "shortLabel": unit.livery_name if hasattr(unit, "livery_name") else unit.name,
                 "type": unit.__qualname__.split(".")[0],
                 "enabled": False,
                 "liveries": {}
@@ -69,7 +69,7 @@ if len(sys.argv) > 1:
         print("Changed case of unit " + id) 
 
     # Dump everything in the database
-    with open(filename, "w") as f:
-        json.dump(database, f, indent=2)
+    with open(filename, "w", encoding='utf-8') as f:
+        json.dump(database, f, indent='\t', ensure_ascii=False)
 
 print("Done!")

scripts/python/addRanges.py

@@ -51,11 +51,11 @@ if len(sys.argv) > 1:
             database[unit_name]["engagementRange"] = unitmap[found_name].threat_range
 
         except Exception as e:
-            print(f"Could not find data for aircraft of type {unit_name}: {e}, skipping...")
+            print(f"Could not find data for unitof type {unit_name}: {e}, skipping...")
 
     # Dump everything in the database
-    with open(filename, "w") as f:
-        json.dump(database, f, indent=2)
+    with  open(filename, "w", encoding='utf8') as f:
+        json.dump(database, f, indent='\t', ensure_ascii=False)
 
 # Done!
 print("Done!")