Merge branch 'master' into feature/api-setupRadios

.github/workflows/arma.yml

@@ -46,7 +46,7 @@ jobs:
     - name: Rename build folder
       run: mv .hemttout/build .hemttout/@acre2
     - name: Upload Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: acre2-${{ github.sha }}-nobin
         path: .hemttout/@*

.github/workflows/release-drafter.yml

@@ -11,6 +11,6 @@ jobs:
     if: github.repository == 'IDI-Systems/acre2'
     steps:
     - name: Release Drafter
-      uses: release-drafter/release-drafter@v5
+      uses: release-drafter/release-drafter@v6
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -53,7 +53,7 @@ jobs:
     - name: Rename build folder
       run: mv .hemttout/release .hemttout/@acre2
     - name: Upload Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: acre2
         path: .hemttout/@*
@@ -78,7 +78,7 @@ jobs:
         echo "Check DirectX SDK: $(Test-Path .\\ci\\directx-sdk\\Include,.\\ci\\directx-sdk\\Lib\\${{ matrix.arch }})"
         echo "DXSDK_DIR: ${{ env.DXSDK_DIR }}"
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v1.3
+      uses: microsoft/setup-msbuild@v2
     - name: Build Extensions (x86)
       if: matrix.arch == 'x86'
       run: |
@@ -95,7 +95,7 @@ jobs:
       run: |
         .\ci\battleye\signtool.exe sign /f .\ci\battleye\idi-systems.pfx /p ${{ secrets.BE_CRED_PASSWORD }} /t http://timestamp.digicert.com *.dll
     - name: Upload Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: acre2-extensions-${{ matrix.arch }}
         path: |
@@ -111,7 +111,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Download Artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
     - name: Prepare Archives
       run: |
         echo "Organize"
@@ -159,7 +159,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Download Artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
     - name: Prepare Archives
       run: |
         echo "Organize"
@@ -217,7 +217,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Download Artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
     - name: Prepare Archives
       run: |
         echo "Organize"

.hemtt/project.toml

@@ -19,17 +19,13 @@ include = [
 [version]
 git_hash = 0
 
+# Unused in HEMTT v1.11 or higher, kept for backwards compatibility
 [asc]
 enabled = true
 exclude = [
-    "/initsettings.sqf",
-    "/initkeybinds.sqf",
-    "/xeh_prep.sqf",
+    ".inc.sqf",
 ]
 
-[hemtt.config]
-preset = "Hemtt"
-
 [hemtt.release]
 folder = "acre2"
 

addons/ace_interact/stringtable.xml

@@ -117,9 +117,9 @@
             <English>Set as Active</English>
             <Spanish>Definir como activa</Spanish>
             <German>Als aktiv setzen</German>
-            <Japanese>この無線機を使う</Japanese>
+            <Japanese>この無線機をアクティブに</Japanese>
             <Czech>Nastavit jako aktivní</Czech>
-            <Italian>Imposta come Attivo</Italian>
+            <Italian>Imposta come Attiva</Italian>
             <French>Définir comme active</French>
             <Korean>주 무전기로 설정</Korean>
             <Polish>Ustaw jako aktywne</Polish>
@@ -133,7 +133,7 @@
             <English>Bind PTT</English>
             <Spanish>Definir como PTT</Spanish>
             <German>Sprechtasten festlegen</German>
-            <Japanese>プッシュ トークに割当</Japanese>
+            <Japanese>PTTに割当</Japanese>
             <Czech>Přiřadit klávesu pro PTT</Czech>
             <Italian>Imposta PTT</Italian>
             <French>Définir PTT</French>
@@ -149,7 +149,7 @@
             <English>PTT %1</English>
             <Spanish>PTT %1</Spanish>
             <German>Sprechtaste %1</German>
-            <Japanese>プッシュ トーク %1</Japanese>
+            <Japanese>PTT %1</Japanese>
             <Czech>PTT %1</Czech>
             <Italian>PTT %1</Italian>
             <French>PTT %1</French>
@@ -165,7 +165,7 @@
             <English>Set as PTT %1</English>
             <Spanish>Definir como PTT %1</Spanish>
             <German>Als Sprechtaste %1 festlegen</German>
-            <Japanese>%1をプッシュ トークに</Japanese>
+            <Japanese>%1をPTTに割当</Japanese>
             <Czech>Nastavit jako PTT</Czech>
             <Italian>Imposta PTT %1</Italian>
             <French>Définir comme PTT %1</French>
@@ -180,8 +180,8 @@
         <Key ID="STR_ACRE_ace_interact_straightenAntenna">
             <English>Straighten antenna</English>
             <German>Antenne gerade ausrichten</German>
-            <Japanese>アンテナを直立に伸ばす</Japanese>
-            <Italian>Raddrizzare l'antenna</Italian>
+            <Japanese>アンテナを真っすぐにする</Japanese>
+            <Italian>Raddrizza l'antenna</Italian>
             <Russian>Выпрямить антенну</Russian>
             <Chinese>把天線拉直</Chinese>
             <French>Redresser l'antenne</French>
@@ -193,8 +193,8 @@
         <Key ID="STR_ACRE_ace_interact_bendAntenna">
             <English>Bend antenna upwards</English>
             <German>Antenne hoch biegen</German>
-            <Japanese>折り曲げたアンテナを上向きに</Japanese>
-            <Italian>Piegare l'antenna verso l'alto</Italian>
+            <Japanese>アンテナを上向きに曲げる</Japanese>
+            <Italian>Piega l'antenna verso l'alto</Italian>
             <Russian>Согнуть антенну</Russian>
             <Chinese>把天線往上彎曲</Chinese>
             <French>Courber l'antenne vers le haut</French>
@@ -211,6 +211,7 @@
             <Spanish>Rango de frecuencias</Spanish>
             <Turkish>Frekans Aralığı</Turkish>
             <Portuguese>Alcance de Frequência</Portuguese>
+            <Japanese>周波数範囲</Japanese>
         </Key>
         <Key ID="STR_ACRE_ace_interact_arsenalStats_transmitPower">
             <English>Transmit Power</English>
@@ -220,6 +221,7 @@
             <Spanish>Potencia de transmisión</Spanish>
             <Turkish>İletim Gücü</Turkish>
             <Portuguese>Poder de Transmissão</Portuguese>
+            <Japanese>発信出力</Japanese>
         </Key>
         <Key ID="STR_ACRE_ace_interact_arsenalStats_effectiveRange">
             <English>Effective Range (Urban)</English>
@@ -229,6 +231,7 @@
             <Spanish>Rango efectivo (Urbano)</Spanish>
             <Turkish>Gerçek Güç (Şehir İçi)</Turkish>
             <Portuguese>Alcance Efetivo (Urbano)</Portuguese>
+            <Japanese>有効範囲距離 (市街地)</Japanese>
         </Key>
         <Key ID="STR_ACRE_ace_interact_arsenalStats_externalSpeaker">
             <English>External Speaker</English>
@@ -238,6 +241,7 @@
             <Spanish>Altavoz externo</Spanish>
             <Turkish>Dış Hoparlör</Turkish>
             <Portuguese>Alto-falante Externo</Portuguese>
+            <Japanese>外部スピーカー</Japanese>
         </Key>
     </Package>
 </Project>

addons/api/XEH_preInit.sqf

@@ -14,4 +14,10 @@ GVAR(selectableCurveScale) = 0.7;
 // Module loading variables
 GVAR(basicMissionSetup) = false;
 
+// Filter radio IDs when setting unit loadouts
+["CBA_preLoadoutSet", {
+    params ["", "_loadoutArray"];
+    [_loadoutArray] call FUNC(filterUnitLoadout);
+}] call CBA_fnc_addEventHandler;
+
 ADDON = true;

addons/api/fnc_addRackToVehicle.sqf

@@ -121,7 +121,7 @@ private _selectPlayer = {
         } forEach ([] call CBA_fnc_players);
 
         if (isNull _player) then {
-            WARNING_1("No unit found for condition %1, defaulting to first player",_condition);
+            WARNING_1("No unit found for condition %1 - defaulting to first player",_condition);
             _player = ([] call CBA_fnc_players) select 0;
         };
     };

addons/api/fnc_basicMissionSetup.sqf

@@ -26,7 +26,7 @@ params [
 // Run once
 if (!isNil QGVAR(basicMissionSetup) && {GVAR(basicMissionSetup)}) exitWith {};
 
-TRACE_1("enter", _this);
+TRACE_1("enter",_this);
 
 // Basic setup
 private _setupRadios = _logic getVariable ["RadioSetup", false];
@@ -102,7 +102,7 @@ private _addRadios = {
 
     };
 
-    TRACE_1("Adding Radios", _cleanRadioList);
+    TRACE_1("Adding Radios",_cleanRadioList);
 
     if ((backpack _player == "") && {(["ACRE_PRC77", "ACRE_PRC117F"] arrayIntersect _cleanRadioList) isNotEqualTo []}) then {
         _player addBackpack "B_AssaultPack_khk";

addons/api/fnc_getBaseRadio.sqf

@@ -19,7 +19,7 @@ params [
     ["_radioId", "", [""]]
 ];
 
-TRACE_1("", _radioId);
+TRACE_1("",_radioId);
 if ( ([_radioId] call FUNC(isBaseRadio)) ) exitWith {
     _radioId
 };

addons/api/fnc_getPresetChannelData.sqf

@@ -44,8 +44,8 @@ if (_channelReference isEqualType []) then {
 private _presetData = [_radioClass, _presetName] call EFUNC(sys_data,getPresetData);
 if (isNil "_presetData") exitWith { nil };
 
-private _channels = HASH_GET(_presetData, "channels");
-private _channel = HASHLIST_SELECT(_channels, _channelNumber);
+private _channels = HASH_GET(_presetData,"channels");
+private _channel = HASHLIST_SELECT(_channels,_channelNumber);
 
 if (isNil "_channel") exitWith { nil };
 _channel

addons/api/fnc_getPresetChannelField.sqf

@@ -48,13 +48,13 @@ _channelNumber = _channelNumber - 1;
 private _presetData = [_radioClass, _presetName] call EFUNC(sys_data,getPresetData);
 if (isNil "_presetData") exitWith { nil };
 
-private _channels = HASH_GET(_presetData, "channels");
-private _channel = HASHLIST_SELECT(_channels, _channelNumber);
+private _channels = HASH_GET(_presetData,"channels");
+private _channel = HASHLIST_SELECT(_channels,_channelNumber);
 
 private _fieldName = [_radioClass, _fieldName] call FUNC(mapChannelFieldName);
 
-if (!HASH_HASKEY(_channel, _fieldName)) exitWith { nil };
-private _value = HASH_GET(_channel, _fieldName);
+if (!HASH_HASKEY(_channel,_fieldName)) exitWith { nil };
+private _value = HASH_GET(_channel,_fieldName);
 
 if (isNil "_value") exitWith { nil };
 _value

addons/api/fnc_initVehicleRacks.sqf

@@ -49,7 +49,7 @@ if (_condition isEqualTo {} && {_vehiclePresetName isNotEqualTo ""}) then {
     private _index = _players findIf {[_x] call _condition};
 
     if (_index == -1) then {
-        WARNING_1("No unit found for condition %1, defaulting to first player",_condition);
+        WARNING_1("No unit found for condition %1 - defaulting to first player",_condition);
         _index = 0;
     };
     _player = _players select _index;

addons/api/fnc_isKindOf.sqf

@@ -29,11 +29,11 @@ if (_parent == "") then {
 
 private _isAcre = getNumber (configFile >> "CfgAcreComponents" >> _parent >> "isAcre");
 // diag_log text format["_radioId: %1 isAcre: %2", _parent, _isAcre];
-TRACE_2("", _parent, _isAcre);
+TRACE_2("",_parent,_isAcre);
 if (_isAcre == 0) exitWith {
     false
 };
-TRACE_2("", _parent, _radioType);
+TRACE_2("",_parent,_radioType);
 
 if (_parent == _radioType) exitWith {
     true
@@ -49,7 +49,7 @@ if (_parent == _radioType) exitWith {
 
 while { _parent != "" } do {
     if (_parent == _radioType) exitWith {
-        TRACE_2("", _parent, _radioType);
+        TRACE_2("",_parent,_radioType);
         true
     };
     _parent = configName (inheritsFrom ( configFile >> "CfgAcreComponents" >> _parent));

addons/api/fnc_mapChannelFieldName.sqf

@@ -21,9 +21,9 @@ params [
     ["_fieldName", "", [""]]
 ];
 
-TRACE_1("CALLING", "");
+TRACE_1("CALLING","");
 private _baseRadio = [_radioId] call FUNC(getBaseRadio);
-TRACE_1("", _baseRadio);
+TRACE_1("",_baseRadio);
 switch _baseRadio do {
     case "ACRE_PRC148": {
         if (_fieldName == "description" || _fieldName == "name") then {

addons/api/fnc_nameChannels.sqf

@@ -20,7 +20,7 @@
 FUNC(_channelNamesForPresets) = {
     params ["_channelNames", "_presetNames"];
 
-    TRACE_1("enter", _this);
+    TRACE_1("enter",_this);
     if (_presetNames isNotEqualTo []) then {
         {
             if (_x != "") then {
@@ -52,7 +52,7 @@ private _channelNamesNoSides = {
         _presetNames pushBack [_x, _presetName];
     } forEach ((call FUNC(getAllRadios)) select 0);
 
-    TRACE_1("Configuring radio for presets", _presetNames);
+    TRACE_1("Configuring radio for presets",_presetNames);
     [_this, _presetNames] call FUNC(_channelNamesForPresets);
 };
 
@@ -64,7 +64,7 @@ private _channelNamesForPresetGroup = {
         _presetNames pushBack [_x, _presetName];
     } forEach ((call FUNC(getAllRadios)) select 0);
 
-    TRACE_1("Configuring radio for presets", _presetNames);
+    TRACE_1("Configuring radio for presets",_presetNames);
     [_channelNames, _presetNames] call FUNC(_channelNamesForPresets);
 };
 
@@ -73,7 +73,7 @@ params ["_logic", "_units", "_activated"];
 
 if (!_activated) exitWith {};
 
-TRACE_1("enter", _this);
+TRACE_1("enter",_this);
 
 private _sideNumber = _logic getVariable ["SideSelect", false];
 private _channelNames = [
@@ -93,7 +93,7 @@ private _setupSides = false;
 {
     if (_x isKindOf QGVAR(basicMissionSetup)) exitWith {
         _setupSides = _x getVariable ["RadioSetup", false];
-        TRACE_1("Dedicated basic mission module, checking sides configuration", _setupSides);
+        TRACE_1("Dedicated basic mission module - checking sides configuration",_setupSides);
     };
 } forEach (allMissionObjects "logic");
 

addons/api/fnc_setPresetChannelField.sqf

@@ -54,7 +54,7 @@ TRACE_1("",_channelNumber);
 //_channelNumber = ["getCurrentChannel"] call GUI_DATA_EVENT;
 private _presetData = [_radioClass, _presetName] call EFUNC(sys_data,getPresetData);
 if (isNil "_presetData") exitWith {false};
-TRACE_1("", _presetData);
+TRACE_1("",_presetData);
 
 private _channels = HASH_GET(_presetData,"channels");
 TRACE_1("",_channels);

addons/api/fnc_tests.sqf

@@ -21,8 +21,8 @@ private ["_test"];
 #define ASSERT_BOOL(val1,val2) (val1 isEqualTo val2)
 #define ASSERT_STRING(val1,val2) (val1 == val2)
 #define ASSERT_TYPE(val1,val2) (val2 isEqualType val1)
-#define PASS(fncName) PUSH(GVAR(testResults), [ARR_2(QUOTE(fncName),true)])
-#define FAIL(fncName) PUSH(GVAR(testResults), [ARR_2(QUOTE(fncName),false)])
+#define PASS(fncName) PUSH(GVAR(testResults),[ARR_2(QUOTE(fncName),true)])
+#define FAIL(fncName) PUSH(GVAR(testResults),[ARR_2(QUOTE(fncName),false)])
 
 
 /*