Merge branch 'master' into missile_guidance_hud

.github/workflows/pboproject.yml

@@ -1,85 +1,85 @@
-name: pboProject
+# name: pboProject
 
-on:
-  push:
-    branches:
-    - master
-  pull_request_target:
+# on:
+#   push:
+#     branches:
+#     - master
+#   pull_request_target:
 
-jobs:
-  pboproject:
-    runs-on: windows-2022
-    steps:
-    - name: Install Arma 3 Tools
-      uses: arma-actions/arma3-tools@master
-      with:
-        toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }}
-    - name: Install Mikero Tools
-      uses: arma-actions/mikero-tools@2023-01-04
-    - name: Download game data
-      run: |
-        Invoke-WebRequest "$env:ARMA3_DATA_URL" -OutFile arma3.zip
-        Invoke-WebRequest "$env:RHSAFRF_URL" -OutFile rhsafrf.zip
-        Invoke-WebRequest "$env:RHSGREF_URL" -OutFile rhsgref.zip
-        Invoke-WebRequest "$env:RHSSAF_URL" -OutFile rhssaf.zip
-        Invoke-WebRequest "$env:RHSUSF_URL" -OutFile rhsusf.zip
-        $files = @("arma3.zip", "rhsafrf.zip", "rhsgref.zip", "rhssaf.zip", "rhsusf.zip")
-        ForEach ($file in $files) {
-          Expand-7ZipArchive -Path $file -DestinationPath .
-          Remove-Item $file
-        }
-      env:
-        ARMA3_DATA_URL: ${{ secrets.ARMA3_DATA_URL }}
-        RHSAFRF_URL: ${{ secrets.RHSAFRF_URL }}
-        RHSGREF_URL: ${{ secrets.RHSGREF_URL }}
-        RHSSAF_URL: ${{ secrets.RHSSAF_URL }}
-        RHSUSF_URL: ${{ secrets.RHSUSF_URL }}
-    - name: Checkout CBA A3
-      uses: actions/checkout@v4
-      with:
-        path: x\cba
-        ref: master
-        repository: CBATeam/CBA_A3.git
-    - name: Checkout ACE3
-      uses: actions/checkout@v4
-      with:
-        path: z\ace
-        persist-credentials: false
-    - name: Checkout pull request
-      uses: actions/checkout@v4
-      if: ${{ github.event_name == 'pull_request_target' }}
-      with:
-        path: pullrequest
-        ref: 'refs/pull/${{ github.event.number }}/merge'
-    - name: Replace addons with pull request addons
-      if: ${{ github.event_name == 'pull_request_target' }}
-      run: |
-        rm -r z\ace\addons\
-        rm -r z\ace\optionals\
-        rm -r z\ace\tools\pDummies\
-        xcopy /e /h /q pullrequest\addons z\ace\addons\
-        xcopy /e /h /q pullrequest\optionals z\ace\optionals\
-        xcopy /e /h /q pullrequest\tools\pDummies z\ace\tools\pDummies\
-    - name: Setup build environment
-      run: |
-        subst P: .
-        pboproject -P
-        xcopy /e /h /q z\ace\tools\pDummies\gm gm\
-        xcopy /e /h /q z\ace\tools\pDummies\vn vn\
-        xcopy /e /h /q z\ace\tools\pDummies\WW2 WW2\
-        xcopy /e /h /q z\ace\tools\pDummies\CUP CUP\
-    - name: Build
-      run: py P:\z\ace\tools\make.py ci
-      env:
-        PYTHONUNBUFFERED: 1
-    - name: Archive logs
-      uses: actions/upload-artifact@v4
-      if: ${{ always() }}
-      with:
-        name: logs
-        path: temp/*.log
-    - name: Archive @ace
-      uses: actions/upload-artifact@v4
-      with:
-        name: '@ace3-${{ github.sha }}'
-        path: z\ace\release\@ace
+# jobs:
+  # pboproject:
+  #   runs-on: windows-2022
+  #   steps:
+  #   - name: Install Arma 3 Tools
+  #     uses: arma-actions/arma3-tools@master
+  #     with:
+  #       toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }}
+  #   - name: Install Mikero Tools
+  #     uses: arma-actions/mikero-tools@2024-10-08
+  #   - name: Download game data
+  #     run: |
+  #       Invoke-WebRequest "$env:ARMA3_DATA_URL" -OutFile arma3.zip
+  #       Invoke-WebRequest "$env:RHSAFRF_URL" -OutFile rhsafrf.zip
+  #       Invoke-WebRequest "$env:RHSGREF_URL" -OutFile rhsgref.zip
+  #       Invoke-WebRequest "$env:RHSSAF_URL" -OutFile rhssaf.zip
+  #       Invoke-WebRequest "$env:RHSUSF_URL" -OutFile rhsusf.zip
+  #       $files = @("arma3.zip", "rhsafrf.zip", "rhsgref.zip", "rhssaf.zip", "rhsusf.zip")
+  #       ForEach ($file in $files) {
+  #         Expand-7ZipArchive -Path $file -DestinationPath .
+  #         Remove-Item $file
+  #       }
+  #     env:
+  #       ARMA3_DATA_URL: ${{ secrets.ARMA3_DATA_URL }}
+  #       RHSAFRF_URL: ${{ secrets.RHSAFRF_URL }}
+  #       RHSGREF_URL: ${{ secrets.RHSGREF_URL }}
+  #       RHSSAF_URL: ${{ secrets.RHSSAF_URL }}
+  #       RHSUSF_URL: ${{ secrets.RHSUSF_URL }}
+  #   - name: Checkout CBA A3
+  #     uses: actions/checkout@v4
+  #     with:
+  #       path: x\cba
+  #       ref: master
+  #       repository: CBATeam/CBA_A3.git
+  #   - name: Checkout ACE3
+  #     uses: actions/checkout@v4
+  #     with:
+  #       path: z\ace
+  #       persist-credentials: false
+  #   - name: Checkout pull request
+  #     uses: actions/checkout@v4
+  #     if: ${{ github.event_name == 'pull_request_target' }}
+  #     with:
+  #       path: pullrequest
+  #       ref: 'refs/pull/${{ github.event.number }}/merge'
+  #   - name: Replace addons with pull request addons
+  #     if: ${{ github.event_name == 'pull_request_target' }}
+  #     run: |
+  #       rm -r z\ace\addons\
+  #       rm -r z\ace\optionals\
+  #       rm -r z\ace\tools\pDummies\
+  #       xcopy /e /h /q pullrequest\addons z\ace\addons\
+  #       xcopy /e /h /q pullrequest\optionals z\ace\optionals\
+  #       xcopy /e /h /q pullrequest\tools\pDummies z\ace\tools\pDummies\
+  #   - name: Setup build environment
+  #     run: |
+  #       subst P: .
+  #       pboproject -P
+  #       xcopy /e /h /q z\ace\tools\pDummies\gm gm\
+  #       xcopy /e /h /q z\ace\tools\pDummies\vn vn\
+  #       xcopy /e /h /q z\ace\tools\pDummies\WW2 WW2\
+  #       xcopy /e /h /q z\ace\tools\pDummies\CUP CUP\
+  #   - name: Build
+  #     run: py P:\z\ace\tools\make.py ci
+  #     env:
+  #       PYTHONUNBUFFERED: 1
+  #   - name: Archive logs
+  #     uses: actions/upload-artifact@v4
+  #     if: ${{ always() }}
+  #     with:
+  #       name: logs
+  #       path: temp/*.log
+  #   - name: Archive @ace
+  #     uses: actions/upload-artifact@v4
+  #     with:
+  #       name: '@ace3-${{ github.sha }}'
+  #       path: z\ace\release\@ace

.hemtt/launch.toml

@@ -21,6 +21,12 @@ dlc = [
     "Western Sahara",
 ]
 
+[rf]
+extends = "default"
+dlc = [
+    "Reaction Forces"
+]
+
 [rhs]
 extends = "default"
 workshop = [

.hemtt/lints.toml

@@ -3,3 +3,22 @@ options.ignore = [
     "addPublicVariableEventHandler", # Alt syntax is broken, we are using main syntax
     "createSoundSource", # Greatly attenuated when in first person and in a vehicle
 ]
+
+[sqf.var_all_caps]
+options.ignore = [
+    "SLX_*", "ACE_*"
+]
+
+[sqf.undefined]
+enabled = true
+options.check_orphan_code = true
+
+[sqf.unused]
+#enabled = true #many false positives without DEBUG_MODE_FULL
+options.check_params = false
+
+[sqf.shadowed]
+enabled = false
+
+[sqf.not_private]
+enabled = true

AUTHORS.txt

@@ -42,6 +42,7 @@ Walter Pearce <[email protected]>
 11RDP-LoupVert <[email protected]>
 654wak654 <[email protected]>
 [BIG]Bull
+Abogado "regiregi22"
 ACCtomeek
 adam3adam <[email protected]>
 Adanteh
@@ -63,6 +64,7 @@ Barman75
 Bla1337
 BlackPixxel <[email protected]>
 BlackQwar
+Bluefield <[email protected]>
 Brakoviejo
 Brisse <[email protected]>
 Brostrom.A | Evul <[email protected]>
@@ -177,6 +179,7 @@ SzwedzikPL <[email protected]>
 Tachi <[email protected]>
 tbeswick96
 Tessa Elieff <Fastroping Sound - CreativeCommons Attributions 3.0>
+ThomasAngel
 Timi007 <[email protected]>
 Toaster <[email protected]>
 Tonic

README.md

@@ -55,7 +55,7 @@ The mod is **built modularly**, so almost any included PBO can be easily removed
 - Carrying and dragging
 - Realistic names for vehicles and weapons
 - A fire control system (FCS) for armored vehicles and helicopters
-- Realistic ballistics/FCS calculated in C/C++ extensions
+- Realistic ballistics/FCS calculated in Rust extensions
 - Backblast area and overpressure simulation
 - Disposable launchers
 - Realistic G-forces

addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf

@@ -108,18 +108,11 @@ for "_i" from 0 to (count _cfgWeapons)-1 do {
         };
         if (_weapons find _weapon == -1) then {
             _weapons pushBack _weapon;
-            _magIndex = _magazines find _magazine;
-            _magSpeed = _magazineInitSpeeds select _magIndex;
+            private _magIndex = _magazines find _magazine;
+            private _magSpeed = _magazineInitSpeeds select _magIndex;
             _weaponInitSpeeds pushBack (_abInitialSpeed / _magSpeed);
         };
     } forEach _data;
-    {
-        _x params ["_magazineIndex", "_abInitialSpeed", "_magazine", "_weapon"];
-        _magIndex = _magazines find _magazine;
-        _magSpeed = _magazineInitSpeeds select _magIndex;
-        _wepIndex = _weapons find _weapon;
-        _wepSpeed = _weaponInitSpeeds select _wepIndex;
-    } forEach _data;
     {
         diag_log text format ["AB_WeaponInitSpeed,%1,%2", _x, _weaponInitSpeeds select _forEachIndex];
     } forEach _weapons;

addons/advanced_ballistics/functions/fnc_displayProtractor.sqf

@@ -26,7 +26,7 @@ if (GVAR(Protractor)) exitWith {
     true
 };
 if (weaponLowered ACE_player) exitWith { false };
-if (vehicle ACE_player != ACE_player) exitWith { false };
+if (!isNull objectParent ACE_player) exitWith { false };
 if (currentWeapon ACE_player != primaryWeapon ACE_player) exitWith { false };
 
 2 cutText ["", "PLAIN"];

addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf

@@ -15,7 +15,6 @@
  * Public: No
  */
 
-private _deleted = false;
 {
     _y params ["_bullet","_caliber","_bulletTraceVisible"];