diff --git a/SQF/dayz_code/actions/modular_build.sqf b/SQF/dayz_code/actions/modular_build.sqf index e01e01b16..4ae2134d8 100644 --- a/SQF/dayz_code/actions/modular_build.sqf +++ b/SQF/dayz_code/actions/modular_build.sqf @@ -576,7 +576,7 @@ if (_hasrequireditem) then { _tmpbuilt setVariable ["CharacterID",_combination,true]; //set combination as a character ID //call publish precompiled function with given args and send public variable to server to save item to database - PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],_classname]; + PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],[]]; publicVariableServer "PVDZ_obj_Publish"; cutText [format[(localize "str_epoch_player_140"),_combinationDisplay,_text], "PLAIN DOWN", 5]; //display new combination @@ -589,7 +589,7 @@ if (_hasrequireditem) then { if(_tmpbuilt isKindOf "Land_Fire_DZ") then { //if campfire, then spawn, but do not publish to database _tmpbuilt spawn player_fireMonitor; } else { - PVDZ_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location],_classname]; + PVDZ_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location],[]]; publicVariableServer "PVDZ_obj_Publish"; }; }; diff --git a/SQF/dayz_code/actions/player_build.sqf b/SQF/dayz_code/actions/player_build.sqf index 7544da3dd..c291ddaa4 100644 --- a/SQF/dayz_code/actions/player_build.sqf +++ b/SQF/dayz_code/actions/player_build.sqf @@ -524,7 +524,7 @@ if (_hasrequireditem) then { _tmpbuilt setVariable ["CharacterID",_combination,true]; - PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],_classname]; + PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],[]]; publicVariableServer "PVDZ_obj_Publish"; cutText [format[(localize "str_epoch_player_140"),_combinationDisplay,_text], "PLAIN DOWN", 5]; @@ -537,7 +537,7 @@ if (_hasrequireditem) then { if(_tmpbuilt isKindOf "Land_Fire_DZ") then { _tmpbuilt spawn player_fireMonitor; } else { - PVDZ_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location],_classname]; + PVDZ_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location],[]]; publicVariableServer "PVDZ_obj_Publish"; }; }; diff --git a/SQF/dayz_code/actions/trade_any_bicycle.sqf b/SQF/dayz_code/actions/trade_any_bicycle.sqf index bc91e756a..ee5c71413 100644 --- a/SQF/dayz_code/actions/trade_any_bicycle.sqf +++ b/SQF/dayz_code/actions/trade_any_bicycle.sqf @@ -132,7 +132,6 @@ if (_finished) then { _location = (getPosATL _veh); - //["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,false,_keySelected]] call callRpcProcedure; PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,true,dayz_characterID,_activatingPlayer]; publicVariableServer "PVDZE_veh_Publish2"; diff --git a/SQF/dayz_code/actions/trade_any_bicycle_old.sqf b/SQF/dayz_code/actions/trade_any_bicycle_old.sqf index 42711d463..7812f02cb 100644 --- a/SQF/dayz_code/actions/trade_any_bicycle_old.sqf +++ b/SQF/dayz_code/actions/trade_any_bicycle_old.sqf @@ -109,7 +109,6 @@ if (_qty >= _qty_in) then { _location = (getPosATL _veh); - //["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,false,_keySelected]] call callRpcProcedure; PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,true,dayz_characterID,_activatingPlayer]; publicVariableServer "PVDZE_veh_Publish2"; diff --git a/SQF/dayz_code/actions/trade_any_boat.sqf b/SQF/dayz_code/actions/trade_any_boat.sqf index 63be580fc..0f499a874 100644 --- a/SQF/dayz_code/actions/trade_any_boat.sqf +++ b/SQF/dayz_code/actions/trade_any_boat.sqf @@ -154,7 +154,6 @@ if (_finished) then { _location = (getPosATL _veh); - //["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,false,_keySelected]] call callRpcProcedure; PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,_keySelected,_activatingPlayer]; publicVariableServer "PVDZE_veh_Publish2"; diff --git a/SQF/dayz_code/actions/trade_any_boat_old.sqf b/SQF/dayz_code/actions/trade_any_boat_old.sqf index 8ac421bdc..544772938 100644 --- a/SQF/dayz_code/actions/trade_any_boat_old.sqf +++ b/SQF/dayz_code/actions/trade_any_boat_old.sqf @@ -130,7 +130,6 @@ if (_qty >= _qty_in) then { _location = (getPosATL _veh); - //["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,false,_keySelected]] call callRpcProcedure; PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,_keySelected,_activatingPlayer]; publicVariableServer "PVDZE_veh_Publish2"; diff --git a/SQF/dayz_code/actions/trade_any_vehicle.sqf b/SQF/dayz_code/actions/trade_any_vehicle.sqf index 50cb447a9..ec6e66bd4 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle.sqf @@ -96,7 +96,6 @@ if (_finished) then { if (_canAfford) then { - //["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure; // if (isNil "_obj") then { _obj = "Unknown Vehicle" }; if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; if(_bos == 1) then { @@ -154,7 +153,6 @@ if (_finished) then { _location = (getPosATL _veh); - //["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,false,_keySelected]] call callRpcProcedure; PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,_keySelected,_activatingPlayer]; publicVariableServer "PVDZE_veh_Publish2"; diff --git a/SQF/dayz_code/actions/trade_any_vehicle_free.sqf b/SQF/dayz_code/actions/trade_any_vehicle_free.sqf index dd4037a2c..2965995a6 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle_free.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle_free.sqf @@ -96,7 +96,6 @@ if (_finished) then { if (_canAfford) then { - //["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure; // if (isNil "_obj") then { _obj = "Unknown Vehicle" }; if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; if(_bos == 1) then { @@ -136,7 +135,6 @@ if (_finished) then { _location = (getPosATL _veh); - //["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,true,0]] call callRpcProcedure; PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,true,0,_activatingPlayer]; publicVariableServer "PVDZE_veh_Publish2"; }; diff --git a/SQF/dayz_code/actions/trade_any_vehicle_old.sqf b/SQF/dayz_code/actions/trade_any_vehicle_old.sqf index 3ffa42f2e..20e3b9388 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle_old.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle_old.sqf @@ -90,7 +90,6 @@ if (_qty >= _qty_in) then { if (_qty >= _qty_in) then { - //["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure; if (isNil "_obj") then { _obj = "Unknown Vehicle" }; if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_obj,inTraderCity]; @@ -138,7 +137,6 @@ if (_qty >= _qty_in) then { _location = (getPosATL _veh); - //["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,false,_keySelected]] call callRpcProcedure; PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,_keySelected,_activatingPlayer]; publicVariableServer "PVDZE_veh_Publish2"; diff --git a/SQF/dayz_code/actions/trade_backpacks.sqf b/SQF/dayz_code/actions/trade_backpacks.sqf index ab03331c7..a7eadb936 100644 --- a/SQF/dayz_code/actions/trade_backpacks.sqf +++ b/SQF/dayz_code/actions/trade_backpacks.sqf @@ -93,7 +93,6 @@ if (_finished) then { if (_canAfford) then { - //["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure; if (isNil "_bag") then { _bag = "Unknown Backpack" }; if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; if(_bos == 1) then { diff --git a/SQF/dayz_code/actions/trade_backpacks_old.sqf b/SQF/dayz_code/actions/trade_backpacks_old.sqf index 963b446f7..83d6e7be6 100644 --- a/SQF/dayz_code/actions/trade_backpacks_old.sqf +++ b/SQF/dayz_code/actions/trade_backpacks_old.sqf @@ -84,7 +84,6 @@ if (_qty >= _qty_in) then { if (_qty >= _qty_in) then { - //["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure; if (isNil "_bag") then { _bag = "Unknown Backpack" }; if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_bag,inTraderCity]; diff --git a/SQF/dayz_code/actions/trade_weapons.sqf b/SQF/dayz_code/actions/trade_weapons.sqf index 1bb10956c..c24238d7d 100644 --- a/SQF/dayz_code/actions/trade_weapons.sqf +++ b/SQF/dayz_code/actions/trade_weapons.sqf @@ -140,7 +140,6 @@ if (_finished) then { if (_canAfford) then { - //["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure; if (isNil "_part_out") then { _part_out = "Unknown Weapon/Magazine" }; if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; if(_bos == 1) then { diff --git a/SQF/dayz_code/actions/trade_weapons_old.sqf b/SQF/dayz_code/actions/trade_weapons_old.sqf index 11a116a61..6841b6418 100644 --- a/SQF/dayz_code/actions/trade_weapons_old.sqf +++ b/SQF/dayz_code/actions/trade_weapons_old.sqf @@ -80,7 +80,6 @@ if (_qty >= _qty_in) then { if (_qty >= _qty_in) then { - //["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure; if (isNil "_part_out") then { _part_out = "Unknown Weapon/Magazine" }; if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_out,inTraderCity]; diff --git a/SQF/dayz_code/actions/vault_pitch.sqf b/SQF/dayz_code/actions/vault_pitch.sqf index c66b89467..1b7c3803d 100644 --- a/SQF/dayz_code/actions/vault_pitch.sqf +++ b/SQF/dayz_code/actions/vault_pitch.sqf @@ -159,8 +159,7 @@ if(!_cancel) then { _tent setVariable ["CharacterID",_combination,true]; _tent setVariable ["OEMPos",_location,true]; - //["PVDZ_obj_Publish",[_combination,_tent,[_dir,_location],"VaultStorageLocked"]] call callRpcProcedure; - PVDZ_obj_Publish = [_combination,_tent,[_dir,_location],"VaultStorageLocked"]; + PVDZ_obj_Publish = [_combination,_tent,[_dir,_location],[]]; publicVariableServer "PVDZ_obj_Publish"; cutText [format[(localize "str_epoch_player_179"),_combination], "PLAIN DOWN", 5]; diff --git a/SQF/dayz_code/init/publicEH.sqf b/SQF/dayz_code/init/publicEH.sqf index bf924f2ad..ace8bfc38 100644 --- a/SQF/dayz_code/init/publicEH.sqf +++ b/SQF/dayz_code/init/publicEH.sqf @@ -73,7 +73,7 @@ if (isServer) then { "PVDZ_plr_Death" addPublicVariableEventHandler {_id = (_this select 1) spawn server_playerDied}; "PVDZ_plr_Save" addPublicVariableEventHandler {_id = (_this select 1) call server_playerSync;}; - "PVDZ_obj_Publish" addPublicVariableEventHandler {(_this select 1) call server_publishObj}; + "PVDZ_obj_Publish" addPublicVariableEventHandler {(_this select 1) call server_publishObj}; //Used by built items (Epoch and Vanilla) "PVDZ_veh_Save" addPublicVariableEventHandler {(_this select 1) call server_updateObject}; "PVDZ_plr_Login1" addPublicVariableEventHandler {_id = (_this select 1) call server_playerLogin}; "PVDZ_plr_Login2" addPublicVariableEventHandler {(_this select 1) call server_playerSetup}; @@ -86,10 +86,9 @@ if (isServer) then { // EPOCH ADDITIONS "PVDZE_maintainArea" addPublicVariableEventHandler {(_this select 1) spawn server_maintainArea}; - "PVDZE_obj_Swap" addPublicVariableEventHandler {(_this select 1) spawn server_swapObject}; - "PVDZE_veh_Publish" addPublicVariableEventHandler {(_this select 1) spawn server_publishVeh}; - "PVDZE_veh_Publish2" addPublicVariableEventHandler {(_this select 1) spawn server_publishVeh2}; - "PVDZE_veh_Upgrade" addPublicVariableEventHandler {(_this select 1) spawn server_publishVeh3}; + "PVDZE_obj_Swap" addPublicVariableEventHandler {(_this select 1) spawn server_swapObject}; //Used to downgrade and upgrade Epoch buildables + "PVDZE_veh_Publish2" addPublicVariableEventHandler {(_this select 1) spawn server_publishVeh2}; //Used to purchase vehicles at traders + "PVDZE_veh_Upgrade" addPublicVariableEventHandler {(_this select 1) spawn server_publishVeh3}; //Used for car upgrades "PVDZE_obj_Trade" addPublicVariableEventHandler {(_this select 1) spawn server_tradeObj}; "PVDZE_plr_TradeMenu" addPublicVariableEventHandler {(_this select 1) spawn server_traders}; "PVDZE_plr_DeathB" addPublicVariableEventHandler {(_this select 1) spawn server_deaths}; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 735e33b10..513a140be 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -508,7 +508,6 @@ PlayerDeaths = []; PVDZE_obj_Trade = []; // For all traders increment qty PVDZE_plr_DeathB = []; PVDZE_plr_TradeMenu = []; // For all traders -PVDZE_veh_Publish = []; // For vehicle traders snapGizmos = []; snapGizmosNearby = []; s_player_combi = []; @@ -567,7 +566,7 @@ if (isServer) then { currentObjectUIDs = []; keyStartNumber = 100000000000; DZE_safeVehicle = ["ParachuteWest","ParachuteC"]; - serverVehicleCounter = []; + if(isNil "EpochUseEvents") then {EpochUseEvents = false;}; if(isNil "EpochEvents") then {EpochEvents = [];}; if(isNil "DZE_vehicleAmmo") then {DZE_vehicleAmmo = 0;}; if(isNil "dayz_MapArea") then {dayz_MapArea = 10000;}; diff --git a/SQF/dayz_server/compile/server_playerDeaths.sqf b/SQF/dayz_server/compile/server_playerDeaths.sqf index 8cc9e075b..1a8ee9d3a 100644 --- a/SQF/dayz_server/compile/server_playerDeaths.sqf +++ b/SQF/dayz_server/compile/server_playerDeaths.sqf @@ -1,9 +1,11 @@ +#include "\z\addons\dayz_server\compile\server_toggle_debug.hpp" + private["_character","_clientID"]; _character = _this select 0; _clientID = owner _character; -#ifdef DZE_SERVER_DEBUG +#ifdef SERVER_DEBUG diag_log ("HIVE: Player Death list Request by ClientID: "+ str(_clientID)); diag_log(PlayerDeaths); #endif diff --git a/SQF/dayz_server/compile/server_publishObject.sqf b/SQF/dayz_server/compile/server_publishObject.sqf index fae465d99..77ff11ccb 100644 --- a/SQF/dayz_server/compile/server_publishObject.sqf +++ b/SQF/dayz_server/compile/server_publishObject.sqf @@ -1,35 +1,43 @@ -private ["_class","_uid","_charID","_object","_worldspace","_key","_allowed"]; -//[dayz_characterID,_tent,[_dir,_location],"TentStorage"] -_charID = _this select 0; +#include "\z\addons\dayz_server\compile\server_toggle_debug.hpp" + +private ["_type ","_objectUID ","_characterID ","_object","_worldspace","_key", "_ownerArray", "_inventory"]; + +_characterID = _this select 0; _object = _this select 1; _worldspace = _this select 2; -_class = _this select 3; +_inventory = _this select 3; +_type = typeOf _object; -_allowed = [_object, "Server"] call check_publishobject; -if (!_allowed) exitWith { deleteVehicle _object; }; +if ([_object, "Server"] call check_publishobject) then { + //diag_log ("PUBLISH: Attempt " + str(_object)); -//diag_log ("PUBLISH: Attempt " + str(_object)); + _objectUID = _worldspace call dayz_objectUID2; + _object setVariable [ "ObjectUID", _objectUID, true ]; + // we can't use getVariable because only the object creation is known from the server (position,direction,variables are not sync'ed yet) + //_characterID = _object getVariable [ "characterID", 0 ]; + //_ownerArray = _object getVariable [ "ownerArray", [] ]; + _key = format["CHILD:308:%1:%2:%3:%4:%5:%6:%7:%8:%9:", dayZ_instance, _type, 0, _characterID, _worldspace, _inventory, [], 0,_objectUID ]; -//get UID -_uid = _worldspace call dayz_objectUID2; + _key call server_hiveWrite; -//Send request -_key = format["CHILD:308:%1:%2:%3:%4:%5:%6:%7:%8:%9:",dayZ_instance, _class, 0 , _charID, _worldspace, [], [], 0,_uid]; -//diag_log ("HIVE: WRITE: "+ str(_key)); -_key call server_hiveWrite; + if !(_object isKindOf "TrapItems") then { + if (DZE_GodModeBase) then { + _object addEventHandler ["HandleDamage", {false}]; + } else { + _object addMPEventHandler ["MPKilled",{_this call vehicle_handleServerKilled;}]; + }; + }; + // Test disabling simulation server side on buildables only. + _object enableSimulation false; -_object setVariable ["lastUpdate",time]; -_object setVariable ["ObjectUID", _uid,true]; -// _object setVariable ["CharacterID",_charID,true]; + dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object]; -if (DZE_GodModeBase) then { - _object addEventHandler ["HandleDamage", {false}]; -}else{ - _object addMPEventHandler ["MPKilled",{_this call vehicle_handleServerKilled;}]; -}; -// Test disabling simulation server side on buildables only. -_object enableSimulation false; - -dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object]; - -//diag_log ("PUBLISH: Created " + (_class) + " with ID " + _uid); + #ifdef OBJECT_DEBUG + diag_log ["PUBLISH: Created ",_type,"ObjectUID", _objectUID,"characterID", _characterID, " with variables/inventory:", _inventory ]; + #endif +} +else { + #ifdef OBJECT_DEBUG + diag_log ("PUBLISH: *NOT* created " + (_type ) + " (not allowed)"); + #endif +}; \ No newline at end of file diff --git a/SQF/dayz_server/compile/server_weather.sqf b/SQF/dayz_server/compile/server_weather.sqf deleted file mode 100644 index 024f8faf2..000000000 --- a/SQF/dayz_server/compile/server_weather.sqf +++ /dev/null @@ -1,59 +0,0 @@ -private ["_weather","_windX","_windY","_weatherOptions","_numWeatherOptions","_forcastTime"]; - -//[overCast,Fog,wind,rain] -//wind is split randomly in to east-west/north-south direction -_weatherOptions = -[ - [0, 0, 4, 0], - [0.1, 0.1, 5, 0.1], - [0.3, 0.2, 6, 0.2], - [0.4, 0.3, 7, 0.3], - [0.5, 0.4, 8, 0.4], - [0.5, 0.5, 9, 0.5], - [0.6, 0.4, 10, 0.6], - [0.7, 0.3, 11, 0.7], - [0.8, 0.2, 12, 0.8], - [0.9, 0.1, 13, 0.9], - [1, 1, 15, 1] -]; -_numWeatherOptions = count _weatherOptions; - -// get inital weather forcast for the next 5 minutes -_forcastTime = 300; -if (isNil "WeatherForcast" && isNil "WeatherForcastTime") then { - WeatherForcast = floor(random(_numWeatherOptions)); - WeatherForcastTime = diag_tickTime; -} else { - // after 60 minutes get a new forcast - if (WeatherForcastTime >= _forcastTime) then { - WeatherForcast = floor(random(_numWeatherOptions)); - WeatherForcastTime = diag_tickTime; - }; -}; - -if (isNil "CurrentWeatherOption") then { - // set inital weather to current forcast - CurrentWeatherOption = WeatherForcast; -} else { - if(CurrentWeatherOption < WeatherForcast) then { - // start transition up if forcast is higher in the array than current weather - CurrentWeatherOption = ((CurrentWeatherOption + 1) min _numWeatherOptions); - } else { - // start transition down if forcast is lower in the array than current weather - if (CurrentWeatherOption != WeatherForcast && WeatherForcastTime >= _forcastTime) then { - CurrentWeatherOption = ((CurrentWeatherOption - 1) max 0) ; - }; - }; -}; - -// current weather -_weather = _weatherOptions select CurrentWeatherOption; - -_windX = floor(random(_weather select 2)); -_windY = (_weather select 2) - _windX; -_weather set [2,[_windX,_windY]]; - -diag_log format["Weather %1", _weather]; - -PVDZE_plr_SetWeather = _weather; -publicVariable "PVDZE_plr_SetWeather"; \ No newline at end of file diff --git a/SQF/dayz_server/compile/spawn_vehicles.sqf b/SQF/dayz_server/compile/spawn_vehicles.sqf index 5c88084b7..739ef0868 100644 --- a/SQF/dayz_server/compile/spawn_vehicles.sqf +++ b/SQF/dayz_server/compile/spawn_vehicles.sqf @@ -1,5 +1,5 @@ -private ["_random","_lastIndex","_weights","_index","_vehicle","_velimit","_qty","_isAir","_isShip","_position","_dir","_istoomany","_veh","_objPosition","_iClass","_itemTypes","_cntWeights","_itemType","_num","_allCfgLoots"]; -// do not make _roadList or _buildingList private in this function +private ["_random","_lastIndex","_index","_vehicle","_velimit","_qty","_isAir","_isShip","_position","_dir","_istoomany","_veh","_objPosition","_iClass","_num","_allCfgLoots"]; +// do not make _roadList, _buildingList or _serverVehicleCounter private in this function #include "\z\addons\dayz_code\util\Math.hpp" #include "\z\addons\dayz_code\util\Vector.hpp" #include "\z\addons\dayz_code\loot\Loot.hpp" @@ -11,7 +11,7 @@ while {count AllowedVehiclesList > 0} do { _vehicle = _random select 0; _velimit = _random select 1; - _qty = {_x == _vehicle} count serverVehicleCounter; + _qty = {_x == _vehicle} count _serverVehicleCounter; if (_qty <= _velimit) exitWith {}; // If under limit allow to proceed // vehicle limit reached, remove vehicle from list @@ -22,10 +22,10 @@ while {count AllowedVehiclesList > 0} do { }; if (count AllowedVehiclesList == 0) then { - diag_log "DEBUG: unable to find suitable vehicle to spawn"; + diag_log "DEBUG: unable to find suitable random vehicle to spawn"; } else { // add vehicle to counter for next pass - serverVehicleCounter set [count serverVehicleCounter,_vehicle]; + _serverVehicleCounter set [count _serverVehicleCounter,_vehicle]; // Find Vehicle Type to better control spawns _isAir = _vehicle isKindOf "Air"; @@ -45,14 +45,12 @@ if (count AllowedVehiclesList == 0) then { // Spawn around buildings and 50% near roads if ((random 1) > 0.5) then { _position = _roadList call BIS_fnc_selectRandom; - _position = _position modelToWorld [0,0,0]; - + _position = _position modelToWorld [0,0,0]; _position = [_position,0,10,10,0,2000,0] call BIS_fnc_findSafePos; //diag_log("DEBUG: spawning near road " + str(_position)); } else { _position = _buildingList call BIS_fnc_selectRandom; _position = _position modelToWorld [0,0,0]; - _position = [_position,0,40,5,0,2000,0] call BIS_fnc_findSafePos; //diag_log("DEBUG: spawning around buildings " + str(_position)); }; diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf index 687f022d2..66ce6fa07 100644 --- a/SQF/dayz_server/init/server_functions.sqf +++ b/SQF/dayz_server/init/server_functions.sqf @@ -30,10 +30,10 @@ spawnComposition = compile preprocessFileLineNumbers "ca\modules\dyno\data\scrip server_sendToClient = compile preprocessFileLineNumbers "\z\addons\dayz_server\eventHandlers\server_sendToClient.sqf"; // EPOCH ADDITIONS -server_swapObject = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_swapObject.sqf"; -server_publishVeh = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle.sqf"; -server_publishVeh2 = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle2.sqf"; -server_publishVeh3 = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle3.sqf"; +server_swapObject = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_swapObject.sqf"; //Used to downgrade and upgrade Epoch buildables +server_publishVeh = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle.sqf"; //Used to spawn random vehicles by server +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_traders = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_traders.sqf"; server_spawnEvents = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_spawnEvent.sqf"; diff --git a/SQF/dayz_server/modules/crash_spawner.sqf b/SQF/dayz_server/modules/crash_spawner.sqf index 76298b76b..ed056f98d 100644 --- a/SQF/dayz_server/modules/crash_spawner.sqf +++ b/SQF/dayz_server/modules/crash_spawner.sqf @@ -1,104 +1,2 @@ -/* Needs updating -private ["_guaranteedLoot","_randomizedLoot","_spawnChance","_spawnMarker","_spawnRadius","_spawnFire","_fadeFire","_crashModel","_lootTable","_crashName","_spawnRoll","_position","_crash","_config","_hasAdjustment","_newHeight","_adjustedPos","_num","_itemTypes","_index","_weights","_cntWeights","_nearby","_itemType","_needsrelocated","_istoomany","_pos","_lootPos"]; - -_guaranteedLoot = 3; -_randomizedLoot = 4; -_spawnChance = 0.50; -_spawnMarker = 'center'; -// _spawnRadius = 5000; -_spawnRadius = HeliCrashArea; -_spawnFire = true; -_fadeFire = false; -_minLootRadius = 4; -_maxLootRadius = 4; -_spawnRoll = random 1; -if (_spawnRoll <= _spawnChance) then { - -_crashModel = ["UH60Wreck_DZ","CrashSite_US","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; - -if(_crashModel == "Mass_grave_DZ") then { -_lootTable = "MassGrave"; -} else { -_lootTable = "HeliCrash"; -}; -_maxLootRadius = _maxLootRadius - _minLootRadius; -_crashName = getText (configFile >> "CfgVehicles" >> _crashModel >> "displayName"); - -// Loop for a new location without any vehicles -_needsrelocated = true; -while {_needsrelocated} do { -_position = [getMarkerPos _spawnMarker,0,_spawnRadius,10,0,2000,0] call BIS_fnc_findSafePos; -_istoomany = _position nearObjects ["AllVehicles",10]; -if((count _istoomany) == 0) then { _needsrelocated = false; }; -}; - -//diag_log(format["CRASHSPAWNER: Spawning '%1' with loot table '%2' NOW! (%3) at: %4", _crashName, _lootTable, time, str(_position)]); - -_crash = createVehicle [_crashModel,_position, [], 0, "CAN_COLLIDE"]; -// Randomize the direction the wreck is facing -_crash setDir round(random 360); - -// Using "custom" wrecks (using the destruction model of a vehicle vs. a prepared wreck model) will result -// in the model spawning halfway in the ground. To combat this, an OPTIONAL configuration can be tied to -// the CfgVehicles class you've created for the custom wreck to define how high above the ground it should -// spawn. This is optional. -_config = configFile >> "CfgVehicles" >> _crashModel >> "heightAdjustment"; -_hasAdjustment = isNumber(_config); -_newHeight = 0; -if (_hasAdjustment) then { -_newHeight = getNumber(_config); -}; - -// Must setPos after a setDir otherwise the wreck won't level itself with the terrain -_adjustedPos = [(_position select 0), (_position select 1), _newHeight]; -//diag_log(format["DIAG: Designated Position: %1", str(_adjustedPos)]); -_crash setPos _adjustedPos; - -// I don't think this is needed (you can't get "in" a crash), but it was in the original DayZ Crash logic -dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_crash]; - -_crash setVariable ["ObjectID","1",true]; -_pos = getPos _crash; -// Disable simulation server side -_crash enableSimulation false; - -_num = round(random _randomizedLoot) + _guaranteedLoot; - -if(_crashModel == "Mass_grave_DZ") then { -_spawnFire = false; -_num = _num * 2; -}; - -if (_spawnFire) then { -//["PVDZ_obj_Fire",[_crash,2,time,false,_fadeFire]] call broadcastRpcCallAll; -PVDZ_obj_Fire = [_crash,2,time,false,_fadeFire]; -publicVariable "PVDZ_obj_Fire"; -_crash setvariable ["fadeFire",_fadeFire,true]; -}; - - if (DZE_MissionLootTable) then { -_itemTypes = [] + getArray (missionConfigFile >> "CfgBuildingLoot" >> _lootTable >> "lootType"); -} else { -_itemTypes = [] + getArray (configFile >> "CfgBuildingLoot" >> _lootTable >> "lootType"); -}; -_CBLBase = dayz_CBLBase find (toLower(_lootTable)); -_weights = dayz_CBLChances select _CBLBase; -_cntWeights = count _weights; - -for "_x" from 1 to _num do { -//create loot -_maxLootRadius = (random _maxLootRadius) + _minLootRadius; -_lootPos = [_pos, _maxLootRadius, random 360] call BIS_fnc_relPos; -_index1 = floor(random _cntWeights); -_index2 = _weights select _index1; -_itemType = _itemTypes select _index2; -[_itemType select 0, _itemType select 1, _lootPos, 5] call spawn_loot; -}; -// ReammoBox is preferred parent class here, as WeaponHolder wouldn't match MedBox0 && other such items. -_nearby = _pos nearObjects ["ReammoBox", sizeOf(_crashModel)]; -{ -_x setVariable ["permaLoot",true]; -} count _nearBy; -}; - -*/ \ No newline at end of file +// Using vanilla crash sites now. +// The 1.0.5.1 version was outdated and needs a full rewrite. \ No newline at end of file diff --git a/SQF/dayz_server/modules/supply_drop.sqf b/SQF/dayz_server/modules/supply_drop.sqf index 49ddc190a..5877e093b 100644 --- a/SQF/dayz_server/modules/supply_drop.sqf +++ b/SQF/dayz_server/modules/supply_drop.sqf @@ -1,70 +1,2 @@ -/* Needs updating -private ["_guaranteedLoot","_randomizedLoot","_spawnChance","_spawnMarker","_spawnRadius","_crashModel","_lootTable","_spawnRoll","_position","_crash","_config","_num","_itemTypes","_index","_weights","_cntWeights","_nearby","_itemType","_needsrelocated","_istoomany","_pos","_lootPos"]; - -_guaranteedLoot = 4; -_randomizedLoot = 8; -_spawnChance = 0.50; -_spawnMarker = 'center'; -_spawnRadius = (HeliCrashArea/2); -_minLootRadius = 4; -_maxLootRadius = 4; -_spawnRoll = random 1; -if (_spawnRoll <= _spawnChance) then { - -_crashModel = "Supply_Crate_DZE"; - -_lootTable = "SupplyDrop"; - -// Loop for a new location without any vehicles -_needsrelocated = true; -while {_needsrelocated} do { -_position = [getMarkerPos _spawnMarker,0,_spawnRadius,10,0,2000,0] call BIS_fnc_findSafePos; -_istoomany = _position nearObjects ["AllVehicles",10]; -if((count _istoomany) == 0) then { _needsrelocated = false; }; -}; - -//diag_log(format["CRASHSPAWNER: Spawning '%1' with loot table '%2' NOW! (%3) at: %4", _crashName, _lootTable, time, str(_position)]); - -_crash = createVehicle [_crashModel,_position, [], 0, "CAN_COLLIDE"]; - -// Randomize the direction the wreck is facing -_crash setDir round(random 360); - -_crash setPos _position; - -// I don't think this is needed (you can't get "in" a crash), but it was in the original DayZ Crash logic -//dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_crash]; - -//_crash setVariable ["ObjectID","1",true]; -_pos = getPos _crash; -// Disable simulation server side -_crash enableSimulation false; - - _num = (round(random _randomizedLoot)) + _guaranteedLoot; - - if (DZE_MissionLootTable) then { -_itemTypes = [] + getArray (missionConfigFile >> "CfgBuildingLoot" >> _lootTable >> "lootType"); -} else { -_itemTypes = [] + getArray (configFile >> "CfgBuildingLoot" >> _lootTable >> "lootType"); -}; -_CBLBase = dayz_CBLBase find (toLower(_lootTable)); -_weights = dayz_CBLChances select _CBLBase; -_cntWeights = count _weights; - -for "_x" from 1 to _num do { -//create loot -_maxLootRadius = (random _maxLootRadius) + _minLootRadius; -_lootPos = [_pos, _maxLootRadius, random 360] call BIS_fnc_relPos; -_index1 = floor(random _cntWeights); -_index2 = _weights select _index1; -_itemType = _itemTypes select _index2; -[_itemType select 0, _itemType select 1, _lootPos, 5] call spawn_loot; -}; - -// ReammoBox is preferred parent class here, as WeaponHolder wouldn't match MedBox0 && other such items. -_nearby = _position nearObjects ["ReammoBox", sizeOf(_crashModel)]; -{ -_x setVariable ["permaLoot",true]; -} count _nearBy; -}; -*/ \ No newline at end of file +// Using vanilla care packages now. +// The 1.0.5.1 version was outdated and needs a full rewrite. \ No newline at end of file diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf index 10c708176..037cc671f 100644 --- a/SQF/dayz_server/system/server_monitor.sqf +++ b/SQF/dayz_server/system/server_monitor.sqf @@ -11,6 +11,7 @@ dayz_serverIDMonitor = []; dayz_versionNo = getText (configFile >> "CfgMods" >> "DayZ" >> "version"); dayz_hiveVersionNo = getNumber (configFile >> "CfgMods" >> "DayZ" >> "hiveVersion"); _hiveLoaded = false; +_serverVehicleCounter = []; diag_log "HIVE: Starting"; //Set the Time @@ -187,7 +188,7 @@ if (_status == "ObjectStreamStart") then { _object setVelocity [0,0,1]; _object call fnc_veh_ResetEH; if (_ownerID != "0" && !(_object isKindOf "Bicycle")) then {_object setVehicleLock "locked";}; - serverVehicleCounter set [count serverVehicleCounter,_type]; // total each vehicle + _serverVehicleCounter set [count _serverVehicleCounter,_type]; // total each vehicle }; } else { if (_type in DayZ_nonCollide) then { @@ -339,9 +340,10 @@ if !(DZE_ConfigTrader) then { }; if (_hiveLoaded) then { - [] spawn { + _serverVehicleCounter spawn { // spawn_vehicles // Get all buildings and roads only once. Very taxing, but only on first startup + _serverVehicleCounter = _this; _startTime = diag_tickTime; _buildingList = []; _cfgLootFile = if (DZE_MissionLootTable) then {missionConfigFile >> "CfgLoot" >> "Buildings"} else {configFile >> "CfgLoot" >> "Buildings"}; @@ -352,7 +354,7 @@ if (_hiveLoaded) then { } count (dayz_centerMarker nearObjects ["building",DynamicVehicleArea]); _roadList = dayz_centerMarker nearRoads DynamicVehicleArea; - _vehLimit = MaxVehicleLimit - (count serverVehicleCounter); + _vehLimit = MaxVehicleLimit - (count _serverVehicleCounter); if (_vehLimit > 0) then { diag_log ("HIVE: Spawning # of Vehicles: " + str(_vehLimit)); for "_x" from 1 to _vehLimit do {call spawn_vehicles;}; @@ -374,7 +376,7 @@ if (_hiveLoaded) then { }; }; -[] spawn server_spawnEvents; +if (EpochUseEvents) then {[] spawn server_spawnEvents;}; _debugMarkerPosition = getMarkerPos "respawn_west"; _debugMarkerPosition = [(_debugMarkerPosition select 0),(_debugMarkerPosition select 1),1]; _vehicle_0 = createVehicle ["DebugBox_DZ", _debugMarkerPosition, [], 0, "CAN_COLLIDE"]; diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf index 34411f36e..04adc9888 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf @@ -58,9 +58,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 -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf index 93f797837..207f37a3c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf @@ -58,9 +58,9 @@ MaxDynamicDebris = 100; // Max number of random road blocks to spawn around the MaxVehicleLimit = 50; // 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 -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf index fe8b8636c..8ead94fe4 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf @@ -58,10 +58,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 -// EPOCH CONFIG VARIABLES END // - -//Server Events +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf index deb9c9368..3e15ddb55 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf @@ -58,9 +58,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 -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf index 35b51a701..b3efeeb3e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf @@ -58,9 +58,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 -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf index 58ba5898b..d1ea97a4c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf @@ -58,9 +58,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 -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf index 054e9e614..9e8bd9515 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf @@ -58,9 +58,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 -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf index 2e136efe1..b7d028ba7 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf @@ -58,9 +58,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 -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // 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 5009e092e..6ce94220b 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 @@ -58,9 +58,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 -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf index 4121cb595..9dfb3a10e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf @@ -58,9 +58,9 @@ MaxDynamicDebris = 150; // Max number of random road blocks to spawn around the MaxVehicleLimit = 100; // Max number of random vehicles to spawn around the map spawnArea = 1000; // Distance around markers to find a safe spawn position spawnShoremode = 1; // Random spawn locations 1 = on shores, 0 = inland -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf index cf9c86f37..f1b1d633b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf @@ -58,9 +58,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 -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf index 32857ee23..cdd998ee8 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf @@ -58,9 +58,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 -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // 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 0e4c3c47f..be80bbdd0 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 @@ -58,9 +58,9 @@ 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 -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // 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 95156e751..cd97183d4 100644 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf @@ -58,9 +58,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 -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf index fc5588d54..c1e9d26db 100644 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf @@ -58,9 +58,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 -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf index c5f570b13..6c979523f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf @@ -58,9 +58,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 -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // 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 7398a9d7b..9289100ae 100644 --- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf @@ -58,9 +58,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 -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf index ac9ecc5f8..849162d60 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf @@ -58,9 +58,9 @@ MaxDynamicDebris = 50; // Max number of random road blocks to spawn around the m MaxVehicleLimit = 50; // Max number of random vehicles to spawn around the map spawnArea = 250; // Distance around markers to find a safe spawn position spawnShoremode = 0; // Random spawn locations 1 = on shores, 0 = inland -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf index 760194bff..0cf86f9b0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf @@ -58,9 +58,9 @@ MaxDynamicDebris = 300; // Max number of random road blocks to spawn around the MaxVehicleLimit = 150; // Max number of random vehicles to spawn around the map spawnArea = 500; // Distance around markers to find a safe spawn position spawnShoremode = 0; // Random spawn locations 1 = on shores, 0 = inland -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf index b2220736e..b3825b9a6 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf @@ -58,9 +58,9 @@ MaxDynamicDebris = 50; // Max number of random road blocks to spawn around the m MaxVehicleLimit = 25; // Max number of random vehicles to spawn around the map spawnArea = 500; // Distance around markers to find a safe spawn position spawnShoremode = 0; // Random spawn locations 1 = on shores, 0 = inland -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf index 57d0f985d..12596d33d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf @@ -58,9 +58,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 -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf index 485cc2c22..b65b02cd1 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf @@ -58,9 +58,9 @@ MaxDynamicDebris = 100; // Max number of random road blocks to spawn around the MaxVehicleLimit = 50; // Max number of random vehicles to spawn around the map spawnArea = 500; // Distance around markers to find a safe spawn position spawnShoremode = 0; // Random spawn locations 1 = on shores, 0 = inland -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE // diff --git a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf index 0bf77de96..6df38d3bc 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf @@ -58,9 +58,9 @@ MaxDynamicDebris = 100; // Max number of random road blocks to spawn around the MaxVehicleLimit = 50; // Max number of random vehicles to spawn around the map spawnArea = 500; // Distance around markers to find a safe spawn position spawnShoremode = 0; // Random spawn locations 1 = on shores, 0 = inland -// EPOCH CONFIG VARIABLES END // - +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"]]; +// EPOCH CONFIG VARIABLES END // // DO NOT EDIT BELOW HERE //