Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Skip ForceUpdate, if ForcedUpdateNow + fishingtime

Browse Source
This commit is contained in:
He-Man 2018-01-09 23:27:38 +01:00
parent 134627d08b
commit 3eac0b0035
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/epoch_code/compile/setup/masterLoop/Event1.sqf
View File

@ -418,6 +418,8 @@ if (cameraview isequalto "GROUP") then {
// force update // force update
if (EPOCH_forceUpdateNow) then { if (EPOCH_forceUpdateNow) then {
_forceUpdate = false;
EPOCH_forceUpdate = false;
EPOCH_forceUpdateNow = false; EPOCH_forceUpdateNow = false;
call _fnc_forceUpdate; call _fnc_forceUpdate;
}; };

1
Sources/epoch_code/compile/setup/masterLoop/Event3.sqf
View File

@ -7,5 +7,6 @@ if !(_prevEquippedItem isEqualTo EPOCH_equippedItem_PVS) then {
if (_forceUpdate || EPOCH_forceUpdate) then { if (_forceUpdate || EPOCH_forceUpdate) then {
_forceUpdate = false; _forceUpdate = false;
EPOCH_forceUpdate = false; EPOCH_forceUpdate = false;
EPOCH_forceUpdateNow = false;
call _fnc_forceUpdate; call _fnc_forceUpdate;
}; };

2
Sources/epoch_config/Configs/CfgMissions/CfgmissionFish.hpp
View File

@ -69,7 +69,7 @@ class CatchFish {
}; };
callevents[] = { // {{ARRAY1},{ARRAY2},... } callevents[] = { // {{ARRAY1},{ARRAY2},... }
}; };
abandonTime = 600; abandonTime = 1200;
failedCondition = "!alive player"; failedCondition = "!alive player";
faileddialogues[] = {"I guess you have better things to do. - Mission Failed","Mission Failed - You took to long."}; 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"; completeCondition = "{_x in magazines player} count ([""CfgEpochClient"", ""fishLoots"", [""ItemTuna"",""ItemSeaBass"",""ItemSeaBass"",""ItemSeaBass"",""ItemTrout"",""ItemTrout"",""ItemTrout"",""ItemTrout"",""ItemTrout"",""ItemTrout""]] call EPOCH_fnc_returnConfigEntryV2) > 0";