diff --git a/Changelogs/0.4.0.0.txt b/Changelogs/0.4.0.0.txt index 433fcb01..2c80e3de 100644 --- a/Changelogs/0.4.0.0.txt +++ b/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. diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo index 4f26f692..952e46a4 100644 Binary files a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo and b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo differ diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo index f2c55d8e..66f14744 100644 Binary files a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo and b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo differ diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo index 2d47b5e1..faae1db7 100644 Binary files a/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo and b/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index 4455da8c..8f56fe71 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Altis.pbo and b/Server_Install_Pack/mpmissions/epoch.Altis.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index 8cf07d82..b18378ec 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Australia.pbo and b/Server_Install_Pack/mpmissions/epoch.Australia.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo index b94def2c..1f986aa9 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo index 2ea2b350..ba7cca2c 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo and b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index 5eaef265..f9dd86bb 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo and b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index 407862ef..6394948b 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo and b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo index 4f57c212..5e57b7eb 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo and b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo index c829e73f..fded7207 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo and b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo index e8fd1d5e..76e6ca4b 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Napf.pbo b/Server_Install_Pack/mpmissions/epoch.Napf.pbo index afb2fe4c..b070c8cd 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Napf.pbo and b/Server_Install_Pack/mpmissions/epoch.Napf.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Porto.pbo b/Server_Install_Pack/mpmissions/epoch.Porto.pbo index 949fbdba..640e709f 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Porto.pbo and b/Server_Install_Pack/mpmissions/epoch.Porto.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo index 05dbd0fe..cb431310 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo and b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Sara.pbo b/Server_Install_Pack/mpmissions/epoch.Sara.pbo index e4e5e1d0..0fc8ab6a 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Sara.pbo and b/Server_Install_Pack/mpmissions/epoch.Sara.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo index 8bf1d426..c9ae8380 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo and b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo index 592e9180..dee5d905 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo and b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index f806dbd5..e8a0e8c7 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo and b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index 8e8f70d0..7bc6c74a 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo and b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo index f6858db2..eb8bc4aa 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo and b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo b/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo index 58ce32d8..5a90d95c 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo and b/Server_Install_Pack/mpmissions/epoch.Tanoa.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index 029150d3..e95a51f2 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.VR.pbo and b/Server_Install_Pack/mpmissions/epoch.VR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo index 347e43c6..50fb821b 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index aac15e0d..a5306b0b 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo and b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index a984edff..1a7a230f 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.utes.pbo and b/Server_Install_Pack/mpmissions/epoch.utes.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Tanoa_RyanZed.pbo b/Server_Install_Pack/mpmissions/epoch_RyanZed.Tanoa.pbo similarity index 99% rename from Server_Install_Pack/mpmissions/epoch.Tanoa_RyanZed.pbo rename to Server_Install_Pack/mpmissions/epoch_RyanZed.Tanoa.pbo index 260d1a8c..b97bd101 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Tanoa_RyanZed.pbo and b/Server_Install_Pack/mpmissions/epoch_RyanZed.Tanoa.pbo differ diff --git a/Sources/epoch_code/compile/EPOCH_consumeItem.sqf b/Sources/epoch_code/compile/EPOCH_consumeItem.sqf index 80748ae7..b69a4878 100644 --- a/Sources/epoch_code/compile/EPOCH_consumeItem.sqf +++ b/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}; diff --git a/Sources/epoch_code/compile/inventory/EPOCH_itemInteractClick.sqf b/Sources/epoch_code/compile/inventory/EPOCH_itemInteractClick.sqf index 332a86a4..5e9c53e5 100644 --- a/Sources/epoch_code/compile/inventory/EPOCH_itemInteractClick.sqf +++ b/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]; diff --git a/Sources/epoch_config/Configs/CfgItemInteractions.hpp b/Sources/epoch_config/Configs/CfgItemInteractions.hpp index 6dee7512..c6230828 100644 --- a/Sources/epoch_config/Configs/CfgItemInteractions.hpp +++ b/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 { diff --git a/Sources/epoch_config/Configs/CfgItemInteractions.json b/Sources/epoch_config/Configs/CfgItemInteractions.json index 3da7a9aa..3e25cd8f 100644 --- a/Sources/epoch_config/Configs/CfgItemInteractions.json +++ b/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": { diff --git a/Sources/epoch_config/build.hpp b/Sources/epoch_config/build.hpp index 09457d1b..0c700f1a 100644 --- a/Sources/epoch_config/build.hpp +++ b/Sources/epoch_config/build.hpp @@ -1 +1 @@ -build=633; +build=637; diff --git a/Sources/epoch_server/build.hpp b/Sources/epoch_server/build.hpp index 09457d1b..0c700f1a 100644 --- a/Sources/epoch_server/build.hpp +++ b/Sources/epoch_server/build.hpp @@ -1 +1 @@ -build=633; +build=637; diff --git a/Sources/epoch_server_core/build.hpp b/Sources/epoch_server_core/build.hpp index 09457d1b..0c700f1a 100644 --- a/Sources/epoch_server_core/build.hpp +++ b/Sources/epoch_server_core/build.hpp @@ -1 +1 @@ -build=633; +build=637; diff --git a/Sources/epoch_server_settings/build.hpp b/Sources/epoch_server_settings/build.hpp index 09457d1b..0c700f1a 100644 --- a/Sources/epoch_server_settings/build.hpp +++ b/Sources/epoch_server_settings/build.hpp @@ -1 +1 @@ -build=633; +build=637; diff --git a/Sources/mpmissions/epoch.Tanoa_RyanZed/mission.sqm b/Sources/mpmissions/epoch_RyanZed.Tanoa/mission.sqm similarity index 100% rename from Sources/mpmissions/epoch.Tanoa_RyanZed/mission.sqm rename to Sources/mpmissions/epoch_RyanZed.Tanoa/mission.sqm diff --git a/Sources/mpmissions/epoch.Tanoa_RyanZed/treeView.txt b/Sources/mpmissions/epoch_RyanZed.Tanoa/treeView.txt similarity index 99% rename from Sources/mpmissions/epoch.Tanoa_RyanZed/treeView.txt rename to Sources/mpmissions/epoch_RyanZed.Tanoa/treeView.txt index 9232d222..8bbbe7ca 100644 Binary files a/Sources/mpmissions/epoch.Tanoa_RyanZed/treeView.txt and b/Sources/mpmissions/epoch_RyanZed.Tanoa/treeView.txt differ diff --git a/build.txt b/build.txt index 670d7611..cc77108b 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -633 +637