From d975def6a1657c5a1d2ac8a15c687ac9d4132bb5 Mon Sep 17 00:00:00 2001 From: ebayShopper Date: Sat, 18 Feb 2017 13:34:49 -0500 Subject: [PATCH] Remove unnecessary rules and watermark waitUntils --- SQF/dayz_code/system/progress_monitor.sqf | 15 ++++++++++++++- SQF/dayz_code/system/watermark.sqf | 11 ----------- .../MPMissions/DayZ_Epoch_1.Takistan/init.sqf | 2 -- .../MPMissions/DayZ_Epoch_1.Takistan/rules.sqf | 2 -- .../DayZ_Epoch_10.Mountains_ACR/init.sqf | 2 -- .../DayZ_Epoch_10.Mountains_ACR/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_11.Chernarus/init.sqf | 2 -- .../MPMissions/DayZ_Epoch_11.Chernarus/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_12.isladuala/init.sqf | 2 -- .../MPMissions/DayZ_Epoch_12.isladuala/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_13.Tavi/init.sqf | 2 -- .../MPMissions/DayZ_Epoch_13.Tavi/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_15.namalsk/init.sqf | 2 -- .../MPMissions/DayZ_Epoch_15.namalsk/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_16.Panthera2/init.sqf | 2 -- .../MPMissions/DayZ_Epoch_16.Panthera2/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_17.Chernarus/init.sqf | 2 -- .../MPMissions/DayZ_Epoch_17.Chernarus/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf | 2 -- .../DayZ_Epoch_19.FDF_Isle1_a/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_2.Utes/init.sqf | 2 -- .../MPMissions/DayZ_Epoch_2.Utes/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_20.fapovo/init.sqf | 2 -- .../MPMissions/DayZ_Epoch_20.fapovo/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_21.Caribou/init.sqf | 2 -- .../MPMissions/DayZ_Epoch_21.Caribou/rules.sqf | 2 -- .../DayZ_Epoch_22.smd_sahrani_A2/init.sqf | 2 -- .../DayZ_Epoch_22.smd_sahrani_A2/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf | 2 -- .../MPMissions/DayZ_Epoch_23.cmr_ovaron/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_24.Napf/init.sqf | 2 -- .../MPMissions/DayZ_Epoch_24.Napf/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_25.sauerland/init.sqf | 2 -- .../MPMissions/DayZ_Epoch_25.sauerland/rules.sqf | 2 -- .../DayZ_Epoch_26.sauerland_winter/init.sqf | 2 -- .../DayZ_Epoch_26.sauerland_winter/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf | 2 -- .../MPMissions/DayZ_Epoch_3.Shapur_BAF/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_4.Zargabad/init.sqf | 2 -- .../MPMissions/DayZ_Epoch_4.Zargabad/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf | 2 -- .../DayZ_Epoch_5.Bootcamp_ACR/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_7.Lingor/init.sqf | 2 -- .../MPMissions/DayZ_Epoch_7.Lingor/rules.sqf | 2 -- .../DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf | 2 -- .../DayZ_Epoch_8.ProvingGrounds_PMC/rules.sqf | 2 -- .../MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf | 2 -- .../DayZ_Epoch_9.Woodland_ACR/rules.sqf | 2 -- 48 files changed, 14 insertions(+), 104 deletions(-) delete mode 100644 SQF/dayz_code/system/watermark.sqf diff --git a/SQF/dayz_code/system/progress_monitor.sqf b/SQF/dayz_code/system/progress_monitor.sqf index 8a0cc42b1..2ff1f9453 100644 --- a/SQF/dayz_code/system/progress_monitor.sqf +++ b/SQF/dayz_code/system/progress_monitor.sqf @@ -1,4 +1,4 @@ -private["_display","_control1","_control2"]; +private["_display","_control1","_control2","_watermark"]; disableSerialization; //diag_log "DEBUG: loadscreen guard started."; @@ -11,6 +11,19 @@ while {true} do { }; if ((!isNil "Dayz_loginCompleted") and {(Dayz_loginCompleted)}) exitWith { //diag_log [ __FILE__, __LINE__, "End loop"]; + + // Logo watermark: adding a logo in the bottom left corner of the screen with the server name + if (!isNil "dayZ_serverName") then { + 5 cutRsc ["wm_disp","PLAIN"]; + _watermark = (uiNamespace getVariable "wm_disp") displayCtrl 1; + _watermark ctrlSetText dayZ_serverName; + if (profileNamespace getVariable ["streamerMode",0] == 1) then {_watermark ctrlShow false;}; + }; + + if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { + dayz_rulesHandle = execVM "rules.sqf"; + }; + if (dayz_groupSystem) then {execVM "\z\addons\dayz_code\groups\init.sqf";}; }; _display = uiNameSpace getVariable "BIS_loadingScreen"; diff --git a/SQF/dayz_code/system/watermark.sqf b/SQF/dayz_code/system/watermark.sqf deleted file mode 100644 index f80a4ebc7..000000000 --- a/SQF/dayz_code/system/watermark.sqf +++ /dev/null @@ -1,11 +0,0 @@ -// Logo watermark: adding a logo in the bottom left corner of the screen with the server name in it -[] spawn { - waitUntil {(!isNull Player) and (alive Player) and (player == player)}; - waituntil {!(isNull (findDisplay 46))}; - 5 cutRsc ["wm_disp","PLAIN"]; - ((uiNamespace getVariable "wm_disp") displayCtrl 1) ctrlSetText dayZ_serverName; - - if (profileNamespace getVariable ["streamerMode",0] == 1) then { - (uiNamespace getVariable "wm_disp") displayCtrl 1 ctrlShow false; - }; -}; diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf index 194d1706a..5be1aa459 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], 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 83dfb885d..9f5e0a210 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf index a39502c21..466555359 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf index ef08b64ad..47d91e27b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf index c49b4bf5b..3e9471966 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf index faff06d39..efae9afbd 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf index 393d30115..c56e5285f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf index aa7786faf..ef489f266 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], 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 a97752786..5e9f1cc98 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 @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf index 453517a9e..b958de3a9 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf index d663f1a23..55ffd8387 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf index 5b55b431e..19d780eea 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], 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 83a80ef08..5934a4fc0 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 @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], 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 90d2cf2d1..944de6fda 100644 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf index ee2e7f27a..50c78d342 100644 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf index 3dee5d473..7a9aaeebc 100644 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], 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 1a7127ccc..54d2be0e7 100644 --- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf @@ -131,8 +131,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], 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 5456e3105..5e3f708d3 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf index cc8da7b8f..6ec5f16b9 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], 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 6d6539807..f69418842 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf index cb4e882a4..dee32e347 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], 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 e66c76a71..d6b517613 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName], 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 2bae509f5..a6525e5b7 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf @@ -130,8 +130,6 @@ if (!isDedicated) then { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - 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"; }; 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"; diff --git a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/rules.sqf index 95c0a3795..c94ee9ba0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/rules.sqf @@ -1,7 +1,5 @@ private ["_messages","_timeout"]; -waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; - _messages = [ ["DayZ Epoch", "Welcome "+(name player)], ["World", worldName],