diff --git a/CHANGE LOG 1.0.6.1.txt b/CHANGE LOG 1.0.6.1.txt
index 32e669db9..69c1de741 100644
--- a/CHANGE LOG 1.0.6.1.txt
+++ b/CHANGE LOG 1.0.6.1.txt
@@ -16,6 +16,7 @@
[CHANGED] Reverted pain to old violent shaking effect instead of subtle gun sway. #1839 @AirwavesMan @schwanzkopfhegel
[CHANGED] Reverted lobby and player list background colors to A2OA default instead of dark grey
[CHANGED] Salvage vehicle actions are no longer allowed in positions defined in DZE_SafeZonePosArray
+[CHANGED] The town generator and comfrey plant spawner loops are now fully disabled when dayz_townGenerator=false; to improve client performance.
[FIXED] Wrong texture for z_hunter zombie. #1805 @schwanzkopfhegel @ebayShopper
[FIXED] Refuel with generator at gas station not working. #1806 @Helios27 @ebayShopper
@@ -37,7 +38,7 @@
[FIXED] HALO fresh spawns stuck swimming in air on Napf and failing to start correctly sometimes. #1809 @oiad @ebayShopper
[FIXED] Self actions sometimes duplicating when changing clothes and looking at a safe. @jOoPs @ebayShopper
[FIXED] Wrong bleeding icon on vanilla status UI. @jOoPs
-[FIXED] It is no longer possible to autoRun under ponds on Chernarus. #1827 @schwanzkopfhegel
+[FIXED] It is no longer possible to autoRun under ponds on Chernarus, Namalsk and Napf. #1827 @schwanzkopfhegel
[FIXED] Hive connection error after the first and only online player disconnects during the object stream at server start up. #1822 @AirwavesMan @ebayShopper
[FIXED] Vanilla player_craftItem not exiting when action is already in progress. #1826 @schwanzkopfhegel
[FIXED] Fire barrel kit can be crafted with partially full matchboxes now. #1830 @AirwavesMan
@@ -47,7 +48,7 @@
[FIXED] Filling fuel barrels takes the correct amount from fuel tanks now (210 instead of 40 litres). #1834 @schwanzkopfhegel @oiad
[FIXED] Base objects duplicating when using "take ownership" on plot pole. #1811 @BNG-Lance @Clanwarfare
[FIXED] Unable to sell some launchers like Javelin and Stinger which have the same classname for ammo and weapon. #1844 @ndavalos
-[FIXED] Long search delay when filling water bottles, drinking from hands and drinking from empty cans on Chernarus. #1835 @schwanzkopfhegel
+[FIXED] Long search delay when filling water bottles, drinking from hands and drinking from empty cans is fixed on Chernarus, Namalsk and Napf. #1835 @schwanzkopfhegel
[FIXED] Players can not purchase a negative number of items anymore.
[FIXED] Removed antiwall glitch blocks for vanilla hospitals since Epoch uses DayZero hospitals. @jOoPs
[FIXED] Switching weapons properly interrupts autorun now. #1850 @DeVloek
diff --git a/SQF/dayz_code/compile/client_plantSpawner.sqf b/SQF/dayz_code/compile/client_plantSpawner.sqf
index 9ff983d60..c8783c936 100644
--- a/SQF/dayz_code/compile/client_plantSpawner.sqf
+++ b/SQF/dayz_code/compile/client_plantSpawner.sqf
@@ -62,7 +62,6 @@ _insideloop = {
};
for "_i" from 1 to 2048 do {
- if (!dayz_townGenerator) exitWith {};
_pos = _a call psrnd;
_pos call _insideloop;
if (_plantcount >= dayz_maxGlobalPlants) exitWith {};
diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf
index 767a9d82c..b7e69b028 100644
--- a/SQF/dayz_code/compile/fn_selfActions.sqf
+++ b/SQF/dayz_code/compile/fn_selfActions.sqf
@@ -97,8 +97,7 @@ if ((_primaryWeapon in Dayz_fishingItems) && {!dayz_fishingInprogress} && {_inVe
s_player_fishing_veh = -1;
};
-/*
-//FPS killer. Moved to CfgVehicles for wells
+/* //Allows drinking from hands at ponds and ambient wells, but may negatively impact performance
if (_canDo && !_inVehicle && !dayz_isSwimming && ((call fn_nearWaterHole) select 0)) then {
if (s_player_Drinkfromhands < 0) then {
s_player_Drinkfromhands = player addAction [localize "STR_ACTIONS_DRINK2", "\z\addons\dayz_code\actions\water_fill.sqf","hands", 0.5, false, true];
diff --git a/SQF/dayz_code/configVariables.sqf b/SQF/dayz_code/configVariables.sqf
index 9f4803d26..cd8c3525a 100644
--- a/SQF/dayz_code/configVariables.sqf
+++ b/SQF/dayz_code/configVariables.sqf
@@ -8,7 +8,7 @@ dayz_matchboxCount = false; // Enable match stick count. After five uses matches
dayz_toolBreaking = false; //Sledgehammer, crowbar and pickaxe have a chance to break when used.
dayz_waterBottleBreaking = false; // Water bottles have a chance to break when boiling and require duct tape to fix
dayz_tameDogs = false; // Allow taming dogs with raw meat. Note dog behavior is experimental and buggy.
-dayz_townGenerator = false; // Spawn vanilla map junk instead of Epoch DynamicDebris. Currently only compatible with Chernarus.
+dayz_townGenerator = false; // Spawn vanilla map junk instead of Epoch DynamicDebris. Currently only compatible with Chernarus. Also enables comfrey plant spawner which negatively impacts performance.
dayz_townGeneratorBlackList = []; // If townGenerator is enabled it will not spawn junk within 150m of these positions. Example for Chernarus traders: [[4053,11668,0],[11463,11349,0],[6344,7806,0],[1606,7803,0],[12944,12766,0],[5075,9733,0],[12060,12638,0]]
DZE_TempVars = [7, 15, 4, 4, 2, 6, 3, 2, 0.25, 0.75, 0.5]; //[vehicle, fire, building, moving, sun, heatpack, water, standing, rain, wind, night] water, standing, rain, wind and night factors have a negative impact on temperature. The greater they are the quicker the player gets cold.
DZE_WeatherVariables = [10, 20, 5, 10, 0, 0.2, 0, 0.7, 0, 0.6, 0, 8, 25, 30, 0, false]; //See DynamicWeatherEffects.sqf for info on these values.
diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf
index e05be85d1..79c35a8aa 100644
--- a/SQF/dayz_code/init/compiles.sqf
+++ b/SQF/dayz_code/init/compiles.sqf
@@ -146,6 +146,11 @@ if (!isDedicated) then {
//System
player_spawn_2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\player_spawn_2.sqf";
+
+ //Spawn waterHoleProxies manually if townGenerator is disabled
+ if (!dayz_townGenerator && {toLower worldName in ["chernarus","namalsk","napf"]}) then {
+ execVM ("\z\addons\dayz_code\system\mission\" + (toLower worldName) + "\waterHoleProxy.sqf");
+ };
//Crafting
fn_updateCraftUI = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_updateCraftUI.sqf";
@@ -658,7 +663,9 @@ DZ_KeyDown_EH = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\k
fn_shuffleArray = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_shuffleArray.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\traps\init.sqf";
-call compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\psrnd.sqf"; // pseudo random for plantSpanwer
+if (dayz_townGenerator) then {
+ call compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\psrnd.sqf"; // pseudo random for plantSpanwer
+};
// EPOCH ADDITIONS
BIS_fnc_numberDigits = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_numberDigits.sqf";
diff --git a/SQF/dayz_code/system/mission/chernarus/waterHoleProxy.sqf b/SQF/dayz_code/system/mission/chernarus/waterHoleProxy.sqf
new file mode 100644
index 000000000..f0aee054d
--- /dev/null
+++ b/SQF/dayz_code/system/mission/chernarus/waterHoleProxy.sqf
@@ -0,0 +1,185 @@
+// Same as \dayz_code\Configs\CfgTownGenerator\chernarusWaters.hpp
+[[
+ ["WaterHoleProxy",[9249,13577.1,-0.2],0],
+ ["WaterHoleProxy",[9244.5,13540.9,0.7],0],
+ ["WaterHoleProxy",[9394.7,13801.7,0.5],0],
+ ["WaterHoleProxy",[9435,13789.7,1.1],0],
+ ["WaterHoleProxy",[9441.5,13742,1],0],
+ ["WaterHoleProxy",[9443.7,13692.5,1],0],
+ ["WaterHoleProxy",[9484.8,13745.5,0.7],0],
+ ["WaterHoleProxy",[9484.8,13692.5,2],0],
+ ["WaterHoleProxy",[9515.6,13728.3,0.2],0],
+ ["WaterHoleProxy",[9625.6,13688,7.4],0],
+ ["WaterHoleProxy",[9534.6,13692.5,1.5],0],
+ ["WaterHoleProxy",[9584.5,13688.5,4.2],0],
+ ["WaterHoleProxy",[9282.6,13590.4,0.7],0],
+ ["WaterHoleProxy",[9301.1,13617.6,0.2],0],
+ ["WaterHoleProxy",[9385.2,13627.2,1.9],0],
+ ["WaterHoleProxy",[9385.2,13590.4,2.9],0],
+ ["WaterHoleProxy",[9282.6,13541,1.2],0],
+ ["WaterHoleProxy",[9335.3,13553.1,-0.8],0],
+ ["WaterHoleProxy",[9335.3,13590.4,3.1],0],
+ ["WaterHoleProxy",[9335,13622.1,0.5],0],
+ ["WaterHoleProxy",[9385.2,13560.7,0.8],0],
+ ["WaterHoleProxy",[9435,13640,1.2],0],
+ ["WaterHoleProxy",[9484.8,13555.1,0.5],0],
+ ["WaterHoleProxy",[9484.8,13640,2.3],0],
+ ["WaterHoleProxy",[9435,13554,-0.3],0],
+ ["WaterHoleProxy",[9435,13590.4,2.9],0],
+ ["WaterHoleProxy",[9484.8,13590.4,3],0],
+ ["WaterHoleProxy",[9584.5,13640,4.9],0],
+ ["WaterHoleProxy",[9634.3,13640,8.7],0],
+ ["WaterHoleProxy",[9534.6,13590.4,2.3],0],
+ ["WaterHoleProxy",[9584.5,13589.9,3.8],0],
+ ["WaterHoleProxy",[9534.6,13640,2.4],0],
+ ["WaterHoleProxy",[9634.3,13592,2.9],0],
+ ["WaterHoleProxy",[9534.6,13557.6,-0.7],0],
+ ["WaterHoleProxy",[9672.4,13598.1,1.5],0],
+ ["WaterHoleProxy",[9667.1,13625,5.3],0],
+ ["WaterHoleProxy",[2175.7,11843.5,1],0],
+ ["WaterHoleProxy",[2179.5,11804.7,-0.5],0],
+ ["WaterHoleProxy",[2224.4,11841.7,1.8],0],
+ ["WaterHoleProxy",[2226.3,11798.2,1.1],0],
+ ["WaterHoleProxy",[3804.6,8854.2,0],0],
+ ["WaterHoleProxy",[3456.1,8559.2,-0.7],0],
+ ["WaterHoleProxy",[3506.4,8559.3,0.3],0],
+ ["WaterHoleProxy",[3456.1,8535.1,1.7],0],
+ ["WaterHoleProxy",[4437.3,9096.3,0.8],0],
+ ["WaterHoleProxy",[5643.3,8575.1,0.3],0],
+ ["WaterHoleProxy",[6563.8,9303.6,0.7],0],
+ ["WaterHoleProxy",[6599.8,9303.4,0],0],
+ ["WaterHoleProxy",[6558.3,9256.7,1.2],0],
+ ["WaterHoleProxy",[6601.4,9257.7,1.6],0],
+ ["WaterHoleProxy",[7354.2,9272.9,0.2],0],
+ ["WaterHoleProxy",[7467.7,9263.1,0.4],0],
+ ["WaterHoleProxy",[3506.2,8533.5,1.3],0],
+ ["WaterHoleProxy",[3368.1,6483.2,1.4],0],
+ ["WaterHoleProxy",[4143.4,7246,0.9],0],
+ ["WaterHoleProxy",[4138.1,7209,1],0],
+ ["WaterHoleProxy",[4167.4,7214.3,0],0],
+ ["WaterHoleProxy",[4169.3,7245.5,1],0],
+ ["WaterHoleProxy",[4221,6747.1,0.8],0],
+ ["WaterHoleProxy",[4809.7,6594.6,0],0],
+ ["WaterHoleProxy",[5917.6,7951.6,1.2],0],
+ ["WaterHoleProxy",[7074.4,7328,2.7],0],
+ ["WaterHoleProxy",[4498.3,6434,0],0],
+ ["WaterHoleProxy",[4480.8,6430.3,0],0],
+ ["WaterHoleProxy",[4928.2,5634.5,0],0],
+ ["WaterHoleProxy",[4368.9,4646.7,0],0],
+ ["WaterHoleProxy",[5769.7,5203.6,0.2],0],
+ ["WaterHoleProxy",[5789.7,5171.7,1.2],0],
+ ["WaterHoleProxy",[5765,5172.5,0.5],0],
+ ["WaterHoleProxy",[5789.7,5209.7,1.1],0],
+ ["WaterHoleProxy",[7692.2,5935.2,0.2],0],
+ ["WaterHoleProxy",[7717.9,4926.1,0.4],0],
+ ["WaterHoleProxy",[8278.9,12146.4,1],0],
+ ["WaterHoleProxy",[8775.3,11626.2,0],0],
+ ["WaterHoleProxy",[9438.4,8830.6,0],0],
+ ["WaterHoleProxy",[11767.2,12180.6,0],0],
+ ["WaterHoleProxy",[11877.8,12382.5,0],0],
+ ["WaterHoleProxy",[13278,12111.2,2.2],0],
+ ["WaterHoleProxy",[13292.3,12147.4,0.5],0],
+ ["WaterHoleProxy",[13315.9,12111.2,1.2],0],
+ ["WaterHoleProxy",[13379.6,12097.2,1.6],0],
+ ["WaterHoleProxy",[13315.8,12151.4,0.9],0],
+ ["WaterHoleProxy",[13284.2,12027.5,-1.6],0],
+ ["WaterHoleProxy",[13276.4,12060.7,1.1],0],
+ ["WaterHoleProxy",[13323.6,12010.1,1.3],0],
+ ["WaterHoleProxy",[13374.9,12010.1,2.6],0],
+ ["WaterHoleProxy",[13374.9,11961,2],0],
+ ["WaterHoleProxy",[13374.9,12060.7,1.8],0],
+ ["WaterHoleProxy",[13420.6,11963.1,-1.5],0],
+ ["WaterHoleProxy",[13419.9,12057.1,1.5],0],
+ ["WaterHoleProxy",[13323.9,12060.7,-0.3],0],
+ ["WaterHoleProxy",[13418.1,12010.1,1.9],0],
+ ["WaterHoleProxy",[13323.9,11961.3,1.8],0],
+ ["WaterHoleProxy",[13182.8,11558.9,1.3],0],
+ ["WaterHoleProxy",[13292.1,11925.7,0.9],0],
+ ["WaterHoleProxy",[13291.3,11946.9,0.6],0],
+ ["WaterHoleProxy",[13323.9,11921.1,0.6],0],
+ ["WaterHoleProxy",[13371.4,11924.5,0.3],0],
+ ["WaterHoleProxy",[13287.9,11586.9,2.6],0],
+ ["WaterHoleProxy",[13233.6,11546.8,2.3],0],
+ ["WaterHoleProxy",[13233.6,11585.4,-0.3],0],
+ ["WaterHoleProxy",[13286.4,11536.4,2.2],0],
+ ["WaterHoleProxy",[12525.6,10437.4,0],0],
+ ["WaterHoleProxy",[12436.5,9557.1,0],0],
+ ["WaterHoleProxy",[12881.2,10122.1,0],0],
+ ["WaterHoleProxy",[12799.9,10064.1,0],0],
+ ["WaterHoleProxy",[12876.5,9581.3,0],0],
+ ["WaterHoleProxy",[12179.6,9476.4,0],0],
+ ["WaterHoleProxy",[11945.1,9222.4,0],0],
+ ["WaterHoleProxy",[12020.3,9178.3,0],0],
+ ["WaterHoleProxy",[11898,9149.8,0],0],
+ ["WaterHoleProxy",[12083.5,9093.3,0],0],
+ ["WaterHoleProxy",[11947.9,8922.3,0],0],
+ ["WaterHoleProxy",[12701.6,9468,0],0],
+ ["WaterHoleProxy",[12758.5,8821.9,0.8],0],
+ ["WaterHoleProxy",[12762,8800.1,0.4],0],
+ ["WaterHoleProxy",[12792.9,8818.3,1.5],0],
+ ["WaterHoleProxy",[12794,8798.5,1.4],0],
+ ["WaterHoleProxy",[11443.8,7391.2,1],0],
+ ["WaterHoleProxy",[7856.5,5668.2,0.3],0],
+ ["WaterHoleProxy",[8690.1,4907,1.6],0],
+ ["WaterHoleProxy",[8730.1,4909.1,2.1],0],
+ ["WaterHoleProxy",[8761,4912.1,2.2],0],
+ ["WaterHoleProxy",[9221.3,4937,0.8],0],
+ ["WaterHoleProxy",[11148.2,6555.3,0],0],
+ ["WaterHoleProxy",[11717.3,6543.9,1],0],
+ ["WaterHoleProxy",[12325.9,8347.2,0],0],
+ ["WaterHoleProxy",[13056.4,7220.5,0.4],0],
+ ["WaterHoleProxy",[13055.1,7248.3,0.4],0],
+ ["WaterHoleProxy",[13115.5,7240.5,-1.1],0],
+ ["WaterHoleProxy",[13115.4,7222.1,0.4],0],
+ ["WaterHoleProxy",[11749.4,6543.4,0],0],
+ ["WaterHoleProxy",[11719.3,6509.1,-2.4],0],
+ ["WaterHoleProxy",[11751.3,6509.1,1.5],0],
+ ["WaterHoleProxy",[12607.6,5723.5,0],0],
+ ["WaterHoleProxy",[13216.7,6264,1],0],
+ ["WaterHoleProxy",[12909,5638.5,0],0],
+ ["WaterHoleProxy",[11719.2,5119.4,1.4],0],
+ ["WaterHoleProxy",[12392,5313.2,1.1],0],
+ ["WaterHoleProxy",[13341.7,5458.2,0],0],
+ ["WaterHoleProxy",[12760.5,4957.9,0.5],0],
+ ["WaterHoleProxy",[3356.4,3951.1,0],0],
+ ["WaterHoleProxy",[3780.9,2586.8,0],0],
+ ["WaterHoleProxy",[5734.5,4111.3,1],0],
+ ["WaterHoleProxy",[6822.3,4491.5,1],0],
+ ["WaterHoleProxy",[7720.6,3971.6,1.2],0],
+ ["WaterHoleProxy",[6252.5,3353.9,0.7],0],
+ ["WaterHoleProxy",[6511,3546.6,0],0],
+ ["WaterHoleProxy",[6460.1,3095.3,1.2],0],
+ ["WaterHoleProxy",[7758.8,3413.1,0.9],0],
+ ["WaterHoleProxy",[7036.9,3041.3,0.3],0],
+ ["WaterHoleProxy",[7077.1,2963.7,0.4],0],
+ ["WaterHoleProxy",[7063.6,3001.6,0.4],0],
+ ["WaterHoleProxy",[7956.9,3363.5,1.3],0],
+ ["WaterHoleProxy",[9831.4,4623.1,2],0],
+ ["WaterHoleProxy",[9980.5,4201.4,1.5],0],
+ ["WaterHoleProxy",[9986.9,4163.5,0.5],0],
+ ["WaterHoleProxy",[10024.6,4157.4,0.7],0],
+ ["WaterHoleProxy",[10015.5,4195.1,-0.5],0],
+ ["WaterHoleProxy",[10690.4,4526.8,1.7],0],
+ ["WaterHoleProxy",[10293.3,3660.1,2.5],0],
+ ["WaterHoleProxy",[10286.3,3739.1,1.6],0],
+ ["WaterHoleProxy",[10170.7,3200.5,0.6],0],
+ ["WaterHoleProxy",[10200.7,3201.5,2.9],0],
+ ["WaterHoleProxy",[10167.5,3151.5,2.9],0],
+ ["WaterHoleProxy",[10199.3,3153.7,0.4],0],
+ ["WaterHoleProxy",[12567.9,3679.5,1.6],0],
+ ["WaterHoleProxy",[6769.9,2974.7,0],0],
+ ["WaterHoleProxy",[13409.7,2762.7,0],0],
+ ["WaterHoleProxy",[6047.1,10302.2,-0.1],0],
+ ["WaterHoleProxy",[6170.9,10415,0],0],
+ ["WaterHoleProxy",[5945.1,10179.9,0],0],
+ ["WaterHoleProxy",[3327.3,3989.6,-0.1],0],
+ ["WaterHoleProxy",[3407.8,3909.3,0],0],
+ ["WaterHoleProxy",[3376.9,3955.6,-0.1],0],
+ ["WaterHoleProxy",[2556.3,3451.4,0],0],
+ ["WaterHoleProxy",[4555.8,4348.9,0],0],
+ ["WaterHoleProxy",[4469,3918.4,0],0],
+ ["WaterHoleProxy",[4420.2,3962.4,-0.1],0],
+ ["WaterHoleProxy",[4044.5,3327.4,0],0],
+ ["WaterHoleProxy",[4602.9,2745.4,0],0],
+ ["WaterHoleProxy",[2588,5941,1],0]
+],true,true,true] call fnc_spawnObjects;
diff --git a/SQF/dayz_code/system/mission/namalsk/waterHoleProxy.sqf b/SQF/dayz_code/system/mission/namalsk/waterHoleProxy.sqf
new file mode 100644
index 000000000..1dceb1985
--- /dev/null
+++ b/SQF/dayz_code/system/mission/namalsk/waterHoleProxy.sqf
@@ -0,0 +1,18 @@
+[[
+ ["WaterHoleProxy",[7298.87,11101.5,0],0], // [22813: pond_big_44.p3d] 73,43
+ ["WaterHoleProxy",[7850.7,11203.2,0],0], // [75239: pond_big_44.p3d] 79,42
+ ["WaterHoleProxy",[8288.24,10757.7,0],0], // [78443: misc_wellpump.p3d] 83,46
+ ["WaterHoleProxy",[6382.19,11106.1,0],0], // [16677: pond_big_44.p3d] 64,43
+ ["WaterHoleProxy",[4515.11,10962.8,0],0], // [14571: misc_wellpump.p3d] 45,44
+ ["WaterHoleProxy",[5777.57,10735.6,0],0], // [66751: misc_wellpump.p3d] 58,46
+ ["WaterHoleProxy",[5620.9,9420.72,0],0], // [51635: pond_big_31_04.p3d] 56,59
+ ["WaterHoleProxy",[5701.74,9428.14,0],0], // [51648: pond_small_20.p3d] 57,59
+ ["WaterHoleProxy",[8288.24,10757.7,0],0], // [78443: misc_wellpump.p3d] 83,46
+ ["WaterHoleProxy",[4606.99,8843.52,0],0], // [74117: pond_big_31_04.p3d] 46,65
+ ["WaterHoleProxy",[8825.5,10605.9,0],0], // [38226: misc_wellpump.p3d] 88,48
+ ["WaterHoleProxy",[5162.8,8212.08,0],0], // [106525: pond_big_31_04.p3d] 52,71
+ ["WaterHoleProxy",[5193.92,8091.52,0],0], // [107010: pond_big_31_04.p3d] 52,73
+ ["WaterHoleProxy",[7319.2,7002.32,0],0], // [176715: misc_wellpump.p3d] 73,84
+ ["WaterHoleProxy",[7904.44,6849.89,0],0], // [194376: pond_small_20.p3d] 79,85
+ ["WaterHoleProxy",[7081.24,6160.29,0],0] // [179488: misc_wellpump.p3d] 71,92
+],true,true,true] call fnc_spawnObjects;
diff --git a/SQF/dayz_code/system/mission/napf/waterHoleProxy.sqf b/SQF/dayz_code/system/mission/napf/waterHoleProxy.sqf
new file mode 100644
index 000000000..f22dc6d98
--- /dev/null
+++ b/SQF/dayz_code/system/mission/napf/waterHoleProxy.sqf
@@ -0,0 +1,145 @@
+[[
+ ["WaterHoleProxy",[16839,5163.87,1.10937],0], // [36254: misc_well.p3d]
+ ["WaterHoleProxy",[16616.1,4972.86,2.00711],0], // [7618: pond_small_01.p3d] 168, 153
+ ["WaterHoleProxy",[19076.9,6383.57,0.975849],0], // [2813: nagara_pond_1.p3d] 190, 140/141
+ ["WaterHoleProxy",[17697.1,4680.28,4.79833],0], // [1281: sk_pond_50x.p3d] 176/177, 158/159
+ ["WaterHoleProxy",[17747.1,4680.28,-2.96147],0], // [21475: sk_pond_50x.p3d]
+ ["WaterHoleProxy",[17697.1,4630.28,11.5447],0], // [1211: sk_pond_50x.p3d]
+ ["WaterHoleProxy",[17647.1,4580.28,-2.00972],0], // [21472: sk_pond_50x.p3d]
+ ["WaterHoleProxy",[17697.1,4580.28,-2.61644],0], // [21473: sk_pond_50x.p3d]
+ ["WaterHoleProxy",[17747.1,4630.28,-0.66235],0], // [1210: sk_pond_50x.p3d]
+ ["WaterHoleProxy",[17747.1,4680.28,-2.96147],0], // [21475: sk_pond_50x.p3d]
+ ["WaterHoleProxy",[17697.1,4580.28,-2.61644],0], // [21473: sk_pond_50x.p3d]
+ ["WaterHoleProxy",[17747.1,4630.28,-0.66235],0], // [1210: sk_pond_50x.p3d]
+//----------------------------------------------
+//RESERVOIR
+ ["WaterHoleProxy",[11037.9,4859.65,0],0], // [635056: sk_pond_50x.p3d] 110,105
+ ["WaterHoleProxy",[11071.4,4822.5,0],0], // [635041: sk_pond_50x.p3d] 111,105
+ ["WaterHoleProxy",[11000.8,4826.2,0],0], // [635055: sk_pond_50x.p3d] 110,105
+ ["WaterHoleProxy",[11034.2,4789.04,0],0], // [635042: sk_pond_50x.p3d] 110,106
+ ["WaterHoleProxy",[11004.5,4896.81,0],0], // [635057: sk_pond_50x.p3d] 110,105
+ ["WaterHoleProxy",[10967.3,4863.35,0],0], // [635058: sk_pond_50x.p3d] 110,105
+ ["WaterHoleProxy",[11104.9,4785.34,0],0], // [635040: sk_pond_50x.p3d] 111,106
+ ["WaterHoleProxy",[11067.7,4751.88,0],0], // [635039: sk_pond_50x.p3d] 111,106
+ ["WaterHoleProxy",[10933.9,4900.51,0],0], // [635073: sk_pond_50x.p3d] 109,105
+ ["WaterHoleProxy",[11138.3,4748.18,0],0], // [635028: sk_pond_50x.p3d] 111,106
+ ["WaterHoleProxy",[11101.2,4714.73,0],0], // [635029: sk_pond_50x.p3d] 111,106
+ ["WaterHoleProxy",[10900.4,4937.67,0],0], // [635074: sk_pond_50x.p3d] 109,104
+ ["WaterHoleProxy",[11171.8,4711.03,0],0], // [635027: sk_pond_50x.p3d] 112,106
+ ["WaterHoleProxy",[11134.6,4677.57,0],0], // [635026: sk_pond_50x.p3d] 111,107
+ ["WaterHoleProxy",[11097.5,4644.11,0],0], // [635025: sk_pond_50x.p3d] 111,107
+ ["WaterHoleProxy",[10904,4991.25,0],0], // [635082: sk_pond_50x.p3d] 109,104
+ ["WaterHoleProxy",[10885,4974.19,0],0], // [635084: sk_pond_50x.p3d] 109,104
+ ["WaterHoleProxy",[10866.4,4957.46,0],0], // [635086: sk_pond_50x.p3d] 109,104
+ ["WaterHoleProxy",[10847.9,4940.74,0],0], // [635089: sk_pond_50x.p3d] 108,104
+ ["WaterHoleProxy",[11060.3,4610.65,0],0], // [635024: sk_pond_50x.p3d] 111,107
+ ["WaterHoleProxy",[10989.7,4614.35,0],0], // [635032: sk_pond_50x.p3d] 110,107
+ ["WaterHoleProxy",[10829.3,4924.01,0],0], // [635090: sk_pond_50x.p3d] 108,104
+ ["WaterHoleProxy",[10858.1,4975.49,0],0], // [635087: sk_pond_50x.p3d] 109,104
+ ["WaterHoleProxy",[10886.9,5010.2,0],0], // [635083: sk_pond_50x.p3d] 109,103
+ ["WaterHoleProxy",[11205.2,4673.87,0],0], // [635011: sk_pond_50x.p3d] 112,107
+ ["WaterHoleProxy",[10868,4993.14,0],0], // [635088: sk_pond_50x.p3d] 109,104
+ ["WaterHoleProxy",[11168.1,4640.41,0],0], // [635010: sk_pond_50x.p3d] 112,107
+ ["WaterHoleProxy",[10885.6,4655.21,0],0], // [635046: sk_pond_50x.p3d] 109,107
+ ["WaterHoleProxy",[10810.7,4907.28,0],0], // [635092: sk_pond_50x.p3d] 108,105
+ ["WaterHoleProxy",[11242.4,4707.33,0],0], // [635012: sk_pond_50x.p3d] 112,107
+ ["WaterHoleProxy",[11130.9,4606.96,0],0], // [635009: sk_pond_50x.p3d] 111,108
+ ["WaterHoleProxy",[10919.1,4618.05,0],0], // [635035: sk_pond_50x.p3d] 109,107
+ ["WaterHoleProxy",[10792.1,4890.55,0],0], // [635093: sk_pond_50x.p3d] 108,105
+ ["WaterHoleProxy",[11023.1,4577.2,0],0], // [635013: sk_pond_50x.p3d] 110,108
+ ["WaterHoleProxy",[10773.6,4873.82,0],0], // [635091: sk_pond_50x.p3d] 108,105
+ ["WaterHoleProxy",[10952.5,4580.9,0],0], // [635033: sk_pond_50x.p3d] 110,108
+ ["WaterHoleProxy",[11238.7,4636.71,0],0], // [635006: sk_pond_50x.p3d] 112,107
+ ["WaterHoleProxy",[11201.5,4603.26,0],0], // [635005: sk_pond_50x.p3d] 112,108
+ ["WaterHoleProxy",[10755,4857.09,0],0], // [635094: sk_pond_50x.p3d] 108,105
+ ["WaterHoleProxy",[10815,4658.91,0],0], // [635050: sk_pond_50x.p3d] 108,107
+ ["WaterHoleProxy",[10848.5,4621.75,0],0], // [635047: sk_pond_50x.p3d] 108,107
+ ["WaterHoleProxy",[11275.8,4670.17,0],0], // [635007: sk_pond_50x.p3d] 113,107
+ ["WaterHoleProxy",[10881.9,4584.6,0],0], // [635034: sk_pond_50x.p3d] 109,108
+ ["WaterHoleProxy",[10736.4,4840.37,0],0], // [635095: sk_pond_50x.p3d] 107,105
+ ["WaterHoleProxy",[11313,4703.63,0],0], // [635008: sk_pond_50x.p3d] 113,107
+ ["WaterHoleProxy",[10717.8,4823.64,0],0], // [635096: sk_pond_50x.p3d] 107,105
+ ["WaterHoleProxy",[11272.1,4599.56,0],0], // [635003: sk_pond_50x.p3d] 113,108
+ ["WaterHoleProxy",[11235,4566.1,0],0], // [635004: sk_pond_50x.p3d] 112,108
+ ["WaterHoleProxy",[10777.8,4625.45,0],0], // [635049: sk_pond_50x.p3d] 108,107
+ ["WaterHoleProxy",[10811.3,4588.29,0],0], // [635048: sk_pond_50x.p3d] 108,108
+ ["WaterHoleProxy",[11309.3,4633.01,0],0], // [635002: sk_pond_50x.p3d] 113,107
+ ["WaterHoleProxy",[10699.3,4806.91,0],0], // [635097: sk_pond_50x.p3d] 107,106
+ ["WaterHoleProxy",[10744.4,4662.61,0],0], // [635065: sk_pond_50x.p3d] 107,107
+ ["WaterHoleProxy",[11346.4,4666.47,0],0], // [635001: sk_pond_50x.p3d] 113,107
+ ["WaterHoleProxy",[10710.9,4699.77,0],0], // [635067: sk_pond_50x.p3d] 107,107
+ ["WaterHoleProxy",[10680.7,4790.18,0],0], // [635123: sk_pond_50x.p3d] 107,106
+ ["WaterHoleProxy",[11383.6,4699.93,0],0], // [635000: sk_pond_50x.p3d] 114,107
+ ["WaterHoleProxy",[11305.6,4562.4,0],0], // [634996: sk_pond_50x.p3d] 113,108
+ ["WaterHoleProxy",[10662.1,4773.45,0],0], // [635125: sk_pond_50x.p3d] 107,106
+ ["WaterHoleProxy",[11342.8,4595.86,0],0], // [634997: sk_pond_50x.p3d] 113,108
+ ["WaterHoleProxy",[11379.9,4629.32,0],0], // [634998: sk_pond_50x.p3d] 114,107
+ ["WaterHoleProxy",[10673.8,4666.31,0],0], // [635066: sk_pond_50x.p3d] 107,107
+ ["WaterHoleProxy",[10643.5,4756.72,0],0], // [635133: sk_pond_50x.p3d] 106,106
+ ["WaterHoleProxy",[11417.1,4662.77,0],0], // [634999: sk_pond_50x.p3d] 114,107
+ ["WaterHoleProxy",[10640.3,4703.46,0],0], // [635081: sk_pond_50x.p3d] 106,107
+ ["WaterHoleProxy",[10624.9,4740,0],0], // [887624: sk_pond_50x.p3d] 106,106
+ ["WaterHoleProxy",[11339.1,4525.24,0],0], // [634995: sk_pond_50x.p3d] 113,108
+ ["WaterHoleProxy",[11376.2,4558.7,0],0], // [634994: sk_pond_50x.p3d] 114,108
+ ["WaterHoleProxy",[11413.4,4592.16,0],0], // [634992: sk_pond_50x.p3d] 114,108
+ ["WaterHoleProxy",[10606.3,4723.27,0],0], // [887625: sk_pond_50x.p3d] 106,106
+ ["WaterHoleProxy",[11488.5,4766.42,0],0], // [635110: sk_pond_50x.p3d] 115,106
+ ["WaterHoleProxy",[10587.4,4706.2,0],0], // [635116: sk_pond_50x.p3d] 106,107
+ ["WaterHoleProxy",[11372.5,4488.09,0],0], // [634891: sk_pond_50x.p3d] 114,109
+ ["WaterHoleProxy",[11335.4,4454.63,0],0], // [634890: sk_pond_50x.p3d] 113,109
+ ["WaterHoleProxy",[11508.5,4720.61,0],0], // [635108: sk_pond_50x.p3d] 115,106
+ ["WaterHoleProxy",[11409.7,4521.54,0],0], // [634989: sk_pond_50x.p3d] 114,108
+ ["WaterHoleProxy",[11446.8,4555,0],0], // [634990: sk_pond_50x.p3d] 114,108
+// RESERVOIR
+ ["WaterHoleProxy",[11472.9,4376.62,0],0], // [634930: sk_pond_50x.p3d] 115,110
+ ["WaterHoleProxy",[11476.6,4447.23,0],0], // [634987: sk_pond_50x.p3d] 115,109
+ ["WaterHoleProxy",[11439.4,4413.77,0],0], // [634903: sk_pond_50x.p3d] 114,109
+ ["WaterHoleProxy",[11435.7,4343.16,0],0], // [634881: sk_pond_50x.p3d] 114,110
+ ["WaterHoleProxy",[11402.3,4380.32,0],0], // [634879: sk_pond_50x.p3d] 114,110
+ ["WaterHoleProxy",[11406,4450.93,0],0], // [634900: sk_pond_50x.p3d] 114,109
+ ["WaterHoleProxy",[11480.3,4517.85,0],0], // [634991: sk_pond_50x.p3d] 115,108
+ ["WaterHoleProxy",[11368.8,4417.47,0],0], // [634859: sk_pond_50x.p3d] 114,109
+ ["WaterHoleProxy",[11365.1,4346.86,0],0], // [619407: sk_pond_50x.p3d] 114,110
+ ["WaterHoleProxy",[11331.6,4384.01,0],0], // [634837: sk_pond_50x.p3d] 113,110
+ ["WaterHoleProxy",[11335.4,4454.63,0],0], // [634890: sk_pond_50x.p3d] 113,109
+//----------------------------------------------
+ ["WaterHoleProxy",[14697.3,4769.11,3.87218],0], // [844954: sk_pond_50x.p3d] 146,157
+ ["WaterHoleProxy",[15317.8,5955.62,-2.802],0], // [821993: sk_pond_50x.p3d] 155,143
+ ["WaterHoleProxy",[18575.9,9994.99,-11.8012],0], // [796458: sk_pond_50x.p3d] 185,104
+ ["WaterHoleProxy",[18554.8,10205,-2.88353],0], // [802612: sk_pond_50x.p3d] 185,102
+ ["WaterHoleProxy",[18404.1,10360.3,-1.15134],0], // [561293: sk_pond_50x.p3d] 184,101
+ ["WaterHoleProxy",[16621.8,11761.4,2.92961],0], // [456006: pond_small_04.p3d]166,87
+ ["WaterHoleProxy",[14723.7,7707.29,0.812378],0], // [784281: sk_pond_50x.p3d] 147, 27
+ ["WaterHoleProxy",[13873.6,7669.02,0],0], // [780578: sk_pond_50x.p3d] 138, 128
+ ["WaterHoleProxy",[14196.1,12162.2,1.97623],0], // [52048: sk_pond_50x.p3d] 141, 82/83
+ ["WaterHoleProxy",[14176.6,12116.1,2.88378],0], // [52094: sk_pond_50x.p3d]
+ ["WaterHoleProxy",[14215.7,12208.2,2.71867],0], // [52036: sk_pond_50x.p3d]
+ ["WaterHoleProxy",[14157.1,12070.1,0.316508],0], // [52112: sk_pond_50x.p3d]
+ ["WaterHoleProxy",[14150.1,12181.7,4.22544],0], // [52096: sk_pond_50x.p3d]
+ ["WaterHoleProxy",[14130.6,12135.6,1.4165],0], // [52095: sk_pond_50x.p3d]
+ ["WaterHoleProxy",[14169.6,12227.7,4.90834],0], // [52097: sk_pond_50x.p3d]
+ ["WaterHoleProxy",[14111.1,12089.6,-6.09547],0], // [52126: sk_pond_50x.p3d]
+ ["WaterHoleProxy",[14136.7,11987.1,2.09159],0], // [424987: pond_small_08.p3d] 141, 84
+ ["WaterHoleProxy",[18369,17160.6,1.47549],0], // [554594: misc_wellpump.p3d] 183,33
+ ["WaterHoleProxy",[6307.72,4017.32,1.01775],0], // [710994: rasman_pond.p3d] 63, 164
+ ["WaterHoleProxy",[5401.35,4219.47,2.13702],0], // [678642: kakaru_pond.p3d] 53/54,162
+ ["WaterHoleProxy",[5857.86,3956.34,1.87843],0], // [695477: nagara_pond_1.p3d] 58, 165
+ ["WaterHoleProxy",[3507.66,4872.45,1.80212],0], // [674052: kakaru_pond.p3d] 35, 156
+ ["WaterHoleProxy",[3948.11,4871.19,1.87843],0], // [662930: nagara_pond_1.p3d] 39, 156
+ ["WaterHoleProxy",[4204.53,4895.96,1.87843],0], // [662926: nagara_pond_1.p3d] 42,156
+ ["WaterHoleProxy",[6573.84,6753.3,1.65832],0], // [741015: pond_small_09.p3d] 65, 137
+ ["WaterHoleProxy",[6378.31,6751.98,1.64444],0], // [650405: pond_small_09.p3d] 63, 137
+ ["WaterHoleProxy",[6288.85,6725.98,1.63806],0], // [614041: pond_small_09.p3d] 62, 137
+ ["WaterHoleProxy",[4458.62,9331.67,2.03162],0], // [619754: nagara_pond_1.p3d] 44, 111
+ ["WaterHoleProxy",[12474,10041.6,1.10836],0], // [439142: misc_well.p3d] 124, 104
+ ["WaterHoleProxy",[13518.6,12905.6,1.40116],0], // [398388: pond_small_09.p3d] 135, 75
+ ["WaterHoleProxy",[13120.3,12693.8,3.13171],0], // [398399: pond_small_07.p3d] 131, 77
+ ["WaterHoleProxy",[14327.8,13880.5,-0.156022],0], // [846656: sk_pond_50x.p3d] 143, 68
+ ["WaterHoleProxy",[7577.08,14133.2,1.10934],0], // [172830: misc_well.p3d] 54, 54
+ ["WaterHoleProxy",[9804.14,13986.4,1.12068],0], // [248698: pond_small_02.p3d] 54, 54
+ ["WaterHoleProxy",[12848.1,14712.4,1.24404],0], // [293675: pond_small_10.p3d] 128, 57
+ ["WaterHoleProxy",[12914.6,14515.2,2.84679],0], // [293661: pond_big_02.p3d] 128/129,59
+ ["WaterHoleProxy",[8844.21,14646,1.84563],0], // [222571: pond_small_07.p3d] 88, 58
+ ["WaterHoleProxy",[9611.45,16079.3,0.925323],0] // [198164: pond_small_02.p3d] 96, 44
+],true,true,true] call fnc_spawnObjects;
+
diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm
index 3d611c4cd..5645f8632 100644
--- a/SQF/dayz_code/system/player_monitor.fsm
+++ b/SQF/dayz_code/system/player_monitor.fsm
@@ -1012,7 +1012,7 @@ class FSM
priority = 0.000000;
to="Preload_Display";
precondition = /*%FSM*/""/*%FSM*/;
- condition=/*%FSM*/"call sched_townGenerator_ready"/*%FSM*/;
+ condition=/*%FSM*/"(!dayz_townGenerator or {call sched_townGenerator_ready})"/*%FSM*/;
action=/*%FSM*/""/*%FSM*/;
};
/*%FSM*/
@@ -1310,7 +1310,7 @@ class FSM
priority = 0.000000;
to="Load_In";
precondition = /*%FSM*/""/*%FSM*/;
- condition=/*%FSM*/"(!isNil 'dayz_plantSpawner_done' && {dayz_plantSpawner_done == 2} && {!isNil 'BIS_fnc_init'})"/*%FSM*/;
+ condition=/*%FSM*/"((!dayz_townGenerator or (!isNil 'dayz_plantSpawner_done' && {dayz_plantSpawner_done == 2})) && (!isNil 'BIS_fnc_init'))"/*%FSM*/;
action=/*%FSM*/""/*%FSM*/;
};
/*%FSM*/
diff --git a/SQF/dayz_code/system/scheduler/sched_init.sqf b/SQF/dayz_code/system/scheduler/sched_init.sqf
index c9144a1f6..773626b67 100644
--- a/SQF/dayz_code/system/scheduler/sched_init.sqf
+++ b/SQF/dayz_code/system/scheduler/sched_init.sqf
@@ -2,9 +2,7 @@
_base="z\addons\dayz_code\system\scheduler\";
call compile preprocessFileLineNumbers (_base+"sched_oneachframe.sqf");
-call compile preprocessFileLineNumbers (_base+"sched_towngenerator.sqf");
call compile preprocessFileLineNumbers (_base+"sched_throwable.sqf");
-call compile preprocessFileLineNumbers (_base+"sched_planthint.sqf");
call compile preprocessFileLineNumbers (_base+"sched_bloodstains.sqf");
call compile preprocessFileLineNumbers (_base+"sched_animals.sqf");
call compile preprocessFileLineNumbers (_base+"sched_buriedZeds.sqf");
@@ -19,6 +17,11 @@ call compile preprocessFileLineNumbers (_base+"sched_medical.sqf");
call compile preprocessFileLineNumbers (_base+"sched_gui.sqf");
call compile preprocessFileLineNumbers (_base+"sched_buildingBubble.sqf");
+if (dayz_townGenerator) then {
+ call compile preprocessFileLineNumbers (_base+"sched_towngenerator.sqf");
+ call compile preprocessFileLineNumbers (_base+"sched_planthint.sqf");
+};
+
_list = [];
if (!isNil "_this") then { call _this; }; // patch the code before starting the scheduler (the task contents can't be modified after the FSM has started)
if (count _list == 0) then {
@@ -29,14 +32,12 @@ if (count _list == 0) then {
[ 0.2, 0.15, sched_security, sched_security_init ],
[ 0.2, 0.05, sched_antiTP, sched_antiTP_init ],
[ 0.1, 0.01, sched_playerActions ],
- [ 0.2, 0.07, sched_townGenerator, sched_townGenerator_init ],
[ 0.2, 0.12, sched_gui, sched_gui_init ],
[ 2, 0.13, sched_medical_effects, sched_medical_effects_init ],
[ 10, 15.13, sched_medical_effectsSlow ],
[ 6, 24.18, sched_spawnCheck, sched_spawnCheck_init ],
[ 1, 0.63, sched_throwable, sched_throwable_init ],
[ 1, 0.33, sched_medical, sched_medical_init ],
- [ 10, 0.26, sched_plantHint ],
//[ 3, 2.70, sched_achievement, sched_achievement_init ],
[ 4, 2.38, sched_bloodStains, sched_bloodStains_init ],
[ 60, 10.44, sched_animals ],
@@ -45,6 +46,12 @@ if (count _list == 0) then {
[ 60, 20.44, sched_newDay ],
[ 1, 0.51, sched_buriedZeds, sched_buriedZeds_init ]
];
+
+ //Disable townGenerator for alternative maps or when junk is not wanted on Chernarus
+ if (dayz_townGenerator) then {
+ _list set [count _list, [0.2, 0.07, sched_townGenerator, sched_townGenerator_init]];
+ _list set [count _list, [10, 0.26, sched_plantHint]];
+ };
};
_list execFSM (_base+"scheduler.fsm");
diff --git a/SQF/dayz_code/system/scheduler/sched_towngenerator.sqf b/SQF/dayz_code/system/scheduler/sched_towngenerator.sqf
index 6a0e71057..d0806aa59 100644
--- a/SQF/dayz_code/system/scheduler/sched_towngenerator.sqf
+++ b/SQF/dayz_code/system/scheduler/sched_towngenerator.sqf
@@ -161,9 +161,12 @@ sched_townGenerator = {
if ("" != (_x select 1)) then {
_position = _x select 2;
_blocked = false;
- {if (_position distance _x < 150) exitWith {_blocked = true;};} forEach dayz_townGeneratorBlackList;
- //Spawn waterHoleProxies on Chernarus even if townGenerator is disabled (needed for drinking from hands at ponds)
- if ((!_blocked && dayz_townGenerator) or {_x select 1 == "waterHoleProxy" && toLower worldName == "chernarus"}) then {
+ {
+ if (_position distance _x < 150 && {_x select 1 != "waterHoleProxy"}) exitWith {
+ _blocked = true;
+ };
+ } forEach dayz_townGeneratorBlackList;
+ if (!_blocked) then {
_object = (_x select 1) createVehicleLocal [0,0,0];
_object setDir (_x select 3);
_object setPos [_position select 0,_position select 1,0];
diff --git a/SQF/dayz_server/compile/server_playerSetup.sqf b/SQF/dayz_server/compile/server_playerSetup.sqf
index d6d0e357c..e8bb84aeb 100644
--- a/SQF/dayz_server/compile/server_playerSetup.sqf
+++ b/SQF/dayz_server/compile/server_playerSetup.sqf
@@ -226,7 +226,9 @@ _playerObj setVariable ["lastPos",getPosATL _playerObj];
PVCDZ_plr_Login2 = [_worldspace,_state];
_clientID = owner _playerObj;
_clientID publicVariableClient "PVCDZ_plr_Login2";
-_clientID publicVariableClient "PVCDZ_plr_plantSpawner";
+if (dayz_townGenerator) then {
+ _clientID publicVariableClient "PVCDZ_plr_plantSpawner";
+};
//record time started
_playerObj setVariable ["lastTime",time];
diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf
index 474e0a55c..9a755352f 100644
--- a/SQF/dayz_server/init/server_functions.sqf
+++ b/SQF/dayz_server/init/server_functions.sqf
@@ -24,7 +24,6 @@ server_deleteObj = compile preprocessFileLineNumbers "\z\addons\dayz_server\comp
server_playerSync = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerSync.sqf";
zombie_findOwner = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\zombie_findOwner.sqf";
server_Wildgenerate = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\zombie_Wildgenerate.sqf";
-server_plantSpawner = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_plantSpawner.sqf";
base_fireMonitor = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\fire_monitor.sqf";
//server_systemCleanup = compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_cleanup.sqf";
spawnComposition = compile preprocessFileLineNumbers "ca\modules\dyno\data\scripts\objectMapper.sqf"; //"\z\addons\dayz_code\compile\object_mapper.sqf";
diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf
index 30350c33b..72231b9cb 100644
--- a/SQF/dayz_server/system/server_monitor.sqf
+++ b/SQF/dayz_server/system/server_monitor.sqf
@@ -354,8 +354,9 @@ if ((playersNumber west + playersNumber civilian) == 0) exitWith {
diag_log format["HIVE: BENCHMARK - Server_monitor.sqf finished streaming %1 objects in %2 seconds (unscheduled)",_val,diag_tickTime - _timeStart];
// # END OF STREAMING #
-
-call server_plantSpawner; // Draw the pseudo random seeds
+if (dayz_townGenerator) then {
+ call compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_plantSpawner.sqf"; // Draw the pseudo random seeds
+};
[] execFSM "\z\addons\dayz_server\system\server_vehicleSync.fsm";
[] execVM "\z\addons\dayz_server\system\scheduler\sched_init.sqf"; // launch the new task scheduler
diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf
index 46c5f165b..d5f074a07 100644
--- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
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 bb5d22481..b972c9672 100644
--- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf
index b04cc86e4..e19b2e930 100644
--- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf
index cd530bc2e..006034039 100644
--- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf
index 185a7dead..dd3be39ad 100644
--- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf
index fb98edfd2..c3a49f6b5 100644
--- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf
index 1c514b51f..9686d717b 100644
--- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf
index 21c2b8c34..d939fc598 100644
--- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
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 0ed99adc0..fcf78d574 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
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf
index b39296e0b..f2817aa61 100644
--- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf
index 147c1bb0e..923172beb 100644
--- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf
index d38932a98..05b68fa50 100644
--- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
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 a91976908..4c79de5a2 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
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
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 9dbf2934e..f79be09d7 100644
--- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf
index 6bb801fa1..c8266356c 100644
--- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf
index 58acd7194..f1aeabcd1 100644
--- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
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 7606ea286..5d45a9434 100644
--- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf
@@ -139,7 +139,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
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 849018df8..13a85d632 100644
--- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf
index ee950eb9d..72bd58bb4 100644
--- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
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 cf416346a..c323b0cdc 100644
--- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf
index dad583f72..e3a8a9944 100644
--- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
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 657eafb1c..8d79eb619 100644
--- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
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 cdf60be9f..0701750ef 100644
--- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf
+++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf
@@ -138,7 +138,7 @@ if (!isDedicated) then {
if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
- execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
+ if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};