From 033b057daf9ca8e2a55ab6d187326aa611ed4c63 Mon Sep 17 00:00:00 2001 From: Ghostrider-DbD- Date: Sat, 28 Jan 2017 20:08:02 -0500 Subject: [PATCH] Bug fixes. --- .../Compiles/TimeAccel/GMS_fnc_Time.sqf | 13 ++++++++++--- .../custom_server/Configs/blck_configs_exile.sqf | 3 +++ @epochhive/addons/custom_server/init/blck_init.sqf | 2 +- @epochhive/addons/custom_server/init/build.sqf | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/@epochhive/addons/custom_server/Compiles/TimeAccel/GMS_fnc_Time.sqf b/@epochhive/addons/custom_server/Compiles/TimeAccel/GMS_fnc_Time.sqf index 7c2c50f..8e1ebcb 100644 --- a/@epochhive/addons/custom_server/Compiles/TimeAccel/GMS_fnc_Time.sqf +++ b/@epochhive/addons/custom_server/Compiles/TimeAccel/GMS_fnc_Time.sqf @@ -21,12 +21,19 @@ _time = dayTime; //diag_log format["_fnc_Time:: -- > _sunrise = %1 | _sunset = %2 | _time = %3",_sunrise,_sunset,_time]; // Night -if (_time > (_sunset + 0.5) || _time < (_sunrise - 0.5)) exitWith {setTimeMultiplier blck_timeAccelerationNight; diag_log format["NIGHT TIMGE ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime];}; +if (_time > (_sunset + 0.5) || _time < (_sunrise - 0.5)) exitWith { + setTimeMultiplier blck_timeAccelerationNight; + //diag_log format["NIGHT TIMGE ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime]; +}; // Day -if (_time > (_sunrise + 0.5) && _time < (_sunset - 0.5)) exitWith {setTimeMultiplier blck_timeAccelerationDay; diag_log format["DAYTIME ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime];}; +if (_time > (_sunrise + 0.5) && _time < (_sunset - 0.5)) exitWith { + setTimeMultiplier blck_timeAccelerationDay; + //diag_log format["DAYTIME ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime]; +}; // default -setTimeMultiplier blck_timeAccelerationDusk; diag_log format["DUSK ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime]; +setTimeMultiplier blck_timeAccelerationDusk; +//diag_log format["DUSK ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime]; diff --git a/@epochhive/addons/custom_server/Configs/blck_configs_exile.sqf b/@epochhive/addons/custom_server/Configs/blck_configs_exile.sqf index e0be19a..b194105 100644 --- a/@epochhive/addons/custom_server/Configs/blck_configs_exile.sqf +++ b/@epochhive/addons/custom_server/Configs/blck_configs_exile.sqf @@ -27,7 +27,10 @@ Last modified 8/1/15 **************************************************************/ // if true then missions will not spawn within 1000 m of spawn points for Altis, Bornholm, Cherno, Esseker or stratis. + blck_listConcreteMixerZones = true; + blck_blacklistSpawns = true; blck_blacklistTraderCities = true; // Set this = true if you would like the mission system to automatically search for the locations of the Epoch trader cities. Note that these are pre-defined in GMS_fnc_findWorld for the most common maps. + // list of locations that are protected against mission spawns switch (toLower(worldName)) do diff --git a/@epochhive/addons/custom_server/init/blck_init.sqf b/@epochhive/addons/custom_server/init/blck_init.sqf index d84414b..bd9146a 100644 --- a/@epochhive/addons/custom_server/init/blck_init.sqf +++ b/@epochhive/addons/custom_server/init/blck_init.sqf @@ -45,7 +45,7 @@ if (_modType isEqualTo "Exile") then waitUntil {(isNil "blck_configsLoaded") isEqualTo false;}; waitUntil{blck_configsLoaded}; blck_configsLoaded = nil; - if (blck_blacklistTraderCities || blck_blacklistSpawns || blcklistConcreteMixerZones) then {execVM "\q\addons\custom_server\Compiles\Functions\GMS_fnc_getTraderCitesExile.sqf";}; + if (blck_blacklistTraderCities || blck_blacklistSpawns || blck_listConcreteMixerZones) then {execVM "\q\addons\custom_server\Compiles\Functions\GMS_fnc_getTraderCitesExile.sqf";}; }; // spawn map addons to give the server time to position them before spawning in crates etc. diff --git a/@epochhive/addons/custom_server/init/build.sqf b/@epochhive/addons/custom_server/init/build.sqf index 8aee4ea..b13163a 100644 --- a/@epochhive/addons/custom_server/init/build.sqf +++ b/@epochhive/addons/custom_server/init/build.sqf @@ -1,3 +1,3 @@ private ["_version","_versionDate"]; -_blck_version = "6.55 Build 36"; -_blck_versionDate = "1-24-17 11:50 PM"; +_blck_version = "6.55 Build 37"; +_blck_versionDate = "1-28-17 11:50 PM";