Field Rations - Add setting to disable in Zeus (#10462)

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com> Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
acemod · Nov 21, 2024 · f9ac825 · f9ac825
1 parent e0ce058
commit f9ac825
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 8 deletions.
diff --git a/addons/common/functions/fnc_statusEffect_addType.sqf b/addons/common/functions/fnc_statusEffect_addType.sqf
@@ -6,7 +6,7 @@
  * Arguments:
  * 0: Status Effect Name, this should match a corresponding event name <STRING>
  * 1: Send event globally <BOOL>
- * 2: Common Effect Reaons to pre-seed durring init <ARRAY>
+ * 2: Common Effect Reasons to pre-seed during init <ARRAY>
  * 3: Send event to JIP (requires sending event globally) <BOOL>
  * 4: Event name <STRING> (default: "ace_common_<effect>")
  *

diff --git a/addons/common/functions/fnc_statusEffect_get.sqf b/addons/common/functions/fnc_statusEffect_get.sqf
@@ -4,7 +4,7 @@
  * Retrives list of current status effects
  *
  * Arguments:
- * 0: vehicle that it will be attached to (player or vehicle) <OBJECT>
+ * 0: Vehicle that it will be attached to (player or vehicle) <OBJECT>
  * 1: Effect Name <STRING>
  *
  * Return Value:

diff --git a/addons/common/functions/fnc_statusEffect_localEH.sqf b/addons/common/functions/fnc_statusEffect_localEH.sqf
@@ -4,7 +4,7 @@
  * Handles locality switch, runs a respawn check and then reapplies all effect events.
  *
  * Arguments:
- * 0: vehicle that it will be attached to (player or vehicle) <OBJECT>
+ * 0: Vehicle that it will be attached to (player or vehicle) <OBJECT>
  * 1: isLocal <BOOL>
  *
  * Return Value:

diff --git a/addons/common/functions/fnc_statusEffect_resetVariables.sqf b/addons/common/functions/fnc_statusEffect_resetVariables.sqf
@@ -4,7 +4,7 @@
  * Resets all effect numbers to 0 when an object respawns (but does not apply the effect event).
  *
  * Arguments:
- * 0: vehicle that it will be attached to (player or vehicle) <OBJECT>
+ * 0: Vehicle that it will be attached to (player or vehicle) <OBJECT>
  *
  * Return Value:
  * None

diff --git a/addons/common/functions/fnc_statusEffect_respawnEH.sqf b/addons/common/functions/fnc_statusEffect_respawnEH.sqf
@@ -4,7 +4,7 @@
  * Handles the Respawn Event Handler to reset effects.
  *
  * Arguments:
- * 0: vehicle that it will be attached to (player or vehicle) <OBJECT>
+ * 0: Vehicle that it will be attached to (player or vehicle) <OBJECT>
  *
  * Return Value:
  * None

diff --git a/addons/common/functions/fnc_statusEffect_set.sqf b/addons/common/functions/fnc_statusEffect_set.sqf
@@ -4,7 +4,7 @@
  * Adds or removes an id to a status effect and will send an event to apply.
  *
  * Arguments:
- * 0: vehicle that it will be attached to (player or vehicle) <OBJECT>
+ * 0: Vehicle that it will be attached to (player or vehicle) <OBJECT>
  * 1: Effect Name <STRING>
  * 2: Unique Reason ID <STRING>
  * 3: Is Set (true adds/false removes) <BOOL>

diff --git a/addons/field_rations/XEH_postInit.sqf b/addons/field_rations/XEH_postInit.sqf
@@ -138,6 +138,15 @@ if !(hasInterface) exitWith {};
     // Add respawn eventhandler to reset necessary variables, done through script so only added if field rations is enabled
     ["CAManBase", "respawn", LINKFUNC(handleRespawn)] call CBA_fnc_addClassEventHandler;
 
+    // Add status effect to block hunger/thirst updates
+    ["field_rations_blockUpdates", false, [], false, QGVAR(blockUpdates)] call EFUNC(common,statusEffect_addType);
+
+    [QGVAR(blockUpdates), {
+        params ["_object", "_set"];
+        TRACE_2("blockUpdates EH",_object,_set);
+        _object setVariable [QGVAR(blockUpdates), _set > 0];
+    }] call CBA_fnc_addEventHandler;
+
     // Start update loop
     [LINKFUNC(update), CBA_missionTime + MP_SYNC_INTERVAL, 1] call CBA_fnc_waitAndExecute;
 

diff --git a/addons/field_rations/functions/fnc_update.sqf b/addons/field_rations/functions/fnc_update.sqf
@@ -23,8 +23,13 @@ params ["_nextMpSync"];
 // Access global variable once
 private _player = ACE_player;
 
-// Exit if player is not alive or a virtual unit
-if (!alive _player || {_player isKindOf "VirtualMan_F"}) exitWith {
+// Exit if player is not alive, a virtual unit, or is in Zeus interface (if setting is enabled)
+if (
+    !alive _player ||
+    {_player isKindOf "VirtualMan_F"} ||
+    {!GVAR(zeusUpdates) && {!isNull findDisplay 312}} ||
+    {_player getVariable [QGVAR(blockUpdates), false]}
+) exitWith {
     [LINKFUNC(update), _nextMpSync, 1] call CBA_fnc_waitAndExecute;
     QGVAR(hud) cutFadeOut 0.5;
 };

diff --git a/addons/field_rations/initSettings.inc.sqf b/addons/field_rations/initSettings.inc.sqf
@@ -101,3 +101,12 @@
     [[-1, 0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8], [LSTRING(Dynamic), "0%", "10%", "20%", "30%", "40%", "50%", "60%", "70%", "80%", 0], 0],
     false
 ] call CBA_fnc_addSetting;
+
+[
+    QGVAR(zeusUpdates),
+    "CHECKBOX",
+    [LSTRING(ZeusUpdates_DisplayName), LSTRING(ZeusUpdates_Description)],
+    LSTRING(DisplayName),
+    false,
+    1
+] call CBA_fnc_addSetting;
diff --git a/addons/field_rations/stringtable.xml b/addons/field_rations/stringtable.xml
@@ -1282,5 +1282,11 @@
             <Chinese>飲用水補給</Chinese>
             <Chinesesimp>饮用水补给</Chinesesimp>
         </Key>
+        <Key ID="STR_ACE_Field_Rations_ZeusUpdates_Description">
+            <English>If enabled, hunger and thirst will continue to increase while the Zeus interface is open.</English>
+        </Key>
+        <Key ID="STR_ACE_Field_Rations_ZeusUpdates_DisplayName">
+            <English>Update Hunger and Thirst in Zeus</English>
+        </Key>
     </Package>
 </Project>