From 94f8161f55fdb8c92aff4ae9f940b567c28f9a7b Mon Sep 17 00:00:00 2001 From: Jonas Windmolders Date: Mon, 4 Apr 2016 18:29:16 +0200 Subject: [PATCH] Extra option for a difference between first run and time between missiosn --- server_addon_code/a3_zcp_exile/fn_startZCP.sqf | 3 +-- server_addon_code/a3_zcp_exile/functions/fn_initCPData.sqf | 2 +- server_addon_code/a3_zcp_exile/functions/fn_start.sqf | 5 ++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server_addon_code/a3_zcp_exile/fn_startZCP.sqf b/server_addon_code/a3_zcp_exile/fn_startZCP.sqf index 1a9d8ae..355d819 100644 --- a/server_addon_code/a3_zcp_exile/fn_startZCP.sqf +++ b/server_addon_code/a3_zcp_exile/fn_startZCP.sqf @@ -22,8 +22,6 @@ if !(isServer) exitWith }; }; -diag_log text format ["[ZCP]: Giving server some time to boot."]; - ZCP_MapCenterPos = [8500,8500]; ZCP_MapRadius = 8500; @@ -83,5 +81,6 @@ ZCP_RandomReward = []; }count ZCP_RewardWeightForRandomChoice; diag_log text format ["[ZCP]: Capture Points is fully running."]; +diag_log text format ["[ZCP]: Waiting %1s for first mission.", ZCP_ServerStartWaitTime]; uiSleep ZCP_ServerStartWaitTime; [] spawn ZCP_fnc_missionLooper; diff --git a/server_addon_code/a3_zcp_exile/functions/fn_initCPData.sqf b/server_addon_code/a3_zcp_exile/functions/fn_initCPData.sqf index dcce737..9a79f4d 100644 --- a/server_addon_code/a3_zcp_exile/functions/fn_initCPData.sqf +++ b/server_addon_code/a3_zcp_exile/functions/fn_initCPData.sqf @@ -1,4 +1,4 @@ private["_nil"]; { - _nil = ZCP_Data pushBack [false,0,[-99999,0,0]]; + _nil = ZCP_Data pushBack [false,0,[-99999,0,0],true]; }count ZCP_CapPoints; diff --git a/server_addon_code/a3_zcp_exile/functions/fn_start.sqf b/server_addon_code/a3_zcp_exile/functions/fn_start.sqf index ffcc5dc..02dc103 100644 --- a/server_addon_code/a3_zcp_exile/functions/fn_start.sqf +++ b/server_addon_code/a3_zcp_exile/functions/fn_start.sqf @@ -26,7 +26,9 @@ _capturePosition = [0,0,0]; _ZCP_name = _this select 0; _ZCP_index = _this select 4; -uiSleep _randomTime; +if(!((ZCP_Data select _ZCP_index) select 3)) then { + uiSleep _randomTime; +}; diag_log text format ["[ZCP]: Waiting for %1 players to be online.",ZCP_Minimum_Online_Players]; waitUntil { uiSleep 60; count( playableUnits ) > ( ZCP_Minimum_Online_Players - 1 ) }; @@ -281,6 +283,7 @@ if(count _ZCP_baseObjects != 0)then{ (ZCP_Data select _ZCP_index) set[0,false]; (ZCP_Data select _ZCP_index) set[1,0]; (ZCP_Data select _ZCP_index) set[2,[-99999,0,0]]; + (ZCP_Data select _ZCP_index) set[3,false]; ZCP_MissionCounter = ZCP_MissionCounter - 1; diag_log format["[ZCP]: %1 will be cleaned up in %2s and ended.",_ZCP_name, ZCP_BaseCleanupDelay]; [] spawn ZCP_fnc_missionLooper;