Merge branch 'master' into rework-armor-penetration

Author: LinkIsGrim

.github/workflows/arma.yml

@@ -12,8 +12,6 @@ jobs:
     steps:
     - name: Checkout the source code
       uses: actions/checkout@v4
-    - name: Validate SQF
-      run: python3 tools/sqf_validator.py
     - name: Validate Config
       run: python3 tools/config_style_checker.py
     - name: Validate Stringtables

.github/workflows/pboproject.yml

@@ -41,3 +41,17 @@ workshop = [
     "843593391", # RHS GREF Workshop ID
     "843632231", # RHS SAF  Workshop ID
 ]
+
+[cup]
+extends = "default"
+workshop = [
+    "497660133", # CUP Weapons
+    "541888371", # CUP Vehicles
+    "497661914", # CUP Units
+]
+
+[cfp]
+extends = "cup"
+workshop = [
+    "1369691841", # Community Factions Project
+]

.hemtt/launch.toml

@@ -1,7 +1,8 @@
 {
-	"files.exclude": {
-		"**/.hemttout": true,
-		"**/include": true,
-		"**/extras": true
-	}
-}
+    "files.exclude": {
+        "**/.hemttout": true,
+        "**/include": true,
+        "**/extras": true
+    },
+    "files.insertFinalNewline": true
+}

.vscode/settings.json

@@ -1,16 +1,6 @@
 {
     "version": "2.0.0",
     "tasks": [
-        {
-            "label": "Validate SQF",
-            "command": "${config:python.pythonPath}",
-            "options": {
-                "cwd": "${workspaceFolder}/tools"
-            },
-            "args": [
-                "sqf_validator.py"
-            ]
-        },
         {
             "label": "Validate Config",
             "command": "${config:python.pythonPath}",
@@ -103,7 +93,7 @@
             }
         },
         {
-            "label": "Build: Hemtt",
+            "label": "Build: HEMTT",
             "command": "hemtt.exe",
             "options": {
                 "cwd": "${workspaceFolder}"
@@ -117,6 +107,20 @@
                 "isDefault": true
             }
         },
+        {
+            "label": "Build: HEMTT --just",
+            "command": "python",
+            "options": {
+                "cwd": "${workspaceFolder}"
+            },
+            "args": [
+                "tools/build_current_addon.py",
+                "${relativeFile}"
+            ],
+            "group": {
+                "kind": "build"
+            }
+        },
         {
             "label": "Extension: make move_x64_release",
             "command": "cargo",
@@ -145,5 +149,13 @@
                 "kind": "build"
             }
         }
+    ],
+    "inputs": [
+        {
+            "id": "addon",
+            "description": "Addon Name:",
+            "default": "common",
+            "type": "promptString"
+        }
     ]
 }

.vscode/tasks.json

@@ -51,10 +51,12 @@ Aggr094 <bastards4glory@gmail.com>
 alef <alefor@gmail.com>
 Aleksey EpMAK Yermakov <epmak777@gmail.com>
 AleM
+Alfred Neuman
 Alganthe <alganthe@live.fr>
 Andrea "AtixNeon" Verano <veranoandrea88@gmail.com>
 Anthariel <Contact@storm-simulation.com>
 Anton
+Apricot_ale
 Arcanum417 <lubos.len@gmail.com>
 Arkhir <wonsz666@gmail.com >
 ARV187 aka Spark23
@@ -78,6 +80,7 @@ Coren <coren4@gmail.com>
 Crusty
 Cyruz143
 dabako <dabako@dabakoworld.de>
+DartRuffian
 dgibso29 <gibson@earringpranks.com>
 Dharma Bellamkonda <dharma.bellamkonda@gmail.com>
 Dimaslg <dimaslg@telecable.es>
@@ -123,9 +126,11 @@ JasperRab <jasper@jasperrab.eu>
 JDT
 john681611 <john681611@hotmail.com>
 JoramD
+Joe DeShon <Refueling Sound - CreativeCommons Attributions 4.0>
 Karneck <dschultz26@hotmail.com>
 Kavinsky <nmunozfernandez@gmail.com>
 Keithen <Keithen.Neu@gmail.com>
+KJW
 Kllrt <kllrtik@gmail.com>
 KokaKolaA3
 Krzyciu
@@ -154,14 +159,17 @@ PaxJaromeMalues <seemax1991@gmail.com>
 Phyma <sethramstrom@gmail.com>
 PiZZADOX <509thParachuteInfantry@gmail.com>
 pokertour
+Prisoner
 Professor <lukas.trneny@wo.cz>
 Pterolatypus <pterolatypus@gmail.com>
+Puotek
 QuantX
 QuickDagger
 rakowozz
 ramius86 <pasini86@hotmail.com>
 Raspu86
 RcINS
+Redwan S. / Nomas <nomasx2000@gmail.com>
 Riccardo Petricca <petriccarcc@gmail.com>
 Robert Boklahánics <bokirobi@gmail.com>
 ruPaladin <happyworm24@rambler.ru>
@@ -172,6 +180,7 @@ Seb <sebsmith90@gmail.com>
 shukari
 simon84 <badguy360th@gmail.com>
 Skengman2
+Sky / Esmeray6
 Smith <smitt14ua@gmail.com>
 Sniperwolf572 <tenga6@gmail.com>
 System98
@@ -191,8 +200,10 @@ VyMajoris(W-Cephei)<vycanismajoriscsa@gmail.com>
 Walthzer <walthzer.69@gmail.com>
 Winter <simon@agius-muscat.net>
 wizpig64
+WryFighter <Refueling Sound - CreativeCommons Zero 1.0 Universal>
 YetheSamartaka
 xrufix
 Zakant <Zakant@gmx.de>
 zGuba
 Zman6258
+Zorn <lordzorn1337@gmail.com>