Merge branch 'master' into release

.github/workflows/arma.yml

@@ -25,6 +25,6 @@ jobs:
     - name: Checkout the source code
       uses: actions/checkout@v4
     - name: Setup HEMTT
-      uses: arma-actions/hemtt@v1
+      uses: arma-actions/hemtt@main
     - name: Run HEMTT build
-      run: hemtt build
+      run: hemtt build --no-bin

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Setup HEMTT
-      uses: arma-actions/hemtt@v1
+      uses: arma-actions/hemtt@main
 
     - name: Setup Tools
       run: |
@@ -60,19 +60,21 @@ jobs:
       run: mv .hemttout/release .hemttout/@${{ env.MOD_NAME }}
 
     - name: Upload Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ env.MOD_NAME }}
         path: .hemttout/@*
         retention-days: 1
+        include-hidden-files: true # Because .hemttout is a hidden directory
+        if-no-files-found: error
 
   publish-release:
     needs: build
     if: github.ref == 'refs/heads/release'
     runs-on: ubuntu-latest
     steps:
     - name: Download Artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
 
     - name: Prepare Archives
       run: |
@@ -83,7 +85,7 @@ jobs:
 
     - name: Prepare GitHub Release
       id: release_drafter
-      uses: release-drafter/release-drafter@v5
+      uses: release-drafter/release-drafter@v6
       with:
         name: Version ${{ needs.build.outputs.VERSION_SHORT }}
         tag: v${{ needs.build.outputs.VERSION }}
@@ -92,7 +94,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Upload mod archive to GitHub Release
-      uses: shogo82148/[email protected].2
+      uses: shogo82148/[email protected].7
       with:
         upload_url: ${{ steps.release_drafter.outputs.upload_url }}
         asset_path: ./${{ needs.build.outputs.MOD_NAME }}_${{ needs.build.outputs.VERSION_SHORT }}.zip

.hemtt/project.toml

@@ -20,14 +20,6 @@ authority = "mts_enhanced"
 [version]
 git_hash = 0
 
-[asc]
-enabled = true
-exclude = [
-    "/initsettings.sqf",
-    "/initkeybinds.sqf",
-    "/xeh_prep.sqf",
-]
-
 [hemtt.config]
 preset = "Hemtt"
 

README.md

@@ -4,7 +4,7 @@
 
 <p align="center">
     <a href="https://github.com/Metis-Team/mts_enhanced/releases/latest">
-        <img src="https://img.shields.io/badge/Version-1.6.3-blue.svg?style=flat-square" alt="Metis Enhanced Version">
+        <img src="https://img.shields.io/badge/Version-1.6.4-blue.svg?style=flat-square" alt="Metis Enhanced Version">
     </a>
     <a href="https://github.com/Metis-Team/mts_enhanced/releases/latest">
         <img src="https://img.shields.io/github/downloads/Metis-Team/mts_enhanced/total.svg?style=flat-square&label=Downloads" alt="Metis Enhanced Downloads">

addons/armory/XEH_postInit.sqf

@@ -2,7 +2,7 @@
 
 [QGVAR(updateArsenal), FUNC(updateArsenal)] call CBA_fnc_addEventHandler;
 
-TRACE_2("", isDedicated, GVAR(allowPlayerDBConnection));
+TRACE_2("",isDedicated,GVAR(allowPlayerDBConnection));
 
 if (isDedicated || (isServer && GVAR(allowPlayerDBConnection))) then {
 
@@ -38,15 +38,15 @@ if (isDedicated || (isServer && GVAR(allowPlayerDBConnection))) then {
     publicVariable QGVAR(initialized);
 };
 
-if (hasinterface) then {
+if (hasInterface) then {
     [QGVAR(openArmory), FUNC(openArmory)] call CBA_fnc_addEventhandler;
     [QGVAR(equipBackpack), FUNC(equipBackpack)] call CBA_fnc_addEventhandler;
     [QGVAR(equipLoadout), FUNC(equipLoadout)] call CBA_fnc_addEventhandler;
 
     [QGVAR(error), {
         params ["_unit", "_callBackEvent", "_args"];
-        ERROR(format [ARR_4("Something went wrong: Unit: %1 | CallBackEvent: %2 | Args: %3", _unit, _callBackEvent, _args)]);
-        if (hasinterface) then {
+        ERROR_3("Something went wrong: Unit: %1 | CallBackEvent: %2 | Args: %3",_unit,_callBackEvent,_args);
+        if (hasInterface) then {
             hint "MTS Armory:\nSomething went wrong, please take a look into your logfiles.";
         };
     }] call CBA_fnc_addEventhandler;

addons/armory/defines.hpp

@@ -27,10 +27,10 @@
 #define IDC_EDITBOX_EDITORS 27
 #define IDC_BUTTON_SAVE_EDITORS 28
 
-#define BACKGROUND_1_DEFAULT_HEIGHT ((670 / 1080) * SafeZoneH)
-#define BACKGROUND_1_EXTENDED_HEIGHT ((865 / 1080) * SafeZoneH)
-#define BACKGROUND_2_DEFAULT_HEIGHT ((650 / 1080) * SafeZoneH)
-#define BACKGROUND_2_EXTENDED_HEIGHT ((845 / 1080) * SafeZoneH)
+#define BACKGROUND_1_DEFAULT_HEIGHT ((670 / 1080) * safeZoneH)
+#define BACKGROUND_1_EXTENDED_HEIGHT ((865 / 1080) * safeZoneH)
+#define BACKGROUND_2_DEFAULT_HEIGHT ((650 / 1080) * safeZoneH)
+#define BACKGROUND_2_EXTENDED_HEIGHT ((845 / 1080) * safeZoneH)
 
 #define IDC_LOADOUT_1 101
 #define IDC_LOADOUT_2 102

addons/armory/functions/fnc_createEquipment.sqf

@@ -19,7 +19,7 @@
  */
 
 private _argsSuccessfullyParsed = params [["_equipmentName", "", [""]], ["_editors", [], [[],""]], ["_object", objNull, [objNull]]];
-TRACE_4("",_equipmentName,_editors,_object, _argsSuccessfullyParsed);
+TRACE_4("",_equipmentName,_editors,_object,_argsSuccessfullyParsed);
 
 if (_editors isEqualType "") then {
     _editors = parseSimpleArray _editors;

addons/armory/functions/fnc_equipBackpack.sqf

@@ -32,7 +32,7 @@ if (_equipmentNamespaces isEqualTo []) exitWith {
 _equipmentNamespaces params ["", "_backpackNamespace"];
 
 private _backpack = _backpackNamespace getVariable [_backpackName, []];
-CHECKRET(_backpack isEqualTo [], WARNING_1("Backpack '%1' not available!", _backpackName));
+CHECKRET(_backpack isEqualTo [],WARNING_1("Backpack '%1' not available!",_backpackName));
 
 _backpack params ["", "", "_class", "_items"];
 

addons/armory/functions/fnc_equipLoadout.sqf

@@ -32,7 +32,7 @@ if (_equipmentNamespaces isEqualTo []) exitWith {
 _equipmentNamespaces params ["_loadoutNamespace"];
 
 private _loadout = _loadoutNamespace getVariable [_loadoutName, []];
-CHECKRET(_loadout isEqualTo [], WARNING_1("Loadout '%1' not available!", _loadoutName));
+CHECKRET(_loadout isEqualTo [],WARNING_1("Loadout '%1' not available!",_loadoutName));
 
 _loadout params ["", "", "_loadout", "_ace_medic", "_ace_engineer"];
 

addons/armory/functions/fnc_initEquipment.sqf

@@ -17,7 +17,7 @@
  */
 
 params [["_equipmentName", "", [""]]];
-TRACE_1("", _equipmentName);
+TRACE_1("",_equipmentName);
 
 CHECKRET(!GVAR(initialized) || _equipmentName isEqualTo "",false);
 CHECKRET(!isDedicated && !(isServer && GVAR(allowPlayerDBConnection)),false);
@@ -31,7 +31,7 @@ if (_equipmentInfo isEqualTo []) exitWith {
 };
 
 (_equipmentInfo select 0) params ["_equipmentID", "_editors", "_arsenal"];
-TRACE_3("EquipmentInfo", _equipmentID, _editors, _arsenal);
+TRACE_3("EquipmentInfo",_equipmentID,_editors,_arsenal);
 
 private _loadoutNamespace = [true] call CBA_fnc_createNamespace;
 private _backpackNamespace = [true] call CBA_fnc_createNamespace;

addons/armory/functions/fnc_openArmory.sqf

@@ -24,7 +24,7 @@ if (canSuspend) exitWith {
 };
 
 params [["_equipmentName", "", [""]], ["_object", objNull, [objNull]], ["_idc", -1, [0]], ["_category", -1, [0]]];
-TRACE_4("",_equipmentName, _object, _idc, _category);
+TRACE_4("",_equipmentName,_object,_idc,_category);
 
 CHECK(!GVAR(initialized) || _equipmentName isEqualTo "");
 

addons/armory/functions/fnc_openArsenal.sqf

@@ -30,11 +30,11 @@ if (ctrlVisible IDC_BUTTON_SAVE_EQUIPMENT) then {
 
     private _display = ctrlParent _ctrlArsenal;
 
-    private _object = (_display displayCtrl IDC_BUTTON_NEW_EQUIPMENT) getVariable [ARR_2(QGVAR(attachedObject), objNull)];
+    private _object = (_display displayCtrl IDC_BUTTON_NEW_EQUIPMENT) getVariable [QGVAR(attachedObject), objNull];
 
     private _ctrlSave = (_display displayCtrl IDC_BUTTON_SAVE_EQUIPMENT);
-    private _idc = _ctrlSave getVariable [ARR_2(QGVAR(idc), -1)];
-    private _category =  _ctrlSave getVariable [ARR_2(QGVAR(category), -1)];
+    private _idc = _ctrlSave getVariable [QGVAR(idc), -1];
+    private _category =  _ctrlSave getVariable [QGVAR(category), -1];
 
     GVAR(arsenalEditorReopeningVars) = [ctrlText IDC_TEXT_TITLE, _object, _idc, _category, _eventID];
     TRACE_1("",GVAR(arsenalEditorReopeningVars));

addons/armory/functions/fnc_setEditArea.sqf

@@ -36,11 +36,11 @@ if (_category isEqualTo LOADOUT) then {
         (GVAR(equipment) getVariable [ctrlText IDC_TEXT_TITLE, []]) params ["_loadoutNamespace"];
 
         (_loadoutNamespace getVariable [_name, []]) params ["", "", "", "_ace_medic", "_ace_engineer"];
-        lbsetCurSel [IDC_LISTBOX_MEDIC, _ace_medic];
-        lbsetCurSel [IDC_LISTBOX_ENGINEER, _ace_engineer];
+        lbSetCurSel [IDC_LISTBOX_MEDIC, _ace_medic];
+        lbSetCurSel [IDC_LISTBOX_ENGINEER, _ace_engineer];
     } else {
-        lbsetCurSel [IDC_LISTBOX_MEDIC, 0];
-        lbsetCurSel [IDC_LISTBOX_ENGINEER, 0];
+        lbSetCurSel [IDC_LISTBOX_MEDIC, 0];
+        lbSetCurSel [IDC_LISTBOX_ENGINEER, 0];
     };
     ctrlShow [IDC_LISTBOX_MEDIC, true];
     ctrlShow [IDC_LISTBOX_ENGINEER, true];

addons/armory/functions/fnc_updateArsenal.sqf

@@ -18,7 +18,7 @@
  */
 
 private _argsSuccessfullyParsed = params [["_equipmentName", "", [""]], ["_status", false, [false]]];
-TRACE_3("", _equipmentName, _status, _argsSuccessfullyParsed);
+TRACE_3("",_equipmentName,_status,_argsSuccessfullyParsed);
 
 CHECK(!GVAR(initialized) || !_params);
 
@@ -33,7 +33,7 @@ if (isDedicated || (isServer && GVAR(allowPlayerDBConnection))) then {
 } else {
     private _armoryDisplay = findDisplay IDD_EQUIPMENT;
     private _arsenalDisplay = findDisplay IDD_ACE_ARSENAL;
-    TRACE_2("", _armoryDisplay, _arsenalDisplay);
+    TRACE_2("",_armoryDisplay,_arsenalDisplay);
 
     if !(isNull _armoryDisplay) exitWith {
         private _title = ctrlText IDC_TEXT_TITLE;

addons/armory/functions/fnc_updateBackpack.sqf

@@ -34,7 +34,7 @@ CHECK(!isDedicated && !(isServer && GVAR(allowPlayerDBConnection)));
 
 (GVAR(equipment) getVariable [_equipmentName, []]) params ["", "_backpackNamespace", "", "_equipmentID"];
 _backpackNamespace getVariable [_name, []] params ["", "_idc", "_class", "_items"];
-TRACE_7("updateBackpack",_equipmentName, _equipmentID,_name,_oldName,_idc,_class,_items);
+TRACE_7("updateBackpack",_equipmentName,_equipmentID,_name,_oldName,_idc,_class,_items);
 
 
 if (_oldName isEqualTo "") exitWith {

addons/armory/functions/fnc_updateLoadout.sqf

@@ -34,7 +34,7 @@ CHECK(!isDedicated && !(isServer && GVAR(allowPlayerDBConnection)));
 
 (GVAR(equipment) getVariable [_equipmentName, []]) params ["_loadoutNamespace", "", "", "_equipmentID"];
 _loadoutNamespace getVariable [_name, []] params ["", "_idc", "_loadout", "_ace_medic", "_ace_engineer"];
-TRACE_8("updateLoadout",_equipmentName, _equipmentID,_name,_oldName,_idc,_ace_medic,_ace_engineer,_loadout);
+TRACE_8("updateLoadout",_equipmentName,_equipmentID,_name,_oldName,_idc,_ace_medic,_ace_engineer,_loadout);
 
 if (_oldName isEqualTo "") exitWith {
     [GVAR(sessionID), "insertLoadout", _name, _idc, _loadout, _ace_medic, _ace_engineer, _equipmentID] call DB_SET;