Fortify - Add item/weapon/backpack fortify tool property (#10290)

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
acemod · Sep 5, 2024 · 2f72c77 · 2f72c77
1 parent 00178ce
commit 2f72c77
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/addons/fortify/CfgWeapons.hpp b/addons/fortify/CfgWeapons.hpp
@@ -10,6 +10,7 @@ class CfgWeapons {
         picture = QPATHTOF(UI\hammer_ca.paa);
         scope = 2;
         ACE_isTool = 1;
+        GVAR(fortifyTool) = 1;
         class ItemInfo: CBA_MiscItem_ItemInfo {
             mass = 0;
         };

diff --git a/addons/fortify/XEH_preInit.sqf b/addons/fortify/XEH_preInit.sqf
@@ -13,6 +13,8 @@ GVAR(locations) = [];
 // Custom deploy handlers
 GVAR(deployHandlers) = [];
 
+GVAR(fortifyTools) = keys (uiNamespace getVariable QGVAR(fortifyTools));
+
 #include "initSettings.inc.sqf"
 
 ADDON = true;
diff --git a/addons/fortify/XEH_preStart.sqf b/addons/fortify/XEH_preStart.sqf
@@ -1,3 +1,9 @@
 #include "script_component.hpp"
 
 #include "XEH_PREP.hpp"
+
+private _fortifyTools = (QUOTE(getNumber (_x >> QQGVAR(fortifyTool)) > 0) configClasses (configFile >> "CfgWeapons") apply {configName _x});
+_fortifyTools append    (QUOTE(getNumber (_x >> QQGVAR(fortifyTool)) > 0) configClasses (configFile >> "CfgVehicles") apply {configName _x});
+TRACE_1("",_fortifyTools);
+
+uiNamespace setVariable [QGVAR(fortifyTools), compileFinal (_fortifyTools createHashMapFromArray [])];
diff --git a/addons/fortify/functions/fnc_canFortify.sqf b/addons/fortify/functions/fnc_canFortify.sqf
@@ -19,8 +19,12 @@
 params ["_player", ["_cost", 0]];
 
 (missionNamespace getVariable [QGVAR(fortifyAllowed), true]) &&
-{"ACE_Fortify" in (_player call EFUNC(common,uniqueItems))} &&
 {
+    private _items = _player call EFUNC(common,uniqueItems);
+    _items append weapons _player;
+    _items pushBack backpack _player;
+    GVAR(fortifyTools) findAny _items != -1
+} && {
     private _budget = [side group _player] call FUNC(getBudget);
     ((_budget == -1) || {_budget >= _cost})
 } && {

diff --git a/docs/wiki/framework/fortify-framework.md b/docs/wiki/framework/fortify-framework.md
@@ -109,10 +109,22 @@ The Fortify budget can be updated for any side using the function.
 * [west, -250, false] call ace_fortify_fnc_updateBudget
 ```
 
+## 2. Config Values
 
-## 2. Events
+### 2.1 Enabling fortify tools on an item or backpack
+```cpp
+class CfgWeapons { // same config also works on backpacks (CfgVehicles)
+    class yourBaseClass;
+    class yourFortifyToolClass: yourBaseClass {
+        ace_fortify_fortifyTool = 1;
+    };
+};
+```
+
+
+## 3. Events
 
-### 2.1 Listenable
+### 3.1 Listenable
 
 | Event Name | Passed Parameter(s) | Locality | Description |
 | ---------- | ----------- | ------------------- | -------- |