Anti-dupe improvement & esc menu handler (#595)

* Initial commit

* Missing changes?

* fixes

Co-authored-by: Jason_000 <Jason2605@users.noreply.github.com>

Author: DomT602

Altis_Life.Altis/Functions.hpp

@@ -178,7 +178,7 @@ class Life_Client_Core {
         class checkMap {};
         class clearVehicleAmmo {};
         class dropItems {};
-        class escInterupt {};
+        class onGameInterrupt {};
         class fetchCfgDetails {};
         class fetchDeadGear {};
         class fetchVehInfo {};

Altis_Life.Altis/config/Config_SpyGlass.hpp

@@ -248,7 +248,7 @@ class SpyGlass {
         "life_fnc_clearvehicleammo","life_fnc_clearvehicleammo_meta","life_fnc_clothingfilter","life_fnc_clothingfilter_meta","life_fnc_clothingmenu","life_fnc_clothingmenu_meta","life_fnc_colorvehicle","life_fnc_colorvehicle_meta","life_fnc_containerinvsearch","life_fnc_containerinvsearch_meta","life_fnc_containermenu","life_fnc_containermenu_meta","life_fnc_copbreakdoor",
         "life_fnc_copbreakdoor_meta","life_fnc_cophouseowner","life_fnc_cophouseowner_meta","life_fnc_copinteractionmenu","life_fnc_copinteractionmenu_meta","life_fnc_coplights","life_fnc_coplights_meta","life_fnc_copmarkers","life_fnc_copmarkers_meta","life_fnc_copsearch","life_fnc_copsearch_meta","life_fnc_copsiren",
         "life_fnc_copsiren_meta","life_fnc_copsplit","life_fnc_copsplit_meta","life_fnc_corpse","life_fnc_corpse_meta","life_fnc_creategang","life_fnc_creategang_meta","life_fnc_deathscreen","life_fnc_deathscreen_meta","life_fnc_defusekit","life_fnc_defusekit_meta","life_fnc_demochargetimer","life_fnc_demochargetimer_meta","life_fnc_devicemine","life_fnc_devicemine_meta",
-        "life_fnc_displayhandler","life_fnc_displayhandler_meta","life_fnc_dooranimate","life_fnc_dooranimate_meta","life_fnc_dpfinish","life_fnc_dpfinish_meta","life_fnc_dropfishingnet","life_fnc_dropfishingnet_meta","life_fnc_dropitems","life_fnc_dropitems_meta","life_fnc_escinterupt","life_fnc_escinterupt_meta","life_fnc_escortaction","life_fnc_escortaction_meta",
+        "life_fnc_displayhandler","life_fnc_displayhandler_meta","life_fnc_dooranimate","life_fnc_dooranimate_meta","life_fnc_dpfinish","life_fnc_dpfinish_meta","life_fnc_dropfishingnet","life_fnc_dropfishingnet_meta","life_fnc_dropitems","life_fnc_dropitems_meta","life_fnc_ongameinterrupt","life_fnc_ongameinterrupt_meta","life_fnc_escortaction","life_fnc_escortaction_meta",
         "life_fnc_fedcamdisplay","life_fnc_fedcamdisplay_meta","life_fnc_fetchcfgdetails","life_fnc_fetchcfgdetails_meta","life_fnc_fetchdeadgear","life_fnc_fetchdeadgear_meta","life_fnc_fetchvehinfo","life_fnc_fetchvehinfo_meta","life_fnc_flashbang","life_fnc_flashbang_meta","life_fnc_freezeplayer","life_fnc_freezeplayer_meta","life_fnc_fuellbchange","life_fnc_fuellbchange_meta",
         "life_fnc_fuelrefuelcar","life_fnc_fuelrefuelcar_meta","life_fnc_fuelstatopen","life_fnc_fuelstatopen_meta","life_fnc_fuelstore","life_fnc_fuelstore_meta","life_fnc_fuelsupply","life_fnc_fuelsupply_meta","life_fnc_gangcreated","life_fnc_gangcreated_meta","life_fnc_usegangbank","life_fnc_usegangbank_meta","life_fnc_gangdisband","life_fnc_gangdisband_meta","life_fnc_gangdisbanded",
         "life_fnc_gangdisbanded_meta","life_fnc_ganginvite","life_fnc_ganginvite_meta","life_fnc_ganginviteplayer","life_fnc_ganginviteplayer_meta","life_fnc_gangkick","life_fnc_gangkick_meta","life_fnc_gangleave","life_fnc_gangleave_meta","life_fnc_gangmenu","life_fnc_gangmenu_meta","life_fnc_gangnewleader","life_fnc_gangnewleader_meta","life_fnc_gangupgrade","life_fnc_gangupgrade_meta",

Altis_Life.Altis/core/fn_setupEVH.sqf

@@ -15,3 +15,5 @@ player addEventHandler ["InventoryOpened", {_this call life_fnc_inventoryOpened}
 player addEventHandler ["HandleRating", {0}];
 
 addMissionEventHandler ["Map", {_this call life_fnc_checkMap}];
+
+[missionNamespace,"OnGameInterrupt",{_this call life_fnc_onGameInterrupt}] call BIS_fnc_addScriptedEventHandler;

Altis_Life.Altis/core/functions/fn_escInterupt.sqf

@@ -46,3 +46,11 @@ private _list = ["LandVehicle", "Ship", "Air"];
         true breakOut "main";
     };
 } count [_container, _secContainer];
+
+[] spawn {
+    private _startTime = time;
+    waitUntil {!(isNull (findDisplay 49)) || time > (_startTime + 2.5)};
+    if !(isNull (findDisplay 49)) then {
+        (findDisplay 49) closeDisplay 2; //close Esc dialog
+    };
+};

Altis_Life.Altis/core/functions/fn_inventoryOpened.sqf

@@ -0,0 +1,46 @@
+#include "..\..\script_macros.hpp"
+/*
+    File: fn_onGameInterrupt.sqf
+    Author: DomT602
+    Description: Handles game interuptions - ie when esc menu is opened.
+*/
+params [
+    ["_display",displayNull,[displayNull]]
+];
+
+private _abortButton = _display displayCtrl 104;
+private _respawnButton = _display displayCtrl 1010;
+private _fieldManual = _display displayCtrl 122;
+private _saveButton = _display displayCtrl 103;
+private _topButton = _display displayCtrl 2;
+
+_abortButton ctrlEnable false;
+_abortButton buttonSetAction "call SOCK_fnc_updateRequest; [player] remoteExec [""TON_fnc_cleanupRequest"",2];";
+_respawnButton ctrlEnable false;
+_fieldManual ctrlEnable false;
+_saveButton ctrlEnable false;
+
+if (LIFE_SETTINGS(getNumber,"escapeMenu_displayExtras") isEqualTo 1) then {
+    _topButton ctrlEnable false;
+    _topButton ctrlSetText (LIFE_SETTINGS(getText,"escapeMenu_displayText"));
+    _saveButton ctrlSetText format ["Player UID: %1",getPlayerUID player];
+};
+
+private _conditions = playerSide isEqualTo west || {!((player getVariable ["restrained",false]) || {player getVariable ["Escorting",false]} || {player getVariable ["transporting",false]} || {life_is_arrested} || {life_istazed} || {life_isknocked})};
+if (_conditions) then {
+    [_display,_abortButton] spawn {
+        params ["_display","_abortButton"];
+        private _abortTime = LIFE_SETTINGS(getNumber,"escapeMenu_timer");
+        private _timeStamp = time + _abortTime;
+
+        waitUntil {
+            _abortButton ctrlSetText format [localize "STR_NOTF_AbortESC",[(_timeStamp - time),"SS.MS"] call BIS_fnc_secondsToString];
+            if (dialog && {isNull (findDisplay 7300)}) then {closeDialog 0};
+
+            (_timeStamp - time) <= 0 || {isNull _display || {!alive player}}
+        };
+        if (!alive player) exitWith {};
+        _abortButton ctrlSetText localize "STR_DISP_INT_ABORT";
+        _abortButton ctrlEnable true;
+    };
+};

Altis_Life.Altis/core/functions/fn_onGameInterrupt.sqf

@@ -44,8 +44,6 @@ diag_log "[Life Client] Server loading completed ";
 waitUntil {life_session_completed};
 0 cutText[localize "STR_Init_ClientFinish","BLACK FADED",99999999];
 
-[] spawn life_fnc_escInterupt;
-
 switch (playerSide) do {
     case west: {
         life_paycheck = LIFE_SETTINGS(getNumber,"paycheck_cop");
@@ -80,14 +78,6 @@ diag_log "[Life Client] Executing client.fsm";
 
 0 cutText ["","BLACK IN"];
 
-[] spawn {
-    for "_i" from 0 to 1 step 0 do {
-        waitUntil {(!isNull (findDisplay 49)) && {(!isNull (findDisplay 602))}}; // Check if Inventory and ESC dialogs are open
-        (findDisplay 49) closeDisplay 2; // Close ESC dialog
-        (findDisplay 602) closeDisplay 2; // Close Inventory dialog
-    };
-};
-
 addMissionEventHandler ["EachFrame", life_fnc_playerTags];
 addMissionEventHandler ["EachFrame", life_fnc_revealObjects];