Fortify - Categories (#9167)

* Fortify - Categories * Update fnc_registerObjects.sqf * Apply suggestions from code review Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> * Apply suggestions from code review * Update docs/wiki/framework/fortify-framework.md Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> * Update addons/fortify/ACEX_Fortify_Presets.hpp Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com> * just use flat objects array * Update fnc_getPlaceableSet.sqf --------- Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com> Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
acemod · Mar 19, 2023 · bcbd762 · bcbd762
1 parent 50100b8
commit bcbd762
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 6 deletions.
diff --git a/addons/fortify/ACEX_Fortify_Presets.hpp b/addons/fortify/ACEX_Fortify_Presets.hpp
@@ -64,4 +64,26 @@ class ACEX_Fortify_Presets {
             {"Land_BagFence_01_long_green_F", 10}
         };
     };
+    class bigCombo {
+        displayName = CSTRING(bigCombo);
+        objects[] = {
+            {"Land_BagBunker_Tower_F", 50, "big"},
+            {"Land_BagBunker_Large_F", 100, "big"},
+            {"Land_BagBunker_Small_F", 25, "big"},
+            {"Land_Cargo_Patrol_V1_F", 100, "big"},
+            {"Land_BagFence_Round_F", 5, "big"},
+            {"Land_BagFence_Short_F", 5, "big"},
+            {"Land_BagFence_Long_F", 10, "big"},
+            {"Land_PillboxBunker_01_big_F", 100, "bigGreen"},
+            {"Land_PillboxWall_01_3m_F", 10, "bigGreen"},
+            {"Land_PillboxWall_01_6m_F", 15, "bigGreen"},
+            {"Land_PillboxBunker_01_hex_F", 50, "bigGreen"},
+            {"Land_PillboxBunker_01_rectangle_F", 50, "bigGreen"},
+            {"Land_Plank_01_8m_F", 10, "bigGreen"},
+            {"Land_Plank_01_4m_F", 5, "bigGreen"},
+            {"Land_BagFence_01_round_green_F", 5, "bigGreen"},
+            {"Land_BagFence_01_short_green_F", 5, "bigGreen"},
+            {"Land_BagFence_01_long_green_F", 10, "bigGreen"}
+        };
+    };
 };
diff --git a/addons/fortify/functions/fnc_addActions.sqf b/addons/fortify/functions/fnc_addActions.sqf
@@ -21,9 +21,10 @@ private _side = side group _player;
 private _objects = missionNamespace getVariable [format [QGVAR(Objects_%1), _side], []];
 private _actions = [];
 private _infiniteBudget = ([side group _player] call FUNC(getBudget)) == -1;
+private _subActions = createHashmap;
 
 {
-    _x params ["_classname", "_cost"];
+    _x params ["_classname", "_cost", ["_category", ""]];
 
     private _displayName = getText (configFile >> "CfgVehicles" >> _classname >> "displayName");
 
@@ -43,7 +44,24 @@ private _infiniteBudget = ([side group _player] call FUNC(getBudget)) == -1;
         [_side, _classname]
     ] call EFUNC(interact_menu,createAction);
 
-    _actions pushBack [_action, [], _player];
+    if (_category == "") then {
+        _actions pushBack [_action, [], _player];
+    } else {
+        private _categoryActions = _subActions getOrDefault [_category, [], true];
+        _categoryActions pushBack [_action, [], _player];
+    };
 } forEach _objects;
 
+{
+    private _displayName = if (isLocalized _x) then { 
+        localize _x
+    } else { 
+        if (isText (configFile >> "ACEX_Fortify_Presets" >> _x >> "displayName")) exitWith { getText (configFile >> "ACEX_Fortify_Presets" >> _x >> "displayName") };
+        if (isText (missionConfigFile >> "ACEX_Fortify_Presets" >> _x >> "displayName")) exitWith { getText (missionConfigFile >> "ACEX_Fortify_Presets" >> _x >> "displayName") };
+        _x
+     };
+    private _action = [_x, _displayName, "", {}, {true}] call EFUNC(interact_menu,createAction);
+    _actions pushBack [_action, _y, _player];
+} forEach _subActions;
+
 _actions
diff --git a/addons/fortify/functions/fnc_getPlaceableSet.sqf b/addons/fortify/functions/fnc_getPlaceableSet.sqf
@@ -30,14 +30,15 @@ if (!isClass _config) exitWith {
 
 private _objects = getArray (_config >> "objects");
 
-// Attemp to filter bad input
+// Attempt to filter bad input
 _objects = _objects select {
-    if ((_x  isEqualTypeParams ["", 0])) then {
+    if ((_x isEqualTypeParams ["", 0]) || {_x isEqualTypeParams ["", 0, ""]}) then {
         _x params [["_classname", "#", [""]], ["_cost", -1, [0]]];
         if (isClass (configFile >> "CfgVehicles" >> _classname)) then {
             true
         } else {
             ERROR_2("Preset [%1] - Classname does not exist",_preset,_classname);
+            false
         };
     } else {
         ERROR_2("Preset [%1] - Bad data in objects array %2",_preset,_x);

diff --git a/addons/fortify/functions/fnc_registerObjects.sqf b/addons/fortify/functions/fnc_registerObjects.sqf
@@ -3,7 +3,7 @@
  * Author: Kingsley
  * Registers the given objects in the given side's player interaction menu.
  * Players on that side must have the pickaxe item in their inventory to access the menu.
- * Classnames must be in the format [<classname>, <cost>]
+ * Classnames must be in the format [<classname>, <cost>, <category(optional)>]
  * MUST BE CALLED ON SERVER!
  *
  * Arguments:
@@ -16,6 +16,7 @@
  *
  * Example:
  * [west, 5000, [["Land_BagFence_Long_F", 5], ["Land_BagBunker_Small_F", 50]]] call ace_fortify_fnc_registerObjects
+ * [west, 5000, [["Land_BagFence_Long_F", 5, "tan"], ["Land_BagFence_01_long_green_F", 5, "green"]]] call ace_fortify_fnc_registerObjects
  *
  * Public: Yes
  */
@@ -29,6 +30,9 @@ if (_side isEqualTo sideUnknown) exitWith {ERROR_1("Bad Side %1",_this);};
 
 _objects select {
     private _isValid = _x params [["_xClassname", "", [""]], ["_xCost", 0, [0]]];
+    private _category = toLower (_x param [2, "", [""]]);
+    if (_category != "") then { _x set [2, _category]; };
+
     if (_isValid) then {
         _isValid = isClass (configFile >> "CfgVehicles" >> _xClassname);
         if (!_isValid) then {WARNING_1("Classname does not exist in CfgVehicles %1",_x);};

diff --git a/addons/fortify/stringtable.xml b/addons/fortify/stringtable.xml
@@ -330,5 +330,15 @@
             <Chinesesimp>大型（绿色）</Chinesesimp>
             <Korean>대형 (초목)</Korean>
         </Key>
+        <Key ID="STR_ACE_Fortify_bigCombo">
+            <English>Big (Both)</English>
+            <Polish>Duże (Oba)</Polish>
+            <Russian>Большой (Оба)</Russian>
+            <Turkish>Büyük (İkisi de)</Turkish>
+            <Japanese>大型 (両方)</Japanese>
+            <German>Groß (Beide)</German>
+            <Chinesesimp>大型（两方）</Chinesesimp>
+            <Korean>대형 (둘 다)</Korean>
+        </Key>
     </Package>
 </Project>
diff --git a/docs/wiki/framework/fortify-framework.md b/docs/wiki/framework/fortify-framework.md
@@ -37,7 +37,7 @@ To add a preset via code you use the function `call ace_fortify_fnc_registerObje
 ```sqf
 * Registers the given objects in the given side's player interaction menu.
 * Players on that side must have the `Fortify Tool` item in their inventory to access the menu.
-* Classnames must be in the format [<classname>, <cost>]
+* Classnames must be in the format [<classname>, <cost>, <category(optional)>]
 * MUST BE CALLED ON SERVER!
 *
 * Arguments:
@@ -50,6 +50,7 @@ To add a preset via code you use the function `call ace_fortify_fnc_registerObje
 *
 * Example:
 * [west, 5000, [["Land_BagFence_Long_F", 5], ["Land_BagBunker_Small_F", 50]]] call ace_fortify_fnc_registerObjects
+* [west, 5000, [["Land_BagFence_Long_F", 5, "tan"], ["Land_BagFence_01_long_green_F", 5, "green"]]] call ace_fortify_fnc_registerObjects
 ```
 
 Adding it through `description.ext` or config you use:
@@ -63,6 +64,13 @@ class ACEX_Fortify_Presets {
             {"Bunker", 50}
         };
     };
+    class TAG_categories {
+        displayName = "My Categories";
+        objects[] = {
+            {"Sandbag", 5, "A Category"},
+            {"Bunker", 50, "TAG_MyPreset"} // will use the localized displayName of that preset ("My Preset")
+        };
+    };
 };
  ```