Generator - Optimize events & improve logic

.github/workflows/arma.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Setup HEMTT
       uses: arma-actions/hemtt@v1
     - name: Run HEMTT build
-      run: hemtt build
+      run: chmod +x hemtt/hemtt && hemtt/hemtt build
     - name: Rename build folder
       run: mv .hemttout/build .hemttout/@misery
     - name: Upload Artifact

README.md

@@ -13,7 +13,7 @@
 </p>
 
 <p align="center">
-    <sup><strong>Requires the latest versions of <a href="https://github.com/CBATeam/CBA_A3/releases">CBA A3</a> and <a href="https://github.com/acemod/ACE3/releases">ACE3</a>.<br/>
+    <sup><strong>Requires the latest versions of <a href="https://github.com/CBATeam/CBA_A3/releases">CBA A3</a>,<a href="https://github.com/acemod/ACE3/releases">ACE3</a> and <a href="https://github.com/y0014984/Advanced-Equipment/releases">AE3</a>.<br/>
     Visit us on <a href="https://discord.gg/5gD3DwZqkK">Discord</a></strong></sup>
 </p>
 
@@ -55,7 +55,7 @@ We trust that this mod will serve as a valuable tool in realizing your vision fo
 
 ## Getting started
 
-Misery requires Arma 3 and the latest version of <a href="https://github.com/CBATeam/CBA_A3/releases">CBA A3</a> and <a href="https://github.com/acemod/ACE3/releases">ACE3</a>.
+Misery requires Arma 3 and the latest version of <a href="https://github.com/CBATeam/CBA_A3/releases">CBA A3</a>,<a href="https://github.com/acemod/ACE3/releases">ACE3</a> and <a href="https://github.com/y0014984/Advanced-Equipment/releases">AE3</a>.
 
 ## Contributing to Misery
 

addons/audio/XEH_postInit.sqf

@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
 // CBA Events
-[QGVAR(say3D), {(_this select 0) say3D (_this select 1)}] call CBA_fnc_addEventHandler;
+[QGVAR(say3D), {(_this select 0) say3D [(_this select 1), (_this select 2)]}] call CBA_fnc_addEventHandler;
 
 // TODO.
 /*

addons/audio/functions/fnc_ambientSoundScape.sqf

@@ -28,7 +28,7 @@ private _soundDummy = createVehicle ["Land_HelipadEmpty_F", _dummyPosition, [],
 
 private _sound = selectRandom GVAR(ambientSoundScapeExtras);
 
-[QGVAR(say3D), [_soundDummy, _sound]] call CBA_fnc_globalEvent;
+[QGVAR(say3D), [_soundDummy, _sound, 100]] call CBA_fnc_globalEvent;
 
 // Loop sound
 [{

addons/common/functions/fnc_itemDecrement.sqf

@@ -8,7 +8,7 @@
  * 1: Replacement Item <STRING> (default: "")
  *
  * Return Value:
- * None
+ * 0: Decremented <BOOL>
  *
  * Example:
  * [] call misery_common_fnc_itemDecrement
@@ -25,10 +25,12 @@ if (_itemContainer isNotEqualTo -1) then {
     if (_containerCount > 1) then {
         player removeMagazine _item;
         [player, _item, _containerCount - 1, true] call CBA_fnc_addMagazine;
+        true
     } else {
         player removeMagazine _item;
         if (_replacementItem isNotEqualTo "") then {
             [player, _replacementItem, true] call CBA_fnc_addItem;
         };
+        false
     };
 };

addons/common/stringtable.xml

@@ -737,6 +737,22 @@
             <Chinesesimp>系统提示 + RPT日志</Chinesesimp>
             <Turkish>Sistem Sohbeti + RPT Günlükleri</Turkish>
         </Key>
+        <Key ID="STR_MISERY_Common_TakeItem">
+            <English>Take %1</English>
+            <Czech>Vzít %1</Czech>
+            <French>Prendre %1</French>
+            <Spanish>Tomar %1 / Cojer %1</Spanish>
+            <Italian>Prendi %1</Italian>
+            <Polish>Weź %1</Polish>
+            <Portuguese>Pegar %1</Portuguese>
+            <Russian>Взять %1</Russian>
+            <German>%1 nehmen</German>
+            <Korean>%1 줍기</Korean>
+            <Japanese>%1 を取る</Japanese>
+            <Chinese>拿取 %1</Chinese>
+            <Chinesesimp>拿取 %1</Chinesesimp>
+            <Turkish>%1 Al</Turkish>
+        </Key>
         <Key ID="STR_MISERY_Common_TooExpensive">
             <English>You cannot afford this!</English>
             <Czech>Tohle si nemůžete dovolit!</Czech>

addons/common/ui/menus.hpp

@@ -11,9 +11,6 @@
 #include "\z\misery\addons\fire\ui\fireCrafting.hpp"
 #include "\z\misery\addons\fishing\ui\fishing.hpp"
 #include "\z\misery\addons\forge\ui\forge.hpp"
-#include "\z\misery\addons\fuel\ui\refill_fuelCan.hpp"
-#include "\z\misery\addons\fuel\ui\refuelVehicle.hpp"
-#include "\z\misery\addons\generator\ui\generator.hpp"
 #include "\z\misery\addons\hydrology\ui\hydrology.hpp"
 #include "\z\misery\addons\maintenance\ui\maintenance.hpp"
 #include "\z\misery\addons\persistence\ui\grad_persistence.hpp"

addons/fuel/XEH_PREP.hpp

@@ -1,6 +1,6 @@
-PREP(audioLogic);
-PREP(fuelCanListed);
-PREP(icon);
-PREP(process);
+PREP(initFuelPumps);
+PREP(initRefuelRestrictions);
 PREP(processFuelCan);
-PREP(pumpAudio);
+PREP(processTerrainPumps);
+PREP(turnOffPump);
+PREP(turnOnPump);

addons/fuel/XEH_postInit.sqf

@@ -1,57 +1,42 @@
 #include "script_component.hpp"
 
-if (!isNil QACEGVAR(refuel,enabled) && ACEGVAR(refuel,enabled)) exitWith {};
+if (isServer) then {
+    call FUNC(initFuelPumps);
+    call FUNC(processTerrainPumps);
+};
+
+call FUNC(initRefuelRestrictions);
 
 private _allFuelStations = [MACRO_FUELSTATIONS_LAND] + [MACRO_FUELSTATIONS_AIR];
 
-private _fuelPumpAction = [
-    QGVAR(fuel_pump_menu),
-    localize LSTRING(Action),
-    QPATHTOEF(markers,data\fuel_ca.paa),
-    {},
-    {true},
-    {},
-    ["_target", "_player"],
-    [0, 0, 0],
-    3
-] call ACEFUNC(interact_menu,createAction);
+private _refillPumpAction = [
+    QGVAR(refuel_fuelCan_pump_menu),
+    localize LSTRING(RefillFuelCanAtPump),
+    "z\ace\addons\refuel\ui\icon_refuel_interact.paa",
+    {
+        params ["_target", "_player"];
 
-{
-    [_x, 0, [QUOTE(ACE_MainActions)], _fuelPumpAction] call ACEFUNC(interact_menu,addActionToClass);
-} forEach _allFuelStations;
+        private _allCans = [MACRO_FUEL_CANS] + [MACRO_FUEL_CANS_EMPTY];
+        private _matchedIndex = _allCans findIf { [[_x]] call EFUNC(common,hasItem) };
 
-private _refuelPumpAction = [
-    QGVAR(refuel_pump_menu),
-    localize LSTRING(RefuelAtPump),
-    QPATHTOEF(markers,data\fuel_ca.paa),
-    {
-        createDialog QCLASS(refuelVehicle_ui)
+        [_player, _matchedIndex] call FUNC(processFuelCan);
     },
-    {true},
-    {},
-    ["_target", "_player"],
-    [0, 0, 0],
-    3
-] call ACEFUNC(interact_menu,createAction);
+    {
+        params ["_target", "_player"];
 
-{
-    [_x, 0, [QUOTE(ACE_MainActions), QGVAR(fuel_pump_menu)], _refuelPumpAction] call ACEFUNC(interact_menu,addActionToClass);
-} forEach _allFuelStations;
+        private _isHoldingNozzle = _player getVariable [QACEGVAR(refuel,nozzle), objNull];
 
-private _refillPumpAction = [
-    QGVAR(refuel_fuelCan_pump_menu),
-    localize LSTRING(RefillFuelCanAtPump),
-    QPATHTOEF(markers,data\fuel_ca.paa),
-    {
-        createDialog QCLASS(refuelfuelCan_ui)
+        if (isNull _isHoldingNozzle) exitWith { false };
+
+        private _allCans = [MACRO_FUEL_CANS] + [MACRO_FUEL_CANS_EMPTY];
+        private _matchedIndex = _allCans findIf { [[_x]] call EFUNC(common,hasItem) };
+
+        _matchedIndex isNotEqualTo -1
     },
-    {true},
     {},
     ["_target", "_player"],
     [0, 0, 0],
     3
 ] call ACEFUNC(interact_menu,createAction);
 
-{
-    [_x, 0, [QUOTE(ACE_MainActions), QGVAR(fuel_pump_menu)], _refillPumpAction] call ACEFUNC(interact_menu,addActionToClass);
-} forEach _allFuelStations;
+[player, 1, [QUOTE(ACE_SelfActions)], _refillPumpAction] call ACEFUNC(interact_menu,addActionToObject);

addons/fuel/config.cpp

@@ -6,12 +6,11 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {QCLASS(common)};
+        requiredAddons[] = {QCLASS(common), QCLASSACE(refuel)};
         authors[] = {"TenuredCLOUD"};
         VERSION_CONFIG;
     };
 };
 
 #include "CfgEventHandlers.hpp"
 
-