Epoch Survival 0.4 b637

tanoa mission file added that adds RyanZombies to the addons array
Test extended options support for double click item interaction sub
menu.
- "Drink" gas to poison your self.
- Pour our Honey "Empty" option to gain the empty jar without consuming
the honey.

Changelogs/0.4.0.0.txt

@@ -22,4 +22,3 @@ Server Side Only:
 
 Known Issues:
 Jetski and Electric Motorcycle motorcycle in-vehicle HUD will not initialize if player is spawned inside vehicle, as display getin EH did not fire.
-Selected Inventory item is deselected randomly.

Sources/epoch_code/compile/EPOCH_consumeItem.sqf

@@ -20,9 +20,23 @@ EPOCH_InteractedItem params ["_text","_item","_pic"];
 
 _cfgBaseBuilding = 'CfgBaseBuilding' call EPOCH_returnConfig;
 _cfgItemInteractions = (('CfgItemInteractions' call EPOCH_returnConfig) >> _item);
+
 _interactOption = getNumber(_cfgItemInteractions >> "interactAction");
-_interactReturnOnUse = getText(_cfgItemInteractions >> "interactReturnOnUse");
 _interactAttributes = getArray(_cfgItemInteractions >> "interactAttributes");
+_interactReturnOnUse = getText(_cfgItemInteractions >> "interactReturnOnUse");
+
+_inputCount = count _this;
+if (_inputCount >= 1) then {
+    _interactOption = param [0,0];
+};
+if (_inputCount >= 2) then {
+    _interactAttributes = param [1,[]];
+};
+if (_inputCount >= 3) then {
+    _interactReturnOnUse = param [2,""];
+};
+
+// diag_log format["DEBUG: %1",[_interactOption,_interactAttributes,_interactReturnOnUse]];
 
 _removeItem = {([player,_this] call BIS_fnc_invRemove) == 1};
 

Sources/epoch_code/compile/inventory/EPOCH_itemInteractClick.sqf

@@ -19,28 +19,36 @@ _data = EPOCH_InteractedItem select 1;
 _interactOption = 0;
 _buttonTXT = "";
 _magCount = 1;
+_interactActions = [];
 _config = (configfile >> "CfgWeapons" >> _data);
 _cfgItemInteractions = (('CfgItemInteractions' call EPOCH_returnConfig) >> _data);
 if (isClass (_config)) then {
     _type = getNumber (_config >> "type");
     _interactOption = getNumber (_cfgItemInteractions >> "interactAction");
     _buttonTXT = getText(_cfgItemInteractions >> "interactText");
+    _interactActions = getArray(_cfgItemInteractions >> "interactActions");
 } else {
     _config = (configfile >> "CfgMagazines" >> _data);
     _type = getNumber (_config >> "type");
     _interactOption = getNumber (_cfgItemInteractions >> "interactAction");
     _buttonTXT = getText(_cfgItemInteractions >> "interactText");
     _magCount = getNumber (_config >> "count");
+    _interactActions = getArray(_cfgItemInteractions >> "interactActions");
 };
 
+// legacy
 if (_buttonTXT != "") then {
   _button_texts pushBack [_buttonTXT];
-} else {
-  if (_magCount > 1) then {
-      _button_texts pushBack ["REPACK"];
-  } else {
-      _button_texts pushBack ["EXAMINE"];
-  };
+};
+// additional interactActions
+if !(_interactActions isEqualTo []) then {
+    {
+         _button_texts pushBack _x;
+    } forEach _interactActions;
+};
+// ammo repack
+if (_magCount > 1) then {
+    _button_texts pushBack ["REPACK"];
 };
 
 _config = 'CfgCrafting' call EPOCH_returnConfig;
@@ -86,7 +94,7 @@ if !(_button_texts isEqualTo []) then {
     _btn_arr = [];
     _start_idc = 12346;
     {
-        _x params [["_btn_text","EXAMINE"],["_btn_code","call EPOCH_consumeItem;"]];
+        _x params [["_btn_text","EXAMINE"],["_btn_code","[] call EPOCH_consumeItem;"]];
         _button_gen = _display ctrlCreate ["RscButtonMenu", _start_idc,_control];
         _start_idc = _start_idc + 1;
         _button_gen ctrlSetPosition [0.06,_y2d,0.20,0.06];

Sources/epoch_config/Configs/CfgItemInteractions.hpp

@@ -75,8 +75,9 @@ class CfgItemInteractions
     };
     class honey_epoch : Food_Jar_base
     {
-        interactText = "CONSUME";
+        interactText = "EAT";
         interactAttributes[] = {{"Immunity",1},{"Stamina",30},{"BloodP",10}};
+        interactActions[] = {{"EMPTY","[1,[],'emptyjar_epoch'] call EPOCH_consumeItem;"}};
     };
     class sardines_epoch : Food_TinCan_base
     {
@@ -200,6 +201,7 @@ class CfgItemInteractions
         interactText = "FILL";
         interactReturnOnUse = "jerrycanE_epoch";
         interactAttributes[] = {10};
+        interactActions[] = {{"DRINK","[2,[['Toxicity',100],['Alcohol',50]],''] call EPOCH_consumeItem;"}};
     };
     class jerrycanE_epoch : Default
     {

Sources/epoch_config/Configs/CfgItemInteractions.json

@@ -63,7 +63,7 @@
             "_inherit": "Default"
         },
         "honey_epoch": {
-            "interactText": "CONSUME",
+            "interactText": "EAT",
             "interactAttributes": [
                 [
                     "Immunity",
@@ -78,6 +78,12 @@
                     10
                 ]
             ],
+            "interactActions": [
+                [
+                    "EMPTY",
+                    "[1,[],'emptyjar_epoch'] call EPOCH_consumeItem;"
+                ]
+            ],
             "_inherit": "Food_Jar_base"
         },
         "sardines_epoch": {
@@ -421,6 +427,12 @@
             "interactAttributes": [
                 10
             ],
+            "interactActions": [
+                [
+                    "DRINK",
+                    "[2,[['Toxicity',100],['Alcohol',50]],''] call EPOCH_consumeItem;"
+                ]
+            ],
             "_inherit": "Default"
         },
         "jerrycanE_epoch": {

Sources/epoch_config/build.hpp

@@ -1 +1 @@
-build=633;
+build=637;

Sources/epoch_server/build.hpp

@@ -1 +1 @@
-build=633;
+build=637;

Sources/epoch_server_core/build.hpp

@@ -1 +1 @@
-build=633;
+build=637;

Sources/epoch_server_settings/build.hpp

@@ -1 +1 @@
-build=633;
+build=637;

build.txt

@@ -1 +1 @@
-633
+637