From 3eac0b0035749f8de97621eb011611c8f572440b Mon Sep 17 00:00:00 2001 From: He-Man Date: Tue, 9 Jan 2018 23:27:38 +0100 Subject: [PATCH] Skip ForceUpdate, if ForcedUpdateNow + fishingtime --- Sources/epoch_code/compile/setup/masterLoop/Event1.sqf | 2 ++ Sources/epoch_code/compile/setup/masterLoop/Event3.sqf | 1 + Sources/epoch_config/Configs/CfgMissions/CfgmissionFish.hpp | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf b/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf index c39d5374..4280d5a5 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf @@ -418,6 +418,8 @@ if (cameraview isequalto "GROUP") then { // force update if (EPOCH_forceUpdateNow) then { + _forceUpdate = false; + EPOCH_forceUpdate = false; EPOCH_forceUpdateNow = false; call _fnc_forceUpdate; }; diff --git a/Sources/epoch_code/compile/setup/masterLoop/Event3.sqf b/Sources/epoch_code/compile/setup/masterLoop/Event3.sqf index 9d8eefb4..4ccb53a7 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/Event3.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/Event3.sqf @@ -7,5 +7,6 @@ if !(_prevEquippedItem isEqualTo EPOCH_equippedItem_PVS) then { if (_forceUpdate || EPOCH_forceUpdate) then { _forceUpdate = false; EPOCH_forceUpdate = false; + EPOCH_forceUpdateNow = false; call _fnc_forceUpdate; }; diff --git a/Sources/epoch_config/Configs/CfgMissions/CfgmissionFish.hpp b/Sources/epoch_config/Configs/CfgMissions/CfgmissionFish.hpp index bdefffe4..b28b0ae3 100644 --- a/Sources/epoch_config/Configs/CfgMissions/CfgmissionFish.hpp +++ b/Sources/epoch_config/Configs/CfgMissions/CfgmissionFish.hpp @@ -69,7 +69,7 @@ class CatchFish { }; callevents[] = { // {{ARRAY1},{ARRAY2},... } }; - abandonTime = 600; + abandonTime = 1200; failedCondition = "!alive player"; faileddialogues[] = {"I guess you have better things to do. - Mission Failed","Mission Failed - You took to long."}; completeCondition = "{_x in magazines player} count ([""CfgEpochClient"", ""fishLoots"", [""ItemTuna"",""ItemSeaBass"",""ItemSeaBass"",""ItemSeaBass"",""ItemTrout"",""ItemTrout"",""ItemTrout"",""ItemTrout"",""ItemTrout"",""ItemTrout""]] call EPOCH_fnc_returnConfigEntryV2) > 0";