Multiple - Fix Fortify Categories Update - Update to HEMTT V1 (#43)

* clean for hemtt

* Fix Fortify With ACE update

* Remove P-Drive

* push

.gitignore

@@ -3,7 +3,9 @@ releases/*
 keys/*
 z/*
 a3/*
-.hemtt/local
+a3
+.hemtt/loal
+.hemttout
 *.cache
 *.pbo
 texHeaders.bin

hemtt.toml → .hemtt/project.toml

@@ -1,10 +1,13 @@
 name = "WFAR"
+mainprefix = "z"
 prefix = "wfar"
 author = "Walthzer/Shark"
 check = [
     "!binarizer_link"
 ]
-files = [
+
+[files]
+include = [
     "*.dll",
     "*.so",
     "mod.cpp",
@@ -43,4 +46,18 @@ steps_windows = [
     "if not exist z\\wfar mkdir z\\wfar",
     "if not exist z\\wfar\\addons mklink /j z\\wfar\\addons addons",
     "if not exist a3 mklink /j a3 N:\\Arma3Pdrive\\a3"
+]
+
+# Launched with `hemtt launch ace
+[hemtt.launch.wfar_slim]
+workshop = [
+    "463939057", # ACE3's Workshop ID
+    "1779063631", # ZEN's ID
+    "450814997", # CBA's ID
+]
+
+# Launched with `hemtt launch ace
+[hemtt.launch.wfar]
+presets = [
+    "WFAR9", # .html presets from .hemtt/presets/
 ]

addons/continuity/functions/fnc_handleContinuityButton.sqf

@@ -16,7 +16,7 @@
  */
 disableSerialization;
 params ["_control"];
-TRACE_0("handleContinuityButton",_control);
+TRACE_1("handleContinuityButton",_control);
 
 if (call BIS_fnc_admin > 0) exitWith {};
 if ((toLower (vehicleVarName player)) in ["overseer", "zeus"]) exitWith {};

addons/continuity/functions/fnc_openLoadMenu.sqf

@@ -16,6 +16,6 @@
  */
 disableSerialization;
 params ["_parentDisplay"];
-TRACE_0("openLoadMenu",_parentDisplay);
+TRACE_1("openLoadMenu",_parentDisplay);
 
 _display = _parentDisplay createDisplay "wfar_DisplayContinuityLoad";

addons/continuity/functions/fnc_openSaveMenu.sqf

@@ -16,6 +16,6 @@
  */
 disableSerialization;
 params ["_parentDisplay"];
-TRACE_0("openSaveMenu",_parentDisplay);
+TRACE_1("openSaveMenu",_parentDisplay);
 
 _display = _parentDisplay createDisplay "wfar_DisplayContinuitySave";

addons/continuity/script_component.hpp

@@ -23,12 +23,12 @@
 #define DUMMY_POSITION [-1000, -1000, 0]
 #define IDC_BTN_CONFIGURE 25030
 
-#define POS_X(N) ((N) * GUI_GRID_W + GUI_GRID_CENTER_X)
-#define POS_Y(N) ((N) * GUI_GRID_H + GUI_GRID_CENTER_Y)
-#define POS_W(N) ((N) * GUI_GRID_W)
-#define POS_H(N) ((N) * GUI_GRID_H)
+#define POS_X(N) QUOTE(((N) * GUI_GRID_W + GUI_GRID_CENTER_X))
+#define POS_Y(N) QUOTE(((N) * GUI_GRID_H + GUI_GRID_CENTER_Y))
+#define POS_W(N) QUOTE(((N) * GUI_GRID_W))
+#define POS_H(N) QUOTE(((N) * GUI_GRID_H))
 
-#define POS_X_LOW(N) ((N) * GUI_GRID_W + GUI_GRID_X)
-#define POS_Y_LOW(N) ((N) * GUI_GRID_H + GUI_GRID_Y)
+#define POS_X_LOW(N) QUOTE(((N) * GUI_GRID_W + GUI_GRID_X))
+#define POS_Y_LOW(N) QUOTE(((N) * GUI_GRID_H + GUI_GRID_Y))
 
 #define REGEX_STRING "{[^}]*}"

addons/extension/functions/fnc_getReportablePlayerState.sqf

@@ -15,7 +15,7 @@
  * Public: [No]
  */
 params ["_unit"];
-TRACE_1("reportableState"._unit);
+TRACE_1("reportableState",_unit);
 private _vehicleName = "";
 
 /*--Roles--

addons/extension/functions/fnc_markPlayerDeath.sqf

@@ -16,7 +16,7 @@
  * Public: [No]
  */
 params ["_unit", "_corpse"];
-TRACE_2("markDeath"._unit,_corpse);
+TRACE_2("markDeath",_unit,_corpse);
 
 if !(_unit == player) exitWith {};
 

addons/fortify/ACEX_Fortify_Presets.hpp

@@ -4,11 +4,11 @@
 #define QMPRESET(year, version) QPRESET(MAIN,year,version)
 
 #define ADDClASS(classname, buildTime) {classname, buildTime}
-#define MADDCLASS(classname, buildTime, people) {classname, 10, buildTime, people}
+#define MADDCLASS(classname, buildTime, people) {classname, 10, "Multi", buildTime, people}
 
 class ACEX_Fortify_Presets {
-    class MPRESET(2021,A) {
-        displayName = QMPRESET(2021,A);
+    class MPRESET(2024,A) {
+        displayName = QMPRESET(2024,A);
         objects[] = {
             //Normal Fortify behaviour
             ADDClASS("Land_BagFence_Short_F",5),

addons/fortify/CfgWFARContinuity.hpp

@@ -5,5 +5,5 @@ class CfgWFARContinuity {
             load=QUOTE(FUNC(loadFortify));
             save=QUOTE(FUNC(saveFortify));
         };
-    }
+    };
 };

addons/fortify/Dialogs.hpp

@@ -25,8 +25,8 @@ class RscDisplayAttributes {
 
 class GVAR(RscToggleSupplies): RscDisplayAttributes {
 
-    onLoad = QUOTE([ARR_3('onLoad', _this, QQGVAR(RscToggleSupplies))] call ace_zeus_fnc_zeusAttributes);
-    onUnload = QUOTE([ARR_3('onUnload', _this, QQGVAR(RscToggleSupplies))] call ace_zeus_fnc_zeusAttributes);
+    onLoad = QUOTE([ARR_3('onLoad',_this,QQGVAR(RscToggleSupplies))] call ace_zeus_fnc_zeusAttributes);
+    onUnload = QUOTE([ARR_3('onUnload',_this,QQGVAR(RscToggleSupplies))] call ace_zeus_fnc_zeusAttributes);
 
     class Controls: Controls {
         class Background: Background {};
@@ -88,8 +88,8 @@ class GVAR(RscToggleSupplies): RscDisplayAttributes {
 
 class GVAR(RscGlobalSupplyRange): RscDisplayAttributes {
 
-    onLoad = QUOTE([ARR_3('onLoad', _this, QQGVAR(RscGlobalSupplyRange))] call ace_zeus_fnc_zeusAttributes);
-    onUnload = QUOTE([ARR_3('onUnload', _this, QQGVAR(RscGlobalSupplyRange))] call ace_zeus_fnc_zeusAttributes);
+    onLoad = QUOTE([ARR_3('onLoad',_this,QQGVAR(RscGlobalSupplyRange))] call ace_zeus_fnc_zeusAttributes);
+    onUnload = QUOTE([ARR_3('onUnload',_this,QQGVAR(RscGlobalSupplyRange))] call ace_zeus_fnc_zeusAttributes);
 
     class Controls: Controls {
         class Background: Background {};
@@ -134,21 +134,21 @@ class GVAR(RscGlobalSupplyRange): RscDisplayAttributes {
     };
 };
 class GVAR(buildersWaiting_dialog) {
-    idd = WAITING_DIALOG_IDD;
+    idd = QUOTE(WAITING_DIALOG_IDD);
     access = 0;
     movingEnable = 0;
     onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(waitDialogOpen)),true)]; uiNamespace setVariable [ARR_2(QUOTE(QGVAR(ctrWaitToolBox)),(_this select 0) displayCtrl 1)]; uiNamespace setVariable [ARR_2(QUOTE(QGVAR(ctrlWaitPicture)),(_this select 0) displayCtrl 2)];);
     onUnload = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(waitDialogOpen)),false)]);
-    enableSimulation = true;
+    enableSimulation = 1;
     class ControlsBackground
     {
         class Background: RscText
         {
             colorBackground[] = {0, 0, 0, 0.9};
-            x = GUI_GRID_CENTER_X + 9 * GUI_GRID_CENTER_W;
-            y = GUI_GRID_CENTER_Y + 7.1 * GUI_GRID_CENTER_H;
-            w = 19.9 * GUI_GRID_CENTER_W;
-            h = 10 * GUI_GRID_CENTER_H;
+            x = QUOTE(GUI_GRID_CENTER_X + 9 * GUI_GRID_CENTER_W);
+            y = QUOTE(GUI_GRID_CENTER_Y + 7.1 * GUI_GRID_CENTER_H);
+            w = QUOTE(GUI_GRID_CENTER_W * 19.9);
+            h = QUOTE(GUI_GRID_CENTER_H * 10);
         };
         class top_strip: RscText
         {
@@ -157,10 +157,10 @@ class GVAR(buildersWaiting_dialog) {
             text = "Building Statistics";
             colorText[] = {IGUI_TEXT_RGB, 0.8};
             colorBackground[] = {GUI_BCG_DARK_RGB, 0.8};
-            x = GUI_GRID_CENTER_X + 9 * GUI_GRID_CENTER_W;
-            y = GUI_GRID_CENTER_Y + 6 * GUI_GRID_CENTER_H;
-            w = 20 * GUI_GRID_CENTER_W;
-            h = 1 * GUI_GRID_CENTER_H;
+            x = QUOTE(GUI_GRID_CENTER_X + 9 * GUI_GRID_CENTER_W);
+            y = QUOTE(GUI_GRID_CENTER_Y + 6 * GUI_GRID_CENTER_H);
+            w = QUOTE(GUI_GRID_CENTER_W * 20);
+            h = QUOTE(GUI_GRID_CENTER_H);
         };
         class buildingStats: RscToolbox
         {
@@ -175,21 +175,21 @@ class GVAR(buildersWaiting_dialog) {
             colorDisable[] = {0,0,0,0};
             colorSelectedBg[] = {0,0,0,0};
             strings[] = {"", "", ""};
-            x = GUI_GRID_CENTER_X + 9 * GUI_GRID_CENTER_W;
-            y = GUI_GRID_CENTER_Y + 7.2 * GUI_GRID_CENTER_H;
-            w = 20 * GUI_GRID_CENTER_W;
-            h = 1 * GUI_GRID_CENTER_H;
+            x = QUOTE(GUI_GRID_CENTER_X + 9 * GUI_GRID_CENTER_W);
+            y = QUOTE(GUI_GRID_CENTER_Y + 7.2 * GUI_GRID_CENTER_H);
+            w = QUOTE(GUI_GRID_CENTER_W * 20);
+            h = QUOTE(GUI_GRID_CENTER_H);
         };
         class buildingImage: RscPicture
         {
             idc = 2;
             shadow = 0;
             style = 48;
             text = "";
-            x = GUI_GRID_CENTER_X + 9 * GUI_GRID_CENTER_W;
-            y = GUI_GRID_CENTER_Y + 8.3 * GUI_GRID_CENTER_H;
-            w = 19.9 * GUI_GRID_CENTER_W;
-            h = 9 * GUI_GRID_CENTER_H;
+            x = QUOTE(GUI_GRID_CENTER_X + 9 * GUI_GRID_CENTER_W);
+            y = QUOTE(GUI_GRID_CENTER_Y + 8.3 * GUI_GRID_CENTER_H);
+            w = QUOTE(GUI_GRID_CENTER_W * 19.9);
+            h = QUOTE(GUI_GRID_CENTER_H * 9);
         };
     };
 /*     class objects

addons/fortify/XEH_postInit.sqf

@@ -110,11 +110,11 @@ if (!hasInterface) exitWith {};
         if (_supplierIndex > -1) then {
             true
         } else {
-            WFAR_NOTIFY_1(WFAR_WARNING, "Too Far From Supplies!");
+            WFAR_NOTIFY_1(WFAR_WARNING,"Too Far From Supplies!");
             false
         };
     } else {
-        WFAR_NOTIFY_2(WFAR_ERROR, "You are not worthy", "to wield the power of Thor!");
+        WFAR_NOTIFY_2(WFAR_ERROR,"You are not worthy","to wield the power of Thor!");
         false
     }
 }] call ACE_fortify_fnc_addDeployHandler;

addons/fortify/functions/fnc_doBuildSiteCheck.sqf

@@ -24,7 +24,7 @@ private _preset = missionNamespace getVariable [format["ace_fortify_objects_%1",
 private _index = _preset findIf {(_x select 0) isEqualTo (typeOf _object)};
 private _presetKey = format["ace_fortify_objects_%1", _side];
 if (_index > -1) then {
-    (_preset select _index) params ["_class", "_fortifyBuildTime", ["_buildTime", 0], ["_requiredBuilders", 0]];
+    (_preset select _index) params ["_class", "_fortifyBuildTime", ["_category", ""], ["_buildTime", 0], ["_requiredBuilders", 0]];
 
     TRACE_2("retrieved from preset",_buildTime,_requiredBuilders);
 

addons/fortify/functions/fnc_getObjectBounding2D.sqf

@@ -15,7 +15,7 @@
  * Public: No
  */
 params ["_object"];
-TRACE_1("getObjectBoundingRectangle", _object);
+TRACE_1("getObjectBoundingRectangle",_object);
 
 (3 boundingBoxReal _object) params ["_pBottom", "_pTop"];
 

addons/fortify/functions/fnc_ui_globalSupplyRange.sqf

@@ -22,7 +22,7 @@ private _ctrlButtonOK = _display displayCtrl 1; //IDC_OK
 private _module = missionNamespace getVariable [QUOTE(BIS_fnc_initCuratorAttributes_target), objNull];
 TRACE_1("Module",_module);
 
-_controlGroup ctrlRemoveAllEventHandlers "setFocus";
+_controlGroup ctrlRemoveAllEventHandlers "SetFocus";
 
 (_display displayCtrl 300002) ctrlSetText (str GVAR(globalSupplyRange));
 

addons/fortify/functions/fnc_ui_toggleSupplies.sqf

@@ -22,7 +22,7 @@ private _ctrlButtonOK = _display displayCtrl 1; //IDC_OK
 private _module = missionNamespace getVariable [QUOTE(BIS_fnc_initCuratorAttributes_target), objNull];
 TRACE_1("Module",_module);
 
-_controlGroup ctrlRemoveAllEventHandlers "setFocus";
+_controlGroup ctrlRemoveAllEventHandlers "SetFocus";
 
 // Validate module target
 private _object = attachedTo _module;

addons/fortify/script_component.hpp

@@ -30,7 +30,7 @@
 // UI grid -> From ACE Zeus 
 #define SIZEX ((safeZoneW / safeZoneH) min 1.2)
 #define SIZEY (SIZEX / 1.2)
-#define W_PART(num) (num * (SIZEX / 40))
-#define H_PART(num) (num * (SIZEY / 25))
-#define X_PART(num) (W_PART(num) + (safeZoneX + (safeZoneW - SIZEX) / 2))
-#define Y_PART(num) (H_PART(num) + (safeZoneY + (safeZoneH - SIZEY) / 2))
+#define W_PART(num) QUOTE((num * (SIZEX / 40)))
+#define H_PART(num) QUOTE((num * (SIZEY / 25)))
+#define X_PART(num) QUOTE((W_PART(num) + (safeZoneX + (safeZoneW - SIZEX) / 2)))
+#define Y_PART(num) QUOTE((H_PART(num) + (safeZoneY + (safeZoneH - SIZEY) / 2)))

addons/insignia/config.cpp

@@ -18,4 +18,3 @@ class CfgPatches
 #include "CfgUnitInsignia.hpp"
 #include "CfgCommands.hpp"
 #include "scripted\restrictedInsignia.hpp"
-#include "Dialogs.hpp"

addons/main/script_macros.hpp

@@ -5,11 +5,11 @@
 #define WFAR_WARNING ([1, 1, 0, 1])
 #define WFAR_ERROR ([1, 0, 0, 1])
 
-#define WFAR_MACRO_NOTIFY(arg) [arg, true] call CBA_fnc_notify
-#define WFAR_CSNOTIFY_1(colour, size, one) WFAR_MACRO_NOTIFY([ARR_3(one, size, colour)])
-#define WFAR_CSNOTIFY_2(colour, size, one, two) WFAR_MACRO_NOTIFY(ARR_2([ARR_3(one, size, colour)], [ARR_3(two, size, colour)]))
-#define WFAR_CSNOTIFY_3(colour, size, one, three) WFAR_MACRO_NOTIFY(ARR_3([ARR_3(one, size, colour)], [ARR_3(two, size, colour)], [ARR_3(three, size, colour)]))
-
-#define WFAR_NOTIFY_1(colour, one) WFAR_CSNOTIFY_1(colour, 1, one)
-#define WFAR_NOTIFY_2(colour, one, two) WFAR_CSNOTIFY_2(colour, 1, one, two)
-#define WFAR_NOTIFY_3(colour, one, two, three) WFAR_CSNOTIFY_3(colour, 1, one, two, three)
+#define WFAR_MACRO_NOTIFY(arg) [arg,true] call CBA_fnc_notify
+#define WFAR_CSNOTIFY_1(colour, size, one) WFAR_MACRO_NOTIFY([ARR_3(one,size,colour)])
+#define WFAR_CSNOTIFY_2(colour, size, one, two) WFAR_MACRO_NOTIFY(ARR_2([ARR_3(one,size,colour)],[ARR_3(two,size,colour)]))
+#define WFAR_CSNOTIFY_3(colour, size, one, three) WFAR_MACRO_NOTIFY(ARR_3([ARR_3(one,size,colour)], [ARR_3(two,size,colour)], [ARR_3(three,size,colour)]))
+
+#define WFAR_NOTIFY_1(colour, one) WFAR_CSNOTIFY_1(colour,1,one)
+#define WFAR_NOTIFY_2(colour, one, two) WFAR_CSNOTIFY_2(colour,1,one,two)
+#define WFAR_NOTIFY_3(colour, one, two, three) WFAR_CSNOTIFY_3(colour,1,one,two,three)

addons/main/script_mod.hpp

@@ -11,7 +11,7 @@
 #define WFAR_TAG WFAR
 
 // MINIMAL required version for the Mod. Components can specify others..
-#define REQUIRED_VERSION 1.56
+#define REQUIRED_VERSION 2.14
 
 #ifdef COMPONENT_BEAUTIFIED
     #define COMPONENT_NAME QUOTE(wfar - COMPONENT_BEAUTIFIED)

addons/misc_config/$PBOPREFIX$

@@ -0,0 +1 @@
+z\wfar\addons\misc_config

addons/groundTypeConfigFixes/config.cpp → addons/misc_config/config.cpp

@@ -2,13 +2,13 @@
 
 class CfgPatches
 {
-    class WASHM_wfar_groundTypeConfigFixes
+    class wfar_misc_config
     {
         name="WHITE FOX ASSAULT REGIMENT data";
         author="Walthzer/Shark";
         url="https://whitefoxassaultreg.wixsite.com/wfar";
         requiredVersion=1.0;
-        requiredaddons[]={"A3_Data_F", "ace_csw"};
+        requiredaddons[]={"A3_Data_F"};
         units[]={};
         weapons[]={};
     };

addons/groundTypeConfigFixes/script_component.hpp → addons/misc_config/script_component.hpp

@@ -1,5 +1,5 @@
-#define COMPONENT fixes
-#define COMPONENT_BEAUTIFIED Ground_Type_Fixes
+#define COMPONENT misc_config
+#define COMPONENT_BEAUTIFIED Misc_Config
 #include "\z\wfar\addons\main\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL