Field rations - Add inventory context menu action (#229)

* fix addIntel * ContextMenuOption for field_rations; #include above comments; replace old ACE_medical_fnc_setDead * optimizations * base class like in intelitems * localize LSTRING -> LLSTRING * that is not for the repo * fix * use only ACE_ItemCore; show if enabled and field_rations items; enable if is full * Update addons/field_rations/XEH_postInit.sqf Co-authored-by: mharis001 <[email protected]> * moved EatDrink Up Co-authored-by: mharis001 <[email protected]>
acemod · Jun 20, 2020 · d0ed5f3 · d0ed5f3
1 parent 3c4d875
commit d0ed5f3
Show file tree

Hide file tree

Showing 38 changed files with 66 additions and 50 deletions.
diff --git a/addons/field_rations/XEH_postInit.sqf b/addons/field_rations/XEH_postInit.sqf
@@ -17,7 +17,7 @@ if !(hasInterface) exitWith {};
     // Compile water source actions
     private _mainAction = [
         QGVAR(waterSource),
-        localize LSTRING(WaterSource),
+        LLSTRING(WaterSource),
         QPATHTOF(ui\icon_water_tap.paa),
         {true},
         {
@@ -41,7 +41,7 @@ if !(hasInterface) exitWith {};
     private _subActions = [
         [
             QGVAR(checkWater),
-            localize LSTRING(CheckWater),
+            LLSTRING(CheckWater),
             QPATHTOF(ui\icon_water_tap.paa),
             {
                 private _waterSource = _target getVariable [QGVAR(waterSource), objNull];
@@ -54,7 +54,7 @@ if !(hasInterface) exitWith {};
         ] call ACEFUNC(interact_menu,createAction),
         [
             QGVAR(drinkFromSource),
-            localize LSTRING(DrinkFromSource),
+            LLSTRING(DrinkFromSource),
             QPATHTOF(ui\icon_water_tap.paa),
             {
                 private _waterSource = _target getVariable [QGVAR(waterSource), objNull];
@@ -73,6 +73,27 @@ if !(hasInterface) exitWith {};
         [QGVAR(helper), 0, [QGVAR(waterSource)], _x] call ACEFUNC(interact_menu,addActionToClass);
     } forEach _subActions;
 
+    // Add inventory context menu option to consume items
+    ["ACE_ItemCore", ["CONTAINER"], LSTRING(EatDrink), [], QPATHTOF(ui\icon_survival.paa),
+        [
+            {true},
+            {
+                params ["", "", "_item"];
+
+                GVAR(enabled) && {
+                    private _config = configFile >> "CfgWeapons" >> _item;                    
+                    getNumber (_config >> QGVAR(thirstQuenched)) > 0
+                    || {getNumber (_config >> QGVAR(hungerSatiated)) > 0}
+                }
+            }
+        ],
+        {
+            params ["_unit", "", "_item"];
+            [objNull, _unit, _item] call FUNC(consumeItem);
+            false
+        }
+    ] call CBA_fnc_addItemContextMenuOption;
+
     // Add water source helpers when interaction menu is opened
     ["ace_interactMenuOpened", {call FUNC(addWaterSourceInteractions)}] call CBA_fnc_addEventHandler;
 

diff --git a/addons/field_rations/functions/fnc_addStatusModifier.sqf b/addons/field_rations/functions/fnc_addStatusModifier.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
  * Author: mharis001
  * Adds a status modifier. Should be called on all machines.
@@ -15,7 +16,6 @@
  *
  * Public: Yes
  */
-#include "script_component.hpp"
 
 params [["_type", -1, [0]], ["_code", {}, [{}]]];
 

diff --git a/addons/field_rations/functions/fnc_addWaterSourceInteractions.sqf b/addons/field_rations/functions/fnc_addWaterSourceInteractions.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
  * Author: PabstMirror, mharis001
  * Dynamically adds actions to nearby water sources when interact_menu is opened.
@@ -14,7 +15,6 @@
  *
  * Public: No
  */
-#include "script_component.hpp"
 
 params ["_interactionType"];
 

diff --git a/addons/field_rations/functions/fnc_canRefillItem.sqf b/addons/field_rations/functions/fnc_canRefillItem.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
  * Author: mharis001, Glowbal, PabstMirror
  * Checks whether the player can refill an item from given water source.
@@ -15,7 +16,6 @@
  *
  * Public: No
  */
-#include "script_component.hpp"
 
 params ["_source", "_player", "_item"];
 

diff --git a/addons/field_rations/functions/fnc_checkWater.sqf b/addons/field_rations/functions/fnc_checkWater.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
  * Author: mharis001
  * Displays the remaining water in the given water source.
@@ -14,7 +15,6 @@
  *
  * Public: No
  */
-#include "script_component.hpp"
 
 params ["_player", "_source"];
 
@@ -34,5 +34,5 @@ params ["_player", "_source"];
         };
     },
     {},
-    localize LSTRING(CheckingWater)
+    LLSTRING(CheckingWater)
 ] call ACEFUNC(common,progressBar);
diff --git a/addons/field_rations/functions/fnc_consumeItem.sqf b/addons/field_rations/functions/fnc_consumeItem.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
  * Author: mharis001, Glowbal, PabstMirror
  * Consumes an item. Creates a progress bar and handles relevant thirst/hunger values.
@@ -15,7 +16,6 @@
  *
  * Public: No
  */
-#include "script_component.hpp"
 
 params ["", "_player", "_consumeItem"];
 TRACE_2("Consume item started",_player,_consumeItem);
@@ -36,9 +36,9 @@ private _consumeText = getText (_config >> QGVAR(consumeText));
 
 if (_consumeText == "") then {
     _consumeText = if (_hungerSatiated > 0) then {
-        localize LSTRING(EatingX);
+        LLSTRING(EatingX);
     } else {
-        localize LSTRING(DrinkingX);
+        LLSTRING(DrinkingX);
     };
 };
 

diff --git a/addons/field_rations/functions/fnc_drinkFromSource.sqf b/addons/field_rations/functions/fnc_drinkFromSource.sqf
@@ -65,9 +65,9 @@ private _fnc_condition = {
 
 private _sourceType = typeOf _source;
 private _progressText = if (_sourceType == "") then {
-    localize LSTRING(DrinkingFromSource)
+    LLSTRING(DrinkingFromSource)
 } else {
-    format [localize LSTRING(DrinkingFromX), getText (configFile >> "CfgVehicles" >> _sourceType >> "displayName")]
+    format [LLSTRING(DrinkingFromX), getText (configFile >> "CfgVehicles" >> _sourceType >> "displayName")]
 };
 
 [

diff --git a/addons/field_rations/functions/fnc_getActionOffset.sqf b/addons/field_rations/functions/fnc_getActionOffset.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
  * Author: mharis001
  * Returns the refill action offset for given object.
@@ -13,7 +14,6 @@
  *
  * Public: No
  */
-#include "script_component.hpp"
 
 params ["_object"];
 

diff --git a/addons/field_rations/functions/fnc_getConsumableChildren.sqf b/addons/field_rations/functions/fnc_getConsumableChildren.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
  * Author: mharis001, Glowbal, PabstMirror
  * Returns children actions for consumable items in player's inventory.
@@ -13,7 +14,6 @@
  *
  * Public: No
  */
-#include "script_component.hpp"
 
 params ["_player"];
 

diff --git a/addons/field_rations/functions/fnc_getRefillChildren.sqf b/addons/field_rations/functions/fnc_getRefillChildren.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
  * Author: mharis001
  * Returns children actions for refillable items in player's inventory for given water source.
@@ -14,7 +15,6 @@
  *
  * Public: No
  */
-#include "script_component.hpp"
 
 params ["_source", "_player"];
 
@@ -28,7 +28,7 @@ private _cfgWeapons = configFile >> "CfgWeapons";
 {
     private _config = _cfgWeapons >> _x;
     if (getText (_config >> QGVAR(refillItem)) != "" && {_water == REFILL_WATER_INFINITE || {getNumber (_config >> QGVAR(refillAmount)) <= _water}}) then {
-        private _displayName = format ["%1: %2", localize LSTRING(Refill), getText (_config >> "displayName")];
+        private _displayName = format ["%1: %2", LLSTRING(Refill), getText (_config >> "displayName")];
         private _picture = getText (_config >> "picture");
         private _action = [_x, _displayName, _picture, FUNC(refillItem), FUNC(canRefillItem), {}, _x] call ACEFUNC(interact_menu,createAction);
         _actions pushBack [_action, [], _source];

diff --git a/addons/field_rations/functions/fnc_getRemainingWater.sqf b/addons/field_rations/functions/fnc_getRemainingWater.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
  * Author: mharis001, PabstMirror
  * Returns the remaining water in a source.
@@ -13,7 +14,6 @@
  *
  * Public: Yes
  */
-#include "script_component.hpp"
 
 params [["_source", objNull, [objNull]]];
 

diff --git a/addons/field_rations/functions/fnc_handleHUD.sqf b/addons/field_rations/functions/fnc_handleHUD.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
  * Author: mharis001
  * Handles creating and updating the visuals of the HUD.
@@ -14,7 +15,6 @@
  *
  * Public: No
  */
-#include "script_component.hpp"
 
 params [["_thirst", ACE_player getVariable [QGVAR(thirst), 0]], ["_hunger", ACE_player getVariable [QGVAR(hunger), 0]]];
 

diff --git a/addons/field_rations/functions/fnc_handleRespawn.sqf b/addons/field_rations/functions/fnc_handleRespawn.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
  * Author: mharis001, Glowbal, PabstMirror
  * Handles the respawning of a unit by resetting necessary variables.
@@ -14,7 +15,6 @@
  *
  * Public: No
  */
-#include "script_component.hpp"
 
 params ["_unit", "_corpse"];
 TRACE_2("Handle Respawn",_unit,_corpse);

diff --git a/addons/field_rations/functions/fnc_refillItem.sqf b/addons/field_rations/functions/fnc_refillItem.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
  * Author: mharis001, Glowbal, PabstMirror
  * Refills an item from given water source.
@@ -15,7 +16,6 @@
  *
  * Public: No
  */
-#include "script_component.hpp"
 
 params ["_source", "_player", "_item"];
 TRACE_3("Item refill started",_source,_player,_item);
@@ -70,6 +70,6 @@ private _fnc_condition = {
     ],
     _fnc_onSuccess,
     _fnc_onFailure,
-    localize LSTRING(Refilling),
+    LLSTRING(Refilling),
     _fnc_condition
 ] call ACEFUNC(common,progressBar);
diff --git a/addons/field_rations/functions/fnc_setRemainingWater.sqf b/addons/field_rations/functions/fnc_setRemainingWater.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
  * Author: mharis001, PabstMirror
  * Sets the remaining water supply for given water source.
@@ -14,7 +15,6 @@
  *
  * Public: Yes
  */
-#include "script_component.hpp"
 
 params [["_source", objNull, [objNull]], ["_water", nil, [0]]];
 

diff --git a/addons/field_rations/functions/fnc_update.sqf b/addons/field_rations/functions/fnc_update.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
  * Author: mharis001, Glowbal, PabstMirror
  * Main looping function that updates thirst/hunger status.
@@ -13,7 +14,6 @@
  *
  * Public: No
  */
-#include "script_component.hpp"
 
 // 1 sec (update interval) * 100 (max thirst/hunger) / 3600 (sec in hour) = 0.02777778
 #define CHANGE_CONSTANT 0.02777778

diff --git a/addons/field_rations/stringtable.xml b/addons/field_rations/stringtable.xml
@@ -56,6 +56,10 @@
             <Russian>Выживание</Russian>
             <Spanish>Supervivencia</Spanish>
         </Key>
+        <Key ID="STR_ACEX_Field_Rations_EatDrink">
+            <English>Eat/Drink</English>
+            <German>Essen/Trinken</German>
+        </Key>
         <Key ID="STR_ACEX_Field_Rations_Enabled_Description">
             <English>Enable/Disable Field Rations</English>
             <Chinese>啟用/禁用戰地口糧。</Chinese>

diff --git a/addons/fortify/XEH_postInit.sqf b/addons/fortify/XEH_postInit.sqf
@@ -27,7 +27,7 @@ GVAR(objectRotationZ) = 0;
     if (_side isEqualTo side group ACE_player && {GVAR(settingHint) isEqualTo 2 || {GVAR(settingHint) isEqualTo 1 && {"ACE_Fortify" in (ACE_player call ACEFUNC(common,uniqueItems))}}}) then {
         private _budget = [_side] call FUNC(getBudget);
         TRACE_2("sideBudgetHint",_side,_budget);
-        [format ["%1 $%2", localize LSTRING(Budget), _budget]] call ACEFUNC(common,displayTextStructured);
+        [format ["%1 $%2", LLSTRING(Budget), _budget]] call ACEFUNC(common,displayTextStructured);
     };
 }] call CBA_fnc_addEventHandler;
 

diff --git a/addons/fortify/functions/fnc_addActions.sqf b/addons/fortify/functions/fnc_addActions.sqf
@@ -15,7 +15,6 @@
  * Public: No
  */
 
-
 params ["_player"];
 
 private _side = side group _player;

diff --git a/addons/fortify/functions/fnc_axisLengths.sqf b/addons/fortify/functions/fnc_axisLengths.sqf
@@ -15,7 +15,6 @@
  * Public: Yes
  */
 
-
 params [["_object", objNull, [objNull]]];
 
 (boundingBoxReal _object) params ["_p1", "_p2"];

diff --git a/addons/fortify/functions/fnc_canFortify.sqf b/addons/fortify/functions/fnc_canFortify.sqf
@@ -16,7 +16,6 @@
  * Public: Yes
  */
 
-
 params ["_player", ["_cost", 0]];
 
 (missionNamespace getVariable [QGVAR(fortifyAllowed), true]) &&

diff --git a/addons/fortify/functions/fnc_deployObject.sqf b/addons/fortify/functions/fnc_deployObject.sqf
@@ -17,7 +17,6 @@
  * Public: No
  */
 
-
 params ["", "_player", "_params"];
 _params params [["_side", sideUnknown, [sideUnknown]], ["_classname", "", [""]], ["_rotations", [0,0,0]]];
 TRACE_4("deployObject",_player,_side,_classname,_rotations);
@@ -35,10 +34,10 @@ GVAR(objectRotationZ) = _rotations select 2;
 
 GVAR(isPlacing) = PLACE_WAITING;
 
-private _lmb = localize LSTRING(confirm);
+private _lmb = LLSTRING(confirm);
 if (_budget > -1) then {_lmb = _lmb + format [" -$%1", _cost];};
 private _rmb = localize ACELSTRING(Common,Cancel);
-private _wheel = localize LSTRING(rotate);
+private _wheel = LLSTRING(rotate);
 private _xAxis = localize "str_disp_conf_xaxis";
 private _icons = [["alt", localize "str_3den_display3den_entitymenu_movesurface_text"], ["shift", localize "str_disp_conf_xaxis" + " " + _wheel], ["control", localize "str_disp_conf_yaxis" + " " + _wheel]];
 [_lmb, _rmb, _wheel, _icons] call ACEFUNC(interaction,showMouseHint);

diff --git a/addons/fortify/functions/fnc_getBudget.sqf b/addons/fortify/functions/fnc_getBudget.sqf
@@ -15,7 +15,6 @@
  * Public: Yes
  */
 
-
 params ["_side"];
 
 (missionNamespace getVariable [format [QGVAR(Budget_%1), _side], -1])
diff --git a/addons/fortify/functions/fnc_getCost.sqf b/addons/fortify/functions/fnc_getCost.sqf
@@ -16,7 +16,6 @@
  * Public: Yes
  */
 
-
 params ["_side", "_classname"];
 
 private _objects = missionNamespace getVariable [format [QGVAR(Objects_%1), _side], []];

diff --git a/addons/fortify/functions/fnc_modifyAction.sqf b/addons/fortify/functions/fnc_modifyAction.sqf
@@ -22,9 +22,9 @@ params ["", "_player", "", "_actionData"];
 
 private _budget = [side group _player] call FUNC(getBudget);
 private _actionText = if (_budget > 0) then {
-    format ["%1 [$%2]", localize LSTRING(fortify), _budget];
+    format ["%1 [$%2]", LLSTRING(fortify), _budget];
 } else {
-    localize LSTRING(fortify);
+    LLSTRING(fortify);
 };
 
 _actionData set [1, _actionText];
diff --git a/addons/fortify/functions/fnc_parseSide.sqf b/addons/fortify/functions/fnc_parseSide.sqf
@@ -17,7 +17,6 @@
  * Public: Yes
  */
 
-
 params ["_side"];
 TRACE_1("parseSide",_side);
 

diff --git a/addons/fortify/functions/fnc_registerObjects.sqf b/addons/fortify/functions/fnc_registerObjects.sqf
@@ -20,7 +20,6 @@
  * Public: Yes
  */
 
-
 if (!isServer) exitWith {};
 
 params [["_side", sideUnknown, [sideUnknown]], ["_budget", -1, [0]], ["_objects", [], [[]]]];