From 0a264b96704a7c1422773485d01a7dc620e8e17b Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 08:38:36 -0600 Subject: [PATCH 01/47] Move FPS diagnostic logging and event spawner to the scheduler. --- SQF/dayz_server/system/scheduler/sched_init.sqf | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/SQF/dayz_server/system/scheduler/sched_init.sqf b/SQF/dayz_server/system/scheduler/sched_init.sqf index 17e79c42f..6ca23d26b 100644 --- a/SQF/dayz_server/system/scheduler/sched_init.sqf +++ b/SQF/dayz_server/system/scheduler/sched_init.sqf @@ -1,10 +1,10 @@ +#define PATH "z\addons\dayz_server\system\scheduler\" -_base="z\addons\dayz_server\system\scheduler\"; - -call compile preprocessFileLineNumbers (_base+"sched_corpses.sqf"); -call compile preprocessFileLineNumbers (_base+"sched_lootpiles.sqf"); -call compile preprocessFileLineNumbers (_base+"sched_sync.sqf"); -call compile preprocessFileLineNumbers (_base+"sched_safetyVehicle.sqf"); +call compile preprocessFileLineNumbers (PATH+"sched_corpses.sqf"); +call compile preprocessFileLineNumbers (PATH+"sched_lootpiles.sqf"); +call compile preprocessFileLineNumbers (PATH+"sched_sync.sqf"); +call compile preprocessFileLineNumbers (PATH+"sched_safetyVehicle.sqf"); +call compile preprocessFileLineNumbers (PATH+"sched_event.sqf"); [ // period offset code <-> ctx init code ->ctx @@ -12,7 +12,9 @@ call compile preprocessFileLineNumbers (_base+"sched_safetyVehicle.sqf"); [ 300, 336, sched_lootpiles_5m, sched_lootpiles_5m_init ], [ 6, 340, sched_lootpiles ], [ 900, 0, sched_sync ], - [ 120, 48, sched_safetyVehicle ] + [ 120, 48, sched_safetyVehicle ], + [ 360, 480, sched_fps ], + [ 10, 0, sched_event, sched_event_init ] ] execFSM ("z\addons\dayz_code\system\scheduler\scheduler.fsm"); //diag_log [ __FILE__, "Scheduler started"]; From cb43ab8afbb55e288be3c57d588043f9d1fb9cb5 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 08:39:54 -0600 Subject: [PATCH 02/47] Add FPS logging to scheduler. --- SQF/dayz_server/system/scheduler/sched_sync.sqf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/SQF/dayz_server/system/scheduler/sched_sync.sqf b/SQF/dayz_server/system/scheduler/sched_sync.sqf index d939187e4..cc032ef9a 100644 --- a/SQF/dayz_server/system/scheduler/sched_sync.sqf +++ b/SQF/dayz_server/system/scheduler/sched_sync.sqf @@ -22,4 +22,9 @@ sched_sync = { }; objNull -}; +}; + +sched_fps = { + diag_log format["SERVER FPS: %1 PLAYERS: %2",round diag_fps,playersNumber west]; + objNull +}; From 820c785845589e0179c89634064107bf89c81520 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 08:42:52 -0600 Subject: [PATCH 03/47] Upload event scheduler file. --- .../system/scheduler/sched_event.sqf | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 SQF/dayz_server/system/scheduler/sched_event.sqf diff --git a/SQF/dayz_server/system/scheduler/sched_event.sqf b/SQF/dayz_server/system/scheduler/sched_event.sqf new file mode 100644 index 000000000..3a53b565e --- /dev/null +++ b/SQF/dayz_server/system/scheduler/sched_event.sqf @@ -0,0 +1,77 @@ +/* + DayZ Epoch Event Scheduler + Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com. +*/ + +epoch_eventIsAny = { + private ["_boolReturn","_event","_date","_bool","_index"]; + _event = _this select 0; + _date = _this select 1; + + _boolReturn = false; + + _index = 0; + { + _bool = false; + if (typeName _x == "STRING") then { + _boolReturn = true; + } else { + _boolReturn = ((_date select _index) == _x); + }; + if (!_boolReturn) exitWith {}; + _index = _index + 1; + } count _event; + + _boolReturn +}; + +sched_event_init = { + diag_log("EPOCH EVENTS INIT"); + EventSchedulerLastTime = ""; + objNull +}; + +// This function runs ever 10 seconds because ServerCurrentTime is used in player death logging. +sched_event = { + private ["_date","_key","_result","_outcome","_handle","_datestr"]; + // Find current time from server + _key = "CHILD:307:"; + _result = _key call server_hiveReadWrite; + _outcome = _result select 0; + if(_outcome == "PASS") then { + _date = _result select 1; + _datestr = str(_date); + if (EventSchedulerLastTime != _datestr) then { + + // internal timestamp + ServerCurrentTime = [(_date select 3), (_date select 4)]; + + // Once a minute. + EventSchedulerLastTime = _datestr; + + //diag_log ("EVENTS: Local Time is: " + _datestr); + + { + if (!EpochUseEvents) exitWith {}; + + if (typeName _x == "ARRAY") then { + + // Run event at server start when minutes are set to -1 + if ((_x select 4) == -1) then { + diag_log ("RUNNING EVENT: " + (_x select 5) + " on " + _datestr); + _handle = [] execVM "\z\addons\dayz_server\modules\" + (_x select 5) + ".sqf"; + + // Set the current position to something other than an array so the event doesn't run again. + EpochEvents set [_forEachIndex, -1]; + } else { + if([[(_x select 0),(_x select 1),(_x select 2),(_x select 3),(_x select 4)],_date] call epoch_eventIsAny) then { + diag_log ("RUNNING EVENT: " + (_x select 5) + " on " + _datestr); + _handle = [] execVM "\z\addons\dayz_server\modules\" + (_x select 5) + ".sqf"; + }; + }; + }; + } forEach EpochEvents; + }; + }; + objNull +}; \ No newline at end of file From 357d6c5aed97173dfb4c25104e3735ad8815275f Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 08:47:57 -0600 Subject: [PATCH 04/47] Remove server_spawnEvents from compiles. This function has been moved to the scheduler. --- SQF/dayz_server/init/server_functions.sqf | 1 - 1 file changed, 1 deletion(-) diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf index 78ed9fd1a..3747e350a 100644 --- a/SQF/dayz_server/init/server_functions.sqf +++ b/SQF/dayz_server/init/server_functions.sqf @@ -42,7 +42,6 @@ server_publishVeh = compile preprocessFileLineNumbers "\z\addons\dayz_server\com server_publishVeh2 = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle2.sqf"; //Used to purchase vehicles at traders server_publishVeh3 = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle3.sqf"; //Used for car upgrades server_tradeObj = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_tradeObject.sqf"; -server_spawnEvents = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_spawnEvent.sqf"; server_deaths = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerDeaths.sqf"; server_maintainArea = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_maintainArea.sqf"; server_checkIfTowed = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_checkIfTowed.sqf"; From c32f5c56ccd5d0a750587aee2e77d1fb51cf1fd2 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 08:49:10 -0600 Subject: [PATCH 05/47] This function has been moved to the scheduler. --- SQF/dayz_server/compile/server_spawnEvent.sqf | 62 ------------------- 1 file changed, 62 deletions(-) delete mode 100644 SQF/dayz_server/compile/server_spawnEvent.sqf diff --git a/SQF/dayz_server/compile/server_spawnEvent.sqf b/SQF/dayz_server/compile/server_spawnEvent.sqf deleted file mode 100644 index ffafc9077..000000000 --- a/SQF/dayz_server/compile/server_spawnEvent.sqf +++ /dev/null @@ -1,62 +0,0 @@ -/* - DayZ Epoch Event Scheduler - Usage: spawn server_spawnEvents; - Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com. -*/ - -private ["_date","_key","_result","_outcome","_handle","_time","_datestr"]; - -diag_log("EPOCH EVENTS INIT"); -EventSchedulerLastTime = ""; - -epoch_eventIsAny = { - private ["_boolReturn","_event","_date","_bool","_index"]; - _event = _this select 0; - _date = _this select 1; - - _boolReturn = false; - - _index = 0; - { - _bool = false; - if (typeName _x == "STRING") then { - _boolReturn = true; - } else { - _boolReturn = ((_date select _index) == _x); - }; - if (!_boolReturn) exitWith {}; - _index = _index + 1; - } count _event; - - _boolReturn -}; - -while {1 == 1} do { - - // Find current time from server - _key = "CHILD:307:"; - _result = _key call server_hiveReadWrite; - _outcome = _result select 0; - if(_outcome == "PASS") then { - _date = _result select 1; - _datestr = str(_date); - if (EventSchedulerLastTime != _datestr) then { - - // internal timestamp - ServerCurrentTime = [(_date select 3), (_date select 4)]; - - // Once a minute. - EventSchedulerLastTime = _datestr; - - //diag_log ("EVENTS: Local Time is: " + _datestr); - { - if (!EpochUseEvents) exitWith {}; - if([[(_x select 0),(_x select 1),(_x select 2),(_x select 3),(_x select 4)],_date] call epoch_eventIsAny) then { - diag_log ("RUNNING EVENT: " + (_x select 5) + " on " + _datestr); - _handle = [] execVM "\z\addons\dayz_server\modules\" + (_x select 5) + ".sqf"; - }; - } count EpochEvents; - }; - }; - uiSleep 10; -}; \ No newline at end of file From 4c1218a5cbdd77a7bee797ca6841ed840ff65a3c Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 08:50:28 -0600 Subject: [PATCH 06/47] FPS diagnostic logging moved to scheduler. --- SQF/dayz_server/system/server_monitor.sqf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf index 87046fdab..5c8aa365e 100644 --- a/SQF/dayz_server/system/server_monitor.sqf +++ b/SQF/dayz_server/system/server_monitor.sqf @@ -1,5 +1,4 @@ private ["_date","_year","_month","_day","_hour","_minute","_date1","_key","_objectCount","_dir","_point","_i","_action","_dam","_selection","_wantExplosiveParts","_entity","_worldspace","_damage","_booleans","_rawData","_ObjectID","_class","_CharacterID","_inventory","_hitpoints","_fuel","_id","_objectArray","_script","_result","_outcome","_shutdown","_res"]; -[] execVM "\z\addons\dayz_server\system\s_fps.sqf"; //server monitor FPS (writes each ~181s diag_fps+181s diag_fpsmin*) #include "\z\addons\dayz_server\compile\server_toggle_debug.hpp" waitUntil {!isNil "BIS_MPF_InitDone" && initialized}; @@ -510,4 +509,4 @@ if (_hiveLoaded) then { }; }; -[] spawn server_spawnEvents; \ No newline at end of file +[] spawn server_spawnEvents; From 14dca91fae47bd5d31b4169f0d4282ef9e46800c Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 08:58:44 -0600 Subject: [PATCH 07/47] Upload new versions of events to be run by the event spawner Epoch has been running the Vanilla Mod versions since the 1.0.6 update. These files are designed to run on Epoch's built in event spawner. --- SQF/dayz_server/modules/Care_Packages.sqf | 75 +++++++++++++++++ SQF/dayz_server/modules/CrashSites.sqf | 93 ++++++++++++++++++++++ SQF/dayz_server/modules/CrashSites_Old.sqf | 70 ++++++++++++++++ SQF/dayz_server/modules/Infected_Camps.sqf | 91 +++++++++++++++++++++ 4 files changed, 329 insertions(+) create mode 100644 SQF/dayz_server/modules/Care_Packages.sqf create mode 100644 SQF/dayz_server/modules/CrashSites.sqf create mode 100644 SQF/dayz_server/modules/CrashSites_Old.sqf create mode 100644 SQF/dayz_server/modules/Infected_Camps.sqf diff --git a/SQF/dayz_server/modules/Care_Packages.sqf b/SQF/dayz_server/modules/Care_Packages.sqf new file mode 100644 index 000000000..a1da04fde --- /dev/null +++ b/SQF/dayz_server/modules/Care_Packages.sqf @@ -0,0 +1,75 @@ +/* +Spawns care packages. + +Single parameter: + integer Number of care packages to spawn. + +Author: + Foxy +*/ + +#include "\z\addons\dayz_code\util\Math.hpp" +#include "\z\addons\dayz_code\util\Vector.hpp" +#include "\z\addons\dayz_code\loot\Loot.hpp" + +//Number of care packages to spawn +#define SPAWN_NUM 6 + +#define SEARCH_CENTER getMarkerPos "carepackages" +#define SEARCH_RADIUS (getMarkerSize "carepackages") select 0 +#define SEARCH_DIST_MIN 30 +#define SEARCH_SLOPE_MAX 1000 +#define SEARCH_BLACKLIST [[[12923,3643],[14275,2601]]] + +private ["_typeGroup","_position","_type","_class","_vehicle","_lootGroup","_lootNum","_lootPos","_lootVeh","_size"]; + +_lootGroup = Loot_GetGroup("CarePackage"); +_typeGroup = Loot_GetGroup("CarePackageType"); + +for "_i" from 1 to (SPAWN_NUM) do +{ + _type = Loot_SelectSingle(_typeGroup); + _class = _type select 1; + _lootNum = round Math_RandomRange(_type select 2, _type select 3); + _position = [SEARCH_CENTER, 0, SEARCH_RADIUS, SEARCH_DIST_MIN, 0, SEARCH_SLOPE_MAX, 0, SEARCH_BLACKLIST] call BIS_fnc_findSafePos; + _position set [2, 0]; + + diag_log format ["DEBUG: Spawning a care package (%1) at %2 with %3 items.", _class, _position, _lootNum]; + + //_vehicle = createVehicle [_class, _position, [], 0, "CAN_COLLIDE"]; + _vehicle = _class createVehicle _position; + dayz_serverObjectMonitor set [count dayz_serverObjectMonitor, _vehicle]; + _vehicle setVariable ["ObjectID", 1, true]; + + _size = sizeOf _class; + + { + //Calculate random loot position + _lootPos = Vector_Add(_position, Vector_Multiply(Vector_FromDir(random 360), _size * 0.6 + random _size)); + _lootPos set [2, 0]; + + _lootVeh = Loot_Spawn(_x, _lootPos); + _lootVeh setVariable ["permaLoot", true]; + + switch (dayz_spawncarepkgs_clutterCutter) do + { + case 1: //Lift loot up by 5cm + { + _lootPos set [2, 0.05]; + _lootVeh setPosATL _lootpos; + }; + + case 2: //Clutter cutter + { + //createVehicle ["ClutterCutter_small_2_EP1", _lootPos, [], 0, "CAN_COLLIDE"]; + "ClutterCutter_small_2_EP1" createVehicle _lootPos; + }; + + case 3: //Debug sphere + { + //createVehicle ["Sign_sphere100cm_EP1", _lootPos, [], 0, "CAN_COLLIDE"]; + "Sign_sphere100cm_EP1" createVehicle _lootPos; + }; + }; + } forEach Loot_Select(_lootGroup, _lootNum); +}; \ No newline at end of file diff --git a/SQF/dayz_server/modules/CrashSites.sqf b/SQF/dayz_server/modules/CrashSites.sqf new file mode 100644 index 000000000..f71bd6fa3 --- /dev/null +++ b/SQF/dayz_server/modules/CrashSites.sqf @@ -0,0 +1,93 @@ +/* +Spawns crash sites at the beginning of mission. + +Author: + Foxy + +Modified for DayZ Epoch Event Spawner by JasonTM +*/ + +#include "\z\addons\dayz_code\util\Math.hpp" +#include "\z\addons\dayz_code\util\Vector.hpp" +#include "\z\addons\dayz_code\loot\Loot.hpp" + +//Chance to spawn a crash site +#define SPAWN_CHANCE 0.75 + +//Parameters for finding a suitable position to spawn the crash site +#define SEARCH_CENTER getMarkerPos "crashsites" +#define SEARCH_RADIUS (getMarkerSize "crashsites") select 0 +#define SEARCH_DIST_MIN 20 +#define SEARCH_SLOPE_MAX 2 +#define SEARCH_BLACKLIST [[[2092,14167],[10558,12505]]] + +//Number of crash sites to spawn +#define NUMBER 3 + +//Number of loot items to spawn per site +#define LOOT_MIN 5 +#define LOOT_MAX 8 + +private ["_spawnCrashSite","_type","_class","_lootGroup","_position","_vehicle","_lootParams","_dir","_mag","_lootNum","_lootPos","_lootVeh"]; + +_spawnCrashSite = +{ + _type = Loot_SelectSingle(Loot_GetGroup("CrashSiteType")); + _class = _type select 1; + _lootGroup = Loot_GetGroup(_type select 2); + _lootNum = round Math_RandomRange(LOOT_MIN, LOOT_MAX); + + _position = [SEARCH_CENTER, 0, SEARCH_RADIUS, SEARCH_DIST_MIN, 0, SEARCH_SLOPE_MAX, 0, SEARCH_BLACKLIST] call BIS_fnc_findSafePos; + _position set [2, 0]; + + diag_log format ["CRASHSPAWNER: Spawning crash site (%1) at %2 with %3 items.", _class, _position, _lootNum]; + + _vehicle = "ClutterCutter_small_2_EP1" createVehicle _position; + _vehicle = _class createVehicle [0,0,0]; + _vehicle setVariable ["ObjectID", 1, true]; + _vehicle setDir random 360; + _vehicle setPos _position; + + _lootParams = getArray (configFile >> "CfgVehicles" >> _class >> "lootParams"); + + { + _dir = random 360; + _mag = random (_lootParams select 4); + _lootPos = [((_lootParams select 2) + _mag) * sin _dir, ((_lootParams select 3) + _mag) * cos _dir, 0]; + _lootPos = Vector_Add(_lootPos, _lootParams select 0); + _lootPos = Vector_Rotate2D(_lootPos, _lootParams select 1); + _lootPos = _vehicle modelToWorld _lootPos; + _lootPos set [2, 0]; + + _lootVeh = Loot_Spawn(_x, _lootPos); + _lootVeh setVariable ["permaLoot", true]; + + switch (dayz_spawnCrashSite_clutterCutter) do + { + case 1: //Lift loot up by 5cm + { + _lootPos set [2, 0.05]; + _lootVeh setPosATL _lootpos; + }; + + case 2: //Clutter cutter + { + //createVehicle ["ClutterCutter_small_2_EP1", _lootPos, [], 0, "CAN_COLLIDE"]; + "ClutterCutter_small_2_EP1" createVehicle _lootPos; + }; + + case 3: //Debug sphere + { + //createVehicle ["Sign_sphere100cm_EP1", _lootPos, [], 0, "CAN_COLLIDE"]; + "Sign_sphere100cm_EP1" createVehicle _lootPos; + }; + }; + } + forEach Loot_Select(_lootGroup, _lootNum); +}; + +//Spawn crash sites +for "_i" from 1 to (NUMBER) do +{ + call _spawnCrashSite; +}; \ No newline at end of file diff --git a/SQF/dayz_server/modules/CrashSites_Old.sqf b/SQF/dayz_server/modules/CrashSites_Old.sqf new file mode 100644 index 000000000..19cb1651a --- /dev/null +++ b/SQF/dayz_server/modules/CrashSites_Old.sqf @@ -0,0 +1,70 @@ +/* + This file was imported from DayZ Epoch 1.0.5.1 and updated for use in v1.06+ by JasonTM. + This version uses the old "SpawnableWreck" classes. +*/ + +#include "\z\addons\dayz_code\loot\Loot.hpp" + +#define SEARCH_BLACKLIST [[[2092,14167],[10558,12505]]] // Map area black list. Default is for Chernarus. +#define LOWER_GRASS true // Lowers the grass around the loot. +#define MIN_LOOT_RADIUS 4 // Minimum distance for loot to spawn from the crash site in meters. +#define MAX_LOOT_RADIUS 10 // Maximum distance for loot to spawn from the crash site in meters. +#define SPAWN_FIRE false // Visual effect of burning wreck. (may negatively affect fps) +#define FADE_FIRE false // Fades the burning effect over time. +#define NUMBER 3 //Number of crash sites to spawn at the beginning of the mission. +#define LOOT_MIN 10 // Minimum number of loot items to spawn per site. +#define LOOT_MAX 15 // Maximum number of loot items to spawn per site. + +private ["_spawnCrashSite","_class","_crashName","_position","_crash","_type","_lootGroup","_lootRadius","_lootPos","_lootVeh","_lootNum"]; + +_spawnCrashSite = { + + _class = ["UH60_NAVY_Wreck_DZ","UH60_ARMY_Wreck_DZ","UH60_NAVY_Wreck_burned_DZ","UH60_ARMY_Wreck_burned_DZ","Mass_grave_DZ"] call BIS_fnc_selectRandom; + _crashName = getText (configFile >> "CfgVehicles" >> _class >> "displayName"); + + _position = [getMarkerPos "crashsites", 0, (getMarkerSize "crashsites") select 0, 20, 0, 0.3, 0, SEARCH_BLACKLIST] call BIS_fnc_findSafePos; + + _crash = _class createVehicle [0,0,0]; + _crash setDir random 360; + _position set [2, 0]; + _crash setPos _position; + _crash setVariable ["ObjectID","1",true]; + _crash enableSimulation false; + + if (SPAWN_FIRE && {!(_class == "Mass_grave_DZ")}) then { + PVDZ_obj_Fire = [_crash, 4, time, false, FADE_FIRE]; + publicVariable "PVDZ_obj_Fire"; + _crash setvariable ["fadeFire",FADE_FIRE,true]; + }; + + // Select random crash site loot + _type = Loot_SelectSingle(Loot_GetGroup("CrashSiteType")); + if(_class == "Mass_grave_DZ") then { + _lootGroup = Loot_GetGroup("MassGrave"); + } else { + _lootGroup = Loot_GetGroup(_type select 2); + }; + + // Calculate loot amount + _lootNum = round (LOOT_MIN + random (LOOT_MAX - LOOT_MIN)); + + diag_log format ["CRASHSPAWNER: Spawning crash site (%1) at %2 with %3 items.", _crashName, _position, _lootNum]; + + { + _lootRadius = (random MAX_LOOT_RADIUS) + MIN_LOOT_RADIUS; + _lootPos = [_position, _lootRadius, random 360] call BIS_fnc_relPos; + _lootPos set [2, 0]; + _lootVeh = Loot_Spawn(_x, _lootPos); + _lootVeh setVariable ["permaLoot", true]; + //_lootArray set[count _lootArray, _lootVeh]; + if (LOWER_GRASS) then { + createVehicle ["ClutterCutter_small_2_EP1", _lootPos, [], 0, "CAN_COLLIDE"]; + }; + } forEach Loot_Select(_lootGroup,_lootNum); +}; + +// Spawn crash sites +for "_i" from 1 to (NUMBER) do +{ + call _spawnCrashSite; +}; \ No newline at end of file diff --git a/SQF/dayz_server/modules/Infected_Camps.sqf b/SQF/dayz_server/modules/Infected_Camps.sqf new file mode 100644 index 000000000..f7cbe4ad0 --- /dev/null +++ b/SQF/dayz_server/modules/Infected_Camps.sqf @@ -0,0 +1,91 @@ +/* +Spawns infected camps + +Author: + Foxy +*/ + +#include "\z\addons\dayz_code\util\Math.hpp" +#include "\z\addons\dayz_code\loot\Loot.hpp" + +//Number of infected camps to spawn +#define CAMP_NUM 3 + +//Minimum distance between camps +#define CAMP_MIN_DIST 300 + +//Base class of objects to add loot to +#define CAMP_CONTAINER_BASE "IC_Tent" + +//Loot per tent +#define LOOT_MIN 10 +#define LOOT_MAX 20 + +//Random objects per camp +#define OBJECT_MIN 4 +#define OBJECT_MAX 12 + +//Radius around the camp in which random objects are spawned +#define OBJECT_RADIUS_MIN 8 +#define OBJECT_RADIUS_MAX 13 + +#define SEARCH_CENTER getMarkerPos "center" +#define SEARCH_RADIUS (getMarkerSize "center") select 0 +#define SEARCH_EXPRESSION "(5 * forest) + (4 * trees) + (3 * meadow) - (20 * houses) - (30 * sea)" //+ (3 * meadow) - (20 * houses) - (30 * sea) +#define SEARCH_PRECISION 30 +#define SEARCH_ATTEMPTS 10 + +private +[ + "_typeGroup", + "_lootGroup", + "_objectGroup", + "_type", + "_position", + "_composition", + "_compositionObjects", + "_objectPos" +]; + +_typeGroup = Loot_GetGroup("InfectedCampType"); +_lootGroup = Loot_GetGroup("InfectedCamp"); +_objectGroup = Loot_GetGroup("InfectedCampObject"); + +for "_i" from 1 to (CAMP_NUM) do +{ + //Select type of camp + _type = Loot_SelectSingle(_typeGroup); + _composition = _type select 1; + + //Find a position + + for "_j" from 1 to (SEARCH_ATTEMPTS) do + { + _position = ((selectBestPlaces [SEARCH_CENTER, SEARCH_RADIUS, SEARCH_EXPRESSION, SEARCH_PRECISION, 1]) select 0) select 0; + _position set [2, 0]; + + //Check if a camp already exists within the minimum distance + if (count (_position nearObjects [CAMP_CONTAINER_BASE,CAMP_MIN_DIST]) < 1) exitWith {}; + }; + + diag_log format ["DEBUG: Spawning an infected camp (%1) at %2", _composition, _position]; + + //Spawn composition + _compositionObjects = [_position, random 360,_composition] call spawnComposition; + + //Add loot to containers + { + if (_x isKindOf (CAMP_CONTAINER_BASE)) then + { + Loot_InsertCargo(_x, _lootGroup, round Math_RandomRange(LOOT_MIN, LOOT_MAX)); + }; + } forEach _compositionObjects; + + //Spawn objects around the camp + { + _objectPos = [_position, OBJECT_RADIUS_MIN, OBJECT_RADIUS_MAX, 5] call fn_selectRandomLocation; + + Loot_Spawn(_x, _objectPos); + + } forEach Loot_Select(_objectGroup, round Math_RandomRange(OBJECT_MIN, OBJECT_MAX)); +}; \ No newline at end of file From 9e84635abb2ab7f3efd040264bf70875b1cb872f Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 08:59:50 -0600 Subject: [PATCH 08/47] Replacing with new version of this file. --- SQF/dayz_server/modules/supply_drop.sqf | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 SQF/dayz_server/modules/supply_drop.sqf diff --git a/SQF/dayz_server/modules/supply_drop.sqf b/SQF/dayz_server/modules/supply_drop.sqf deleted file mode 100644 index 5877e093b..000000000 --- a/SQF/dayz_server/modules/supply_drop.sqf +++ /dev/null @@ -1,2 +0,0 @@ -// Using vanilla care packages now. -// The 1.0.5.1 version was outdated and needs a full rewrite. \ No newline at end of file From d949e9d95abcea861ef45ce0eb0345c45d5d9aad Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:00:13 -0600 Subject: [PATCH 09/47] Replacing with new version of this file. --- SQF/dayz_server/modules/crash_spawner.sqf | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 SQF/dayz_server/modules/crash_spawner.sqf diff --git a/SQF/dayz_server/modules/crash_spawner.sqf b/SQF/dayz_server/modules/crash_spawner.sqf deleted file mode 100644 index ed056f98d..000000000 --- a/SQF/dayz_server/modules/crash_spawner.sqf +++ /dev/null @@ -1,2 +0,0 @@ -// Using vanilla crash sites now. -// The 1.0.5.1 version was outdated and needs a full rewrite. \ No newline at end of file From 7bc06e374935e9cc9218c1322cb92ea23746b269 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:10:21 -0600 Subject: [PATCH 10/47] Enable events and add new array. Note that setting minutes to -1 will run the event one time at server start. Events with minutes set to numbers from 0-60 will run every hour. --- .../MPMissions/DayZ_Epoch_1.Takistan/init.sqf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf index 24ff50740..6e51c75ba 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf @@ -68,8 +68,13 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1000; // Distance around markers to find a safe spawn position spawnShoremode = 0; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = false; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. -EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]]; +EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. +EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. + ["any","any","any","any",-1,"Care_Packages"], + //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) + //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. + ["any","any","any","any",-1,"CrashSites"] +]; // EPOCH CONFIG VARIABLES END // @@ -138,4 +143,4 @@ if (!isDedicated) then { 3 fadeSound 1; 3 fadeMusic 1; endLoadingScreen; -}; \ No newline at end of file +}; From 6f2faa661c14dae550db0c5211576d96fa9d278e Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:12:10 -0600 Subject: [PATCH 11/47] Enable events and add new array. Note that setting minutes to -1 will run the event one time at server start. Events with minutes set to numbers from 0-60 will run every hour. --- .../MPMissions/DayZ_Epoch_11.Chernarus/init.sqf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf index 7cb2f75de..a782f00a6 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf @@ -68,8 +68,13 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = false; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. -EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]]; +EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. +EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. + ["any","any","any","any",-1,"Care_Packages"], + //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) + //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. + ["any","any","any","any",-1,"CrashSites"] +]; // EPOCH CONFIG VARIABLES END // @@ -138,4 +143,4 @@ if (!isDedicated) then { 3 fadeSound 1; 3 fadeMusic 1; endLoadingScreen; -}; \ No newline at end of file +}; From f586b0257c54ed22e312497a4b622f986000dcd0 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:13:27 -0600 Subject: [PATCH 12/47] Enable events and add new array. Note that setting minutes to -1 will run the event one time at server start. Events with minutes set to numbers from 0-60 will run every hour. --- .../MPMissions/DayZ_Epoch_12.isladuala/init.sqf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf index 35d180318..bcb35b90c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf @@ -68,8 +68,13 @@ MaxDynamicDebris = 400; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = false; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. -EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]]; +EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. +EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. + ["any","any","any","any",-1,"Care_Packages"], + //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) + //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. + ["any","any","any","any",-1,"CrashSites"] +]; // EPOCH CONFIG VARIABLES END // @@ -138,4 +143,4 @@ if (!isDedicated) then { 3 fadeSound 1; 3 fadeMusic 1; endLoadingScreen; -}; \ No newline at end of file +}; From 8734ccecd3426b17fb17f89b3f45b6a3aaf27877 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:14:27 -0600 Subject: [PATCH 13/47] Enable events and add new array. Note that setting minutes to -1 will run the event one time at server start. Events with minutes set to numbers from 0-60 will run every hour. --- Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf index e788af0c2..ac9e6d969 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf @@ -68,8 +68,13 @@ MaxDynamicDebris = 700; // Max number of random road blocks to spawn around the MaxVehicleLimit = 400; // Max number of random vehicles to spawn around the map spawnArea = 2500; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = false; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. -EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]]; +EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. +EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. + ["any","any","any","any",-1,"Care_Packages"], + //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) + //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. + ["any","any","any","any",-1,"CrashSites"] +]; // EPOCH CONFIG VARIABLES END // @@ -138,4 +143,4 @@ if (!isDedicated) then { 3 fadeSound 1; 3 fadeMusic 1; endLoadingScreen; -}; \ No newline at end of file +}; From c2bcfffa6ca97e77d79d81c8c2def4d8cb28836c Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:15:18 -0600 Subject: [PATCH 14/47] Enable events and add new array. Note that setting minutes to -1 will run the event one time at server start. Events with minutes set to numbers from 0-60 will run every hour. --- .../MPMissions/DayZ_Epoch_15.namalsk/init.sqf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf index 7fc8ae4df..4d216e92c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf @@ -68,8 +68,13 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = false; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. -EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]]; +EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. +EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. + ["any","any","any","any",-1,"Care_Packages"], + //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) + //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. + ["any","any","any","any",-1,"CrashSites"] +]; // EPOCH CONFIG VARIABLES END // @@ -138,4 +143,4 @@ if (!isDedicated) then { 3 fadeSound 1; 3 fadeMusic 1; endLoadingScreen; -}; \ No newline at end of file +}; From aff75d7a9298a300aa91f071e0167c51e0ec3f4b Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:16:07 -0600 Subject: [PATCH 15/47] Enable events and add new array. Note that setting minutes to -1 will run the event one time at server start. Events with minutes set to numbers from 0-60 will run every hour. --- .../MPMissions/DayZ_Epoch_16.Panthera2/init.sqf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf index d297a249b..a5f6490b8 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf @@ -68,8 +68,13 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = false; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. -EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]]; +EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. +EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. + ["any","any","any","any",-1,"Care_Packages"], + //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) + //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. + ["any","any","any","any",-1,"CrashSites"] +]; // EPOCH CONFIG VARIABLES END // @@ -138,4 +143,4 @@ if (!isDedicated) then { 3 fadeSound 1; 3 fadeMusic 1; endLoadingScreen; -}; \ No newline at end of file +}; From 5759dbab53de4e3d447b0f4048ef4042678d5405 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:16:49 -0600 Subject: [PATCH 16/47] Enable events and add new array. Note that setting minutes to -1 will run the event one time at server start. Events with minutes set to numbers from 0-60 will run every hour. --- .../MPMissions/DayZ_Epoch_17.Chernarus/init.sqf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf index 7c3599ab9..7cfca6bbe 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf @@ -68,8 +68,13 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = false; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. -EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]]; +EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. +EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. + ["any","any","any","any",-1,"Care_Packages"], + //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) + //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. + ["any","any","any","any",-1,"CrashSites"] +]; // EPOCH CONFIG VARIABLES END // @@ -138,4 +143,4 @@ if (!isDedicated) then { 3 fadeSound 1; 3 fadeMusic 1; endLoadingScreen; -}; \ No newline at end of file +}; From cd8e5c16bfa94586ff480043da9919cf27c9a4fa Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:17:48 -0600 Subject: [PATCH 17/47] Enable events and add new array. Note that setting minutes to -1 will run the event one time at server start. Events with minutes set to numbers from 0-60 will run every hour. --- .../MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf index 2285dd986..a424e441f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf @@ -68,8 +68,13 @@ MaxDynamicDebris = 250; // Max number of random road blocks to spawn around the MaxVehicleLimit = 200; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = false; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. -EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]]; +EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. +EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. + ["any","any","any","any",-1,"Care_Packages"], + //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) + //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. + ["any","any","any","any",-1,"CrashSites"] +]; // EPOCH CONFIG VARIABLES END // @@ -138,4 +143,4 @@ if (!isDedicated) then { 3 fadeSound 1; 3 fadeMusic 1; endLoadingScreen; -}; \ No newline at end of file +}; From 1a7b1cd77cb71c0e36605551dcf20b205fc6904b Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:18:56 -0600 Subject: [PATCH 18/47] Enable events and add new array. Note that setting minutes to -1 will run the event one time at server start. Events with minutes set to numbers from 0-60 will run every hour. --- .../MPMissions/DayZ_Epoch_21.Caribou/init.sqf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf index a9889b28b..26cc2232b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf @@ -68,8 +68,13 @@ MaxDynamicDebris = 250; // Max number of random road blocks to spawn around the MaxVehicleLimit = 200; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = false; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. -EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]]; +EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. +EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. + ["any","any","any","any",-1,"Care_Packages"], + //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) + //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. + ["any","any","any","any",-1,"CrashSites"] +]; // EPOCH CONFIG VARIABLES END // @@ -138,4 +143,4 @@ if (!isDedicated) then { 3 fadeSound 1; 3 fadeMusic 1; endLoadingScreen; -}; \ No newline at end of file +}; From 61ca020708920d4f1287e9eb0f1169d0b6bb555b Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:20:17 -0600 Subject: [PATCH 19/47] Enable events and add new array. Note that setting minutes to -1 will run the event one time at server start. Events with minutes set to numbers from 0-60 will run every hour. --- .../MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf index 1228d0b6d..785ced3a1 100644 --- a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf @@ -68,8 +68,13 @@ MaxDynamicDebris = 350; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = false; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. -EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]]; +EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. +EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. + ["any","any","any","any",-1,"Care_Packages"], + //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) + //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. + ["any","any","any","any",-1,"CrashSites"] +]; // EPOCH CONFIG VARIABLES END // @@ -138,4 +143,4 @@ if (!isDedicated) then { 3 fadeSound 1; 3 fadeMusic 1; endLoadingScreen; -}; \ No newline at end of file +}; From eb9ca71e548284dd25853298e5fa202c2f3b5046 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:21:17 -0600 Subject: [PATCH 20/47] Enable events and add new array. Note that setting minutes to -1 will run the event one time at server start. Events with minutes set to numbers from 0-60 will run every hour. --- .../MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf index feb0324fd..faa36a52e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf @@ -68,8 +68,13 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = false; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. -EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]]; +EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. +EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. + ["any","any","any","any",-1,"Care_Packages"], + //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) + //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. + ["any","any","any","any",-1,"CrashSites"] +]; // EPOCH CONFIG VARIABLES END // @@ -138,4 +143,4 @@ if (!isDedicated) then { 3 fadeSound 1; 3 fadeMusic 1; endLoadingScreen; -}; \ No newline at end of file +}; From 99deaaf211d9ef7106161e1a4a8d010f0bfe711e Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:22:03 -0600 Subject: [PATCH 21/47] Enable events and add new array. Note that setting minutes to -1 will run the event one time at server start. Events with minutes set to numbers from 0-60 will run every hour. --- Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf index 9d35f75e3..eb1ea38d1 100644 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf @@ -68,8 +68,13 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = false; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. -EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]]; +EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. +EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. + ["any","any","any","any",-1,"Care_Packages"], + //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) + //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. + ["any","any","any","any",-1,"CrashSites"] +]; // EPOCH CONFIG VARIABLES END // @@ -138,4 +143,4 @@ if (!isDedicated) then { 3 fadeSound 1; 3 fadeMusic 1; endLoadingScreen; -}; \ No newline at end of file +}; From 9477814c9b3daae52453b4847ed3c446db4de8a1 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:22:59 -0600 Subject: [PATCH 22/47] Enable events and add new array. Note that setting minutes to -1 will run the event one time at server start. Events with minutes set to numbers from 0-60 will run every hour. --- .../MPMissions/DayZ_Epoch_25.sauerland/init.sqf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf index 954be5e83..22f89e742 100644 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf @@ -68,8 +68,13 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 2000; // Distance around markers to find a safe spawn position spawnShoremode = 0; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = false; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. -EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]]; +EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. +EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. + ["any","any","any","any",-1,"Care_Packages"], + //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) + //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. + ["any","any","any","any",-1,"CrashSites"] +]; // EPOCH CONFIG VARIABLES END // @@ -138,4 +143,4 @@ if (!isDedicated) then { 3 fadeSound 1; 3 fadeMusic 1; endLoadingScreen; -}; \ No newline at end of file +}; From 45902e21af99952fa880334dff43eeeb2292486c Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:24:28 -0600 Subject: [PATCH 23/47] Enable events and add new array. Note that setting minutes to -1 will run the event one time at server start. Events with minutes set to numbers from 0-60 will run every hour. --- .../DayZ_Epoch_26.sauerland_winter/init.sqf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf index d5a908b99..ff60b0955 100644 --- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf @@ -68,8 +68,13 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 2000; // Distance around markers to find a safe spawn position spawnShoremode = 0; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = false; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. -EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]]; +EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. +EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. + ["any","any","any","any",-1,"Care_Packages"], + //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) + //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. + ["any","any","any","any",-1,"CrashSites"] +]; // EPOCH CONFIG VARIABLES END // @@ -139,4 +144,4 @@ if (!isDedicated) then { 3 fadeSound 1; 3 fadeMusic 1; endLoadingScreen; -}; \ No newline at end of file +}; From fde6da3f90ac49ff39c4c8177bda438e463f1250 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:26:13 -0600 Subject: [PATCH 24/47] Enable events and add new array. Note that setting minutes to -1 will run the event one time at server start. Events with minutes set to numbers from 0-60 will run every hour. --- Server Files/MPMissions/DayZ_Epoch_27.ruegen/init.sqf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_27.ruegen/init.sqf b/Server Files/MPMissions/DayZ_Epoch_27.ruegen/init.sqf index c0714cefb..d7f6f1d1b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_27.ruegen/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_27.ruegen/init.sqf @@ -68,8 +68,13 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 2000; // Distance around markers to find a safe spawn position spawnShoremode = 0; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = false; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. -EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]]; +EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. +EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. + ["any","any","any","any",-1,"Care_Packages"], + //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) + //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. + ["any","any","any","any",-1,"CrashSites"] +]; // EPOCH CONFIG VARIABLES END // @@ -138,4 +143,4 @@ if (!isDedicated) then { 3 fadeSound 1; 3 fadeMusic 1; endLoadingScreen; -}; \ No newline at end of file +}; From 5245fc2035d668bcbc74b42442f03beccee9c7f9 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:27:24 -0600 Subject: [PATCH 25/47] Enable events and add new array. Note that setting minutes to -1 will run the event one time at server start. Events with minutes set to numbers from 0-60 will run every hour. --- Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf index a549362c8..77740da1e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf @@ -68,8 +68,13 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = false; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. -EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]]; +EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. +EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. + ["any","any","any","any",-1,"Care_Packages"], + //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) + //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. + ["any","any","any","any",-1,"CrashSites"] +]; // EPOCH CONFIG VARIABLES END // @@ -138,4 +143,4 @@ if (!isDedicated) then { 3 fadeSound 1; 3 fadeMusic 1; endLoadingScreen; -}; \ No newline at end of file +}; From c1ba37915bfe921a93e20e253999dfef06754f5b Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 09:32:36 -0600 Subject: [PATCH 26/47] Remove event execVMs and event spawner call. New versions of the files are in dayz_server/modules and the event spawner has been moved to the scheduler. --- SQF/dayz_server/system/server_monitor.sqf | 7 ------- 1 file changed, 7 deletions(-) diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf index 5c8aa365e..a3e830cea 100644 --- a/SQF/dayz_server/system/server_monitor.sqf +++ b/SQF/dayz_server/system/server_monitor.sqf @@ -420,11 +420,6 @@ publicVariable "sm_done"; }; }; -//Points of interest -//[] execVM "\z\addons\dayz_server\compile\server_spawnInfectedCamps.sqf"; //Adds random spawned camps in the woods with corpses and loot tents (negatively impacts FPS) -[] execVM "\z\addons\dayz_server\compile\server_spawnCarePackages.sqf"; -[] execVM "\z\addons\dayz_server\compile\server_spawnCrashSites.sqf"; - execVM "\z\addons\dayz_server\system\lit_fireplaces.sqf"; "PVDZ_sec_atp" addPublicVariableEventHandler { @@ -508,5 +503,3 @@ if (_hiveLoaded) then { {[_x,"gear"] call server_updateObject} count _vehiclesToUpdate; }; }; - -[] spawn server_spawnEvents; From 00d36ff4f0b8db3d33fa53c1ff18465a537e80c2 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 10:57:15 -0600 Subject: [PATCH 27/47] Update using local variable from init function. Thanks to Merlijn for pointing this out. --- SQF/dayz_server/system/scheduler/sched_event.sqf | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/SQF/dayz_server/system/scheduler/sched_event.sqf b/SQF/dayz_server/system/scheduler/sched_event.sqf index 3a53b565e..27ad13af5 100644 --- a/SQF/dayz_server/system/scheduler/sched_event.sqf +++ b/SQF/dayz_server/system/scheduler/sched_event.sqf @@ -27,27 +27,28 @@ epoch_eventIsAny = { sched_event_init = { diag_log("EPOCH EVENTS INIT"); - EventSchedulerLastTime = ""; - objNull + _lastTime = ""; + _lastTime }; // This function runs ever 10 seconds because ServerCurrentTime is used in player death logging. sched_event = { - private ["_date","_key","_result","_outcome","_handle","_datestr"]; + private ["_date","_key","_result","_outcome","_handle","_datestr","_lastTime"]; // Find current time from server + _lastTime = _this; _key = "CHILD:307:"; _result = _key call server_hiveReadWrite; _outcome = _result select 0; if(_outcome == "PASS") then { _date = _result select 1; _datestr = str(_date); - if (EventSchedulerLastTime != _datestr) then { + if (_lastTime != _datestr) then { // internal timestamp ServerCurrentTime = [(_date select 3), (_date select 4)]; // Once a minute. - EventSchedulerLastTime = _datestr; + _lastTime = _datestr; //diag_log ("EVENTS: Local Time is: " + _datestr); @@ -73,5 +74,5 @@ sched_event = { } forEach EpochEvents; }; }; - objNull -}; \ No newline at end of file + _lastTime +}; From 5c52fd36e412ab0df108e5d8dca10f43d59008a7 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 11:58:15 -0600 Subject: [PATCH 28/47] Change event timer to 60 seconds. --- SQF/dayz_server/system/scheduler/sched_init.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_server/system/scheduler/sched_init.sqf b/SQF/dayz_server/system/scheduler/sched_init.sqf index 6ca23d26b..6af1baeb5 100644 --- a/SQF/dayz_server/system/scheduler/sched_init.sqf +++ b/SQF/dayz_server/system/scheduler/sched_init.sqf @@ -14,7 +14,7 @@ call compile preprocessFileLineNumbers (PATH+"sched_event.sqf"); [ 900, 0, sched_sync ], [ 120, 48, sched_safetyVehicle ], [ 360, 480, sched_fps ], - [ 10, 0, sched_event, sched_event_init ] + [ 60, 0, sched_event, sched_event_init ] ] execFSM ("z\addons\dayz_code\system\scheduler\scheduler.fsm"); //diag_log [ __FILE__, "Scheduler started"]; From f887d9c8d23691df11fb2ccfd216b2b32faf82ad Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 12:05:09 -0600 Subject: [PATCH 29/47] Change check to event array --- SQF/dayz_server/system/scheduler/sched_event.sqf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/SQF/dayz_server/system/scheduler/sched_event.sqf b/SQF/dayz_server/system/scheduler/sched_event.sqf index 27ad13af5..b15bb593c 100644 --- a/SQF/dayz_server/system/scheduler/sched_event.sqf +++ b/SQF/dayz_server/system/scheduler/sched_event.sqf @@ -51,10 +51,8 @@ sched_event = { _lastTime = _datestr; //diag_log ("EVENTS: Local Time is: " + _datestr); - + if (count EpochEvents == 0) exitWith {}; { - if (!EpochUseEvents) exitWith {}; - if (typeName _x == "ARRAY") then { // Run event at server start when minutes are set to -1 From f15d488601159f44192ebba399b59b3837402e0d Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Mon, 25 Nov 2019 12:32:12 -0600 Subject: [PATCH 30/47] Forgot to remove comment. --- SQF/dayz_server/system/scheduler/sched_event.sqf | 1 - 1 file changed, 1 deletion(-) diff --git a/SQF/dayz_server/system/scheduler/sched_event.sqf b/SQF/dayz_server/system/scheduler/sched_event.sqf index b15bb593c..4d0a9c570 100644 --- a/SQF/dayz_server/system/scheduler/sched_event.sqf +++ b/SQF/dayz_server/system/scheduler/sched_event.sqf @@ -31,7 +31,6 @@ sched_event_init = { _lastTime }; -// This function runs ever 10 seconds because ServerCurrentTime is used in player death logging. sched_event = { private ["_date","_key","_result","_outcome","_handle","_datestr","_lastTime"]; // Find current time from server From 5b24ade979daba771e1eba8c7f1a1a54b26a4f1c Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Tue, 26 Nov 2019 08:57:56 -0600 Subject: [PATCH 31/47] Removing old file --- SQF/dayz_server/modules/CrashSites_Old.sqf | 70 ---------------------- 1 file changed, 70 deletions(-) delete mode 100644 SQF/dayz_server/modules/CrashSites_Old.sqf diff --git a/SQF/dayz_server/modules/CrashSites_Old.sqf b/SQF/dayz_server/modules/CrashSites_Old.sqf deleted file mode 100644 index 19cb1651a..000000000 --- a/SQF/dayz_server/modules/CrashSites_Old.sqf +++ /dev/null @@ -1,70 +0,0 @@ -/* - This file was imported from DayZ Epoch 1.0.5.1 and updated for use in v1.06+ by JasonTM. - This version uses the old "SpawnableWreck" classes. -*/ - -#include "\z\addons\dayz_code\loot\Loot.hpp" - -#define SEARCH_BLACKLIST [[[2092,14167],[10558,12505]]] // Map area black list. Default is for Chernarus. -#define LOWER_GRASS true // Lowers the grass around the loot. -#define MIN_LOOT_RADIUS 4 // Minimum distance for loot to spawn from the crash site in meters. -#define MAX_LOOT_RADIUS 10 // Maximum distance for loot to spawn from the crash site in meters. -#define SPAWN_FIRE false // Visual effect of burning wreck. (may negatively affect fps) -#define FADE_FIRE false // Fades the burning effect over time. -#define NUMBER 3 //Number of crash sites to spawn at the beginning of the mission. -#define LOOT_MIN 10 // Minimum number of loot items to spawn per site. -#define LOOT_MAX 15 // Maximum number of loot items to spawn per site. - -private ["_spawnCrashSite","_class","_crashName","_position","_crash","_type","_lootGroup","_lootRadius","_lootPos","_lootVeh","_lootNum"]; - -_spawnCrashSite = { - - _class = ["UH60_NAVY_Wreck_DZ","UH60_ARMY_Wreck_DZ","UH60_NAVY_Wreck_burned_DZ","UH60_ARMY_Wreck_burned_DZ","Mass_grave_DZ"] call BIS_fnc_selectRandom; - _crashName = getText (configFile >> "CfgVehicles" >> _class >> "displayName"); - - _position = [getMarkerPos "crashsites", 0, (getMarkerSize "crashsites") select 0, 20, 0, 0.3, 0, SEARCH_BLACKLIST] call BIS_fnc_findSafePos; - - _crash = _class createVehicle [0,0,0]; - _crash setDir random 360; - _position set [2, 0]; - _crash setPos _position; - _crash setVariable ["ObjectID","1",true]; - _crash enableSimulation false; - - if (SPAWN_FIRE && {!(_class == "Mass_grave_DZ")}) then { - PVDZ_obj_Fire = [_crash, 4, time, false, FADE_FIRE]; - publicVariable "PVDZ_obj_Fire"; - _crash setvariable ["fadeFire",FADE_FIRE,true]; - }; - - // Select random crash site loot - _type = Loot_SelectSingle(Loot_GetGroup("CrashSiteType")); - if(_class == "Mass_grave_DZ") then { - _lootGroup = Loot_GetGroup("MassGrave"); - } else { - _lootGroup = Loot_GetGroup(_type select 2); - }; - - // Calculate loot amount - _lootNum = round (LOOT_MIN + random (LOOT_MAX - LOOT_MIN)); - - diag_log format ["CRASHSPAWNER: Spawning crash site (%1) at %2 with %3 items.", _crashName, _position, _lootNum]; - - { - _lootRadius = (random MAX_LOOT_RADIUS) + MIN_LOOT_RADIUS; - _lootPos = [_position, _lootRadius, random 360] call BIS_fnc_relPos; - _lootPos set [2, 0]; - _lootVeh = Loot_Spawn(_x, _lootPos); - _lootVeh setVariable ["permaLoot", true]; - //_lootArray set[count _lootArray, _lootVeh]; - if (LOWER_GRASS) then { - createVehicle ["ClutterCutter_small_2_EP1", _lootPos, [], 0, "CAN_COLLIDE"]; - }; - } forEach Loot_Select(_lootGroup,_lootNum); -}; - -// Spawn crash sites -for "_i" from 1 to (NUMBER) do -{ - call _spawnCrashSite; -}; \ No newline at end of file From f4d8e5934f558ecdef96056dd4d33139ccfbfef7 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Tue, 26 Nov 2019 09:00:10 -0600 Subject: [PATCH 32/47] Remove unnecessary variable --- Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf index 6e51c75ba..a3c759d61 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf @@ -68,11 +68,9 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1000; // Distance around markers to find a safe spawn position spawnShoremode = 0; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. ["any","any","any","any",-1,"Care_Packages"], //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) - //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. ["any","any","any","any",-1,"CrashSites"] ]; // EPOCH CONFIG VARIABLES END // From ae1260836b4e2cebe5dcd5195322dcc11c06a221 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Tue, 26 Nov 2019 09:00:53 -0600 Subject: [PATCH 33/47] Remove unnecessary variable --- Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf index a782f00a6..f8ca33ddb 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf @@ -68,11 +68,9 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. ["any","any","any","any",-1,"Care_Packages"], //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) - //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. ["any","any","any","any",-1,"CrashSites"] ]; // EPOCH CONFIG VARIABLES END // From b32f32339c8e6f50ce039a1493866ede8a2da4e0 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Tue, 26 Nov 2019 09:01:20 -0600 Subject: [PATCH 34/47] Remove unnecessary variable --- Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf index bcb35b90c..b5034dc02 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf @@ -68,11 +68,9 @@ MaxDynamicDebris = 400; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. ["any","any","any","any",-1,"Care_Packages"], //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) - //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. ["any","any","any","any",-1,"CrashSites"] ]; // EPOCH CONFIG VARIABLES END // From 73ce162428780d79719c4ffa844afb56a57c59cc Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Tue, 26 Nov 2019 09:01:52 -0600 Subject: [PATCH 35/47] Remove unnecessary variable --- Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf index ac9e6d969..2e5d7f1c6 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf @@ -68,11 +68,9 @@ MaxDynamicDebris = 700; // Max number of random road blocks to spawn around the MaxVehicleLimit = 400; // Max number of random vehicles to spawn around the map spawnArea = 2500; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. ["any","any","any","any",-1,"Care_Packages"], //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) - //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. ["any","any","any","any",-1,"CrashSites"] ]; // EPOCH CONFIG VARIABLES END // From 585f7879f327028b4461b42e614f71186bf97655 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Tue, 26 Nov 2019 09:02:17 -0600 Subject: [PATCH 36/47] Remove unnecessary variable --- Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf index 4d216e92c..ed20484ab 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf @@ -68,11 +68,9 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. ["any","any","any","any",-1,"Care_Packages"], //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) - //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. ["any","any","any","any",-1,"CrashSites"] ]; // EPOCH CONFIG VARIABLES END // From 13bfe36538002860a4896003091c8306d91be3bb Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Tue, 26 Nov 2019 09:02:40 -0600 Subject: [PATCH 37/47] Remove unnecessary variable --- Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf index a5f6490b8..157184e34 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf @@ -68,11 +68,9 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. ["any","any","any","any",-1,"Care_Packages"], //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) - //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. ["any","any","any","any",-1,"CrashSites"] ]; // EPOCH CONFIG VARIABLES END // From b6b25c63a5245b5193d967f841cf1af4372535e1 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Tue, 26 Nov 2019 09:03:11 -0600 Subject: [PATCH 38/47] Remove unnecessary variable --- Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf index 7cfca6bbe..a73fdff09 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf @@ -68,11 +68,9 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. ["any","any","any","any",-1,"Care_Packages"], //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) - //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. ["any","any","any","any",-1,"CrashSites"] ]; // EPOCH CONFIG VARIABLES END // From 619bfec3b888c3fbcaa5747e1eb368c113824052 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Tue, 26 Nov 2019 09:03:35 -0600 Subject: [PATCH 39/47] Remove unnecessary variable --- Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf index a424e441f..fc36df034 100644 --- a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf @@ -68,11 +68,9 @@ MaxDynamicDebris = 250; // Max number of random road blocks to spawn around the MaxVehicleLimit = 200; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. ["any","any","any","any",-1,"Care_Packages"], //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) - //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. ["any","any","any","any",-1,"CrashSites"] ]; // EPOCH CONFIG VARIABLES END // From e4c64613bdd264542e9ae6346be8fddb1768c817 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Tue, 26 Nov 2019 09:04:01 -0600 Subject: [PATCH 40/47] Remove unnecessary variable --- Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf index 26cc2232b..a1fa16663 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf @@ -68,11 +68,9 @@ MaxDynamicDebris = 250; // Max number of random road blocks to spawn around the MaxVehicleLimit = 200; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. ["any","any","any","any",-1,"Care_Packages"], //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) - //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. ["any","any","any","any",-1,"CrashSites"] ]; // EPOCH CONFIG VARIABLES END // From 36603a90fcdba0ada7b0e42865e2944c79a58ef3 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Tue, 26 Nov 2019 09:04:28 -0600 Subject: [PATCH 41/47] Remove unnecessary variable --- Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf | 3 --- 1 file changed, 3 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf index 785ced3a1..7295a2dd3 100644 --- a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf @@ -67,12 +67,9 @@ DZE_selfTransfuse_Values = [12000,15,120]; // [blood amount given, infection cha MaxDynamicDebris = 350; // Max number of random road blocks to spawn around the map MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position -spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. ["any","any","any","any",-1,"Care_Packages"], //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) - //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. ["any","any","any","any",-1,"CrashSites"] ]; // EPOCH CONFIG VARIABLES END // From bd8a739df7812d8c17b803e6180e65cad9e13e6e Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Tue, 26 Nov 2019 09:04:53 -0600 Subject: [PATCH 42/47] Remove unnecessary variable --- Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf index faa36a52e..63f0c1460 100644 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf @@ -68,11 +68,9 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. ["any","any","any","any",-1,"Care_Packages"], //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) - //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. ["any","any","any","any",-1,"CrashSites"] ]; // EPOCH CONFIG VARIABLES END // From 6180f02d9eb6b44159b7f98cada6e8688e69553f Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Tue, 26 Nov 2019 09:05:16 -0600 Subject: [PATCH 43/47] Remove unnecessary variable --- Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf index eb1ea38d1..300d3a2f0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf @@ -68,11 +68,9 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. ["any","any","any","any",-1,"Care_Packages"], //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) - //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. ["any","any","any","any",-1,"CrashSites"] ]; // EPOCH CONFIG VARIABLES END // From 5ac246a73b887e358a18c166870bdddf07945a6c Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Tue, 26 Nov 2019 09:05:46 -0600 Subject: [PATCH 44/47] Remove unnecessary variable --- Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf index 22f89e742..117718ecd 100644 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf @@ -68,11 +68,9 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 2000; // Distance around markers to find a safe spawn position spawnShoremode = 0; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. ["any","any","any","any",-1,"Care_Packages"], //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) - //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. ["any","any","any","any",-1,"CrashSites"] ]; // EPOCH CONFIG VARIABLES END // From c6a69b8320ff7b8c37d703942553488f91cad1a1 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Tue, 26 Nov 2019 09:06:14 -0600 Subject: [PATCH 45/47] Remove unnecessary variable --- Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf index ff60b0955..d43b59c8a 100644 --- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf @@ -68,11 +68,9 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 2000; // Distance around markers to find a safe spawn position spawnShoremode = 0; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. ["any","any","any","any",-1,"Care_Packages"], //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) - //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. ["any","any","any","any",-1,"CrashSites"] ]; // EPOCH CONFIG VARIABLES END // From 37a7b8a55630b71314d50e89c18fc48e93522561 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Tue, 26 Nov 2019 09:06:44 -0600 Subject: [PATCH 46/47] Remove unnecessary variable --- Server Files/MPMissions/DayZ_Epoch_27.ruegen/init.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_27.ruegen/init.sqf b/Server Files/MPMissions/DayZ_Epoch_27.ruegen/init.sqf index d7f6f1d1b..c66389b8d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_27.ruegen/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_27.ruegen/init.sqf @@ -68,11 +68,9 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 2000; // Distance around markers to find a safe spawn position spawnShoremode = 0; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. ["any","any","any","any",-1,"Care_Packages"], //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) - //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. ["any","any","any","any",-1,"CrashSites"] ]; // EPOCH CONFIG VARIABLES END // From c0f798faba78df20fd75704f93d216dc9ba513b2 Mon Sep 17 00:00:00 2001 From: worldwidesorrow Date: Tue, 26 Nov 2019 09:07:10 -0600 Subject: [PATCH 47/47] Remove unnecessary variable --- Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf index 77740da1e..a35a791fe 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf @@ -68,11 +68,9 @@ MaxDynamicDebris = 500; // Max number of random road blocks to spawn around the MaxVehicleLimit = 300; // Max number of random vehicles to spawn around the map spawnArea = 1400; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -EpochUseEvents = true; //Enable event scheduler. Define custom scripts in dayz_server\modules to run on a schedule. EpochEvents = [ //[year,month,day of month, minutes,name of file - .sqf] If minutes is set to -1, the event will run once immediately after server start. ["any","any","any","any",-1,"Care_Packages"], //["any","any","any","any",-1,"Infected_Camps"], // (negatively impacts FPS) - //["any","any","any","any",-1,"CrashSites_Old"], // Old 1.0.5.1 Epoch version updated to work with Epoch 1.0.6+, includes mass graves. ["any","any","any","any",-1,"CrashSites"] ]; // EPOCH CONFIG VARIABLES END //