From d13aafcd0cb69b5b57d4afa40f725f4c89863fac Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Wed, 19 Oct 2016 15:49:17 -0400 Subject: [PATCH] Add streamer mode game options setting The chat list does not appear to be toggleable on the fly because it is a display with no accessible controls. Giving it an idd and using closeDisplay did not work. So it needs to be manually set off screen in its config or covered up. --- CHANGE LOG 1.0.6.txt | 1 + SQF/dayz_code/Configs/rscTitles.hpp | 145 ++++++++++++++---- .../compile/player_toggleStreamerMode.sqf | 15 ++ SQF/dayz_code/init/compiles.sqf | 1 + SQF/dayz_code/stringtable.xml | 30 ++++ SQF/dayz_code/system/watermark.sqf | 4 + .../MPMissions/DayZ_Epoch_1.Takistan/init.sqf | 2 +- .../DayZ_Epoch_1.Takistan/rules.sqf | 1 - .../DayZ_Epoch_10.Mountains_ACR/init.sqf | 2 +- .../DayZ_Epoch_10.Mountains_ACR/rules.sqf | 1 - .../DayZ_Epoch_11.Chernarus/init.sqf | 2 +- .../DayZ_Epoch_11.Chernarus/rules.sqf | 1 - .../DayZ_Epoch_12.isladuala/init.sqf | 2 +- .../DayZ_Epoch_12.isladuala/rules.sqf | 1 - .../MPMissions/DayZ_Epoch_13.Tavi/init.sqf | 2 +- .../MPMissions/DayZ_Epoch_13.Tavi/rules.sqf | 1 - .../MPMissions/DayZ_Epoch_15.namalsk/init.sqf | 2 +- .../DayZ_Epoch_15.namalsk/rules.sqf | 1 - .../DayZ_Epoch_16.Panthera2/init.sqf | 2 +- .../DayZ_Epoch_16.Panthera2/rules.sqf | 1 - .../DayZ_Epoch_17.Chernarus/init.sqf | 2 +- .../DayZ_Epoch_17.Chernarus/rules.sqf | 1 - .../DayZ_Epoch_19.FDF_Isle1_a/init.sqf | 2 +- .../DayZ_Epoch_19.FDF_Isle1_a/rules.sqf | 1 - .../MPMissions/DayZ_Epoch_2.Utes/init.sqf | 2 +- .../MPMissions/DayZ_Epoch_2.Utes/rules.sqf | 1 - .../MPMissions/DayZ_Epoch_20.fapovo/init.sqf | 2 +- .../MPMissions/DayZ_Epoch_20.fapovo/rules.sqf | 1 - .../MPMissions/DayZ_Epoch_21.Caribou/init.sqf | 2 +- .../DayZ_Epoch_21.Caribou/rules.sqf | 1 - .../DayZ_Epoch_22.smd_sahrani_A2/init.sqf | 2 +- .../DayZ_Epoch_22.smd_sahrani_A2/rules.sqf | 1 - .../DayZ_Epoch_23.cmr_ovaron/init.sqf | 2 +- .../DayZ_Epoch_23.cmr_ovaron/rules.sqf | 1 - .../MPMissions/DayZ_Epoch_24.Napf/init.sqf | 2 +- .../MPMissions/DayZ_Epoch_24.Napf/rules.sqf | 1 - .../DayZ_Epoch_25.sauerland/init.sqf | 2 +- .../DayZ_Epoch_25.sauerland/rules.sqf | 1 - .../DayZ_Epoch_26.sauerland_winter/init.sqf | 2 +- .../DayZ_Epoch_26.sauerland_winter/rules.sqf | 1 - .../DayZ_Epoch_3.Shapur_BAF/init.sqf | 2 +- .../DayZ_Epoch_3.Shapur_BAF/rules.sqf | 1 - .../MPMissions/DayZ_Epoch_4.Zargabad/init.sqf | 2 +- .../DayZ_Epoch_4.Zargabad/rules.sqf | 1 - .../DayZ_Epoch_5.Bootcamp_ACR/init.sqf | 2 +- .../DayZ_Epoch_5.Bootcamp_ACR/rules.sqf | 1 - .../MPMissions/DayZ_Epoch_7.Lingor/init.sqf | 2 +- .../MPMissions/DayZ_Epoch_7.Lingor/rules.sqf | 1 - .../DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf | 2 +- .../DayZ_Epoch_8.ProvingGrounds_PMC/rules.sqf | 1 - .../DayZ_Epoch_9.Woodland_ACR/init.sqf | 2 +- .../DayZ_Epoch_9.Woodland_ACR/rules.sqf | 1 - 52 files changed, 190 insertions(+), 75 deletions(-) create mode 100644 SQF/dayz_code/compile/player_toggleStreamerMode.sqf diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt index 39f988377..76756a2fe 100644 --- a/CHANGE LOG 1.0.6.txt +++ b/CHANGE LOG 1.0.6.txt @@ -7,6 +7,7 @@ [NEW] 1.8.8 weapon switching system and hotkeys (1 = primary, 2 = pistol, 3 = melee (or rifle onBack if DZE_TwoPrimaries=2;)) [NEW] Players can carry more than one primary weapon which allows the abillity to hide one on their back, configure using DZE_TwoPrimaries. See configVariables.sqf for details @icomrade [NEW] Optional news/rules feed on player login, set dayz_enableRules in init.sqf +[NEW] Streamer mode is toggleable by player in game options. Setting enabled hides server water mark and rules feed. @ebaydayz [NEW] Status UI icons are toggleable between "vanilla","epoch","dark" set DZE_UI in init.sqf @ebaydayz [NEW] Optional dark UI by @hogscraper http://epochmod.com/forum/index.php?/topic/13654-proposed-ui-change/ code fixes by @SplenectomY @icomrade #1622 [NEW] If using the vanilla UI you may enable or disable the combat icon with DZE_VanillaUICombatIcon = true/false; @icomrade diff --git a/SQF/dayz_code/Configs/rscTitles.hpp b/SQF/dayz_code/Configs/rscTitles.hpp index 4ca7b02c0..c5491cfc8 100644 --- a/SQF/dayz_code/Configs/rscTitles.hpp +++ b/SQF/dayz_code/Configs/rscTitles.hpp @@ -9,7 +9,6 @@ class RscIGUIShortcutButton; class RscGearShortcutButton; class RscIGUIListNBox; class RscActiveText; - class RscPictureKeepAspect; class RscStandardDisplay; class RscProgress; @@ -19,6 +18,9 @@ class RscObject; class IGUIBack; class RscListBox; class RscIGUIListBox; +class RscXListBox; +class RscXSliderH; +class RscShortcutButton; class RscHTML; class RscDisplayEmpty; @@ -43,6 +45,119 @@ class RscDisplayConfigure { class controlsBackground; class controls; }; +class RscDisplayGameOptions { + movingEnable = 1; + enableDisplay = 1; + onLoad = "{(_this select 0) displayCtrl 140 lbAdd _x;} forEach [localize 'STR_UI_DISABLED',localize 'STR_UI_ENABLED']; (_this select 0) displayCtrl 140 lbSetCurSel (profileNamespace getVariable ['streamerMode',0]); uiNamespace setVariable ['streamerMode',(profileNamespace getVariable ['streamerMode',0])];"; + onUnload = "call ui_changeDisplay;"; + class controlsBackground; + class controls { + class CA_Title : CA_Title { + x = 0.18; + y = 0.192; + text = $STR_DISP_OPTIONS_GAME_OPTIONS; + }; + class CA_TextLanguage : RscText { + x = 0.159803; + y = (0.420549 + -2*0.069854); + text = $STR_DISP_OPT_LANGUAGE; + }; + class CA_ValueLanguage : RscXListBox { + idc = 135; + x = 0.400534; + y = (0.420549 + -2*0.069854); + w = 0.3; + }; + class CA_TextSubtitles : CA_TextLanguage { + x = 0.159803; + y = (0.420549 + -1*0.069854); + text = $STR_OPT_SUBTITLES; + }; + class CA_ValueSubtitles : CA_ValueLanguage { + idc = 102; + x = 0.400534; + y = (0.420549 + -1*0.069854); + w = 0.3; + }; + class CA_RadioSubtitles : CA_TextLanguage { + x = 0.159803; + y = (0.420549 + 0*0.069854); + text = $STR_OPT_RADIO_SUBTITLES; + }; + class CA_ValueRadio : CA_ValueLanguage { + idc = 103; + y = (0.420549 + 0*0.069854); + }; + class CA_TextGore : CA_TextLanguage { + idc = 122; + x = 0.159803; + y = (0.420549 + 1*0.069854); + text = $STR_DISP_OPT_BLOOD; + }; + class CA_ValueBlood : CA_ValueLanguage { + idc = 119; + y = (0.420549 + 1*0.069854); + }; + class CA_TextFloatingZone : CA_TextLanguage { + x = 0.159803; + y = (0.420549 + 2*0.069854); + text = $STR_DISP_CONF_FLOATING_ZONE; + }; + class CA_ValueFloatingZone : RscXSliderH { + idc = 109; + x = 0.400534; + y = (0.420549 + 2*0.069854); + w = 0.3; + }; + class CA_TextHeadBob : CA_TextLanguage { + x = 0.159803; + y = (0.420549 + 3*0.069854); + text = $STR_DISP_OPT_HEADBOB; + }; + class CA_ValueHeadBob : RscXSliderH { + idc = 138; + x = 0.400534; + y = (0.420549 + 3*0.069854); + w = 0.3; + }; + class CA_TextStreamerMode : CA_TextLanguage { + x = 0.159803; + y = (0.420549 + 4*0.069854); + text = $STR_UI_STREAMER_MODE; + }; + class CA_ValueStreamerMode : CA_ValueLanguage { + idc = 140; + y = (0.420549 + 4*0.069854); + tooltip = $STR_UI_STREAMER_MODE_TOOLTIP; + onLBSelChanged = "profileNamespace setVariable ['streamerMode',(lbCurSel (_this select 0))];"; + }; + class CA_ButtonCancel : RscShortcutButton { + idc = 2; + shortcuts[] = {0x00050000 + 1}; + x = 0.151; + y = 0.7625; + text = $STR_DISP_CANCEL; + //reset to original value + onButtonClick = "profileNamespace setVariable ['streamerMode',(uiNamespace getVariable 'streamerMode')]; saveProfileNamespace; if (!isNil 'player_toggleStreamerMode') then {call player_toggleStreamerMode;};"; + }; + class CA_ButtonDefault : RscShortcutButton { + idc = 304; + shortcuts[] = {0x00050000 + 2}; + x = 0.338; + y = 0.7625; + text = $STR_DISP_OPTIONS_DIFFICULTY; + }; + class CA_ButtonContinue : RscShortcutButton { + idc = 1; + shortcuts[] = {0x00050000 + 0, 28, 57, 156}; + x = 0.525; + y = 0.7625; + text = $STR_DISP_OK; + default = 1; + onButtonClick = "saveProfileNamespace; if (!isNil 'player_toggleStreamerMode') then {call player_toggleStreamerMode;};"; + }; + }; +}; class RscDisplayChat { idd = 24; @@ -150,7 +265,6 @@ class RscDisplayDebriefing: RscStandardDisplay delete Mainback; }; }; -class RscShortcutButton; class RscShortcutButtonMain; // RscDisplayMultiplayerSetup moved here: @@ -197,33 +311,6 @@ class RscDisplayMissionFail: RscStandardDisplay }; }; - -class CA_TextLanguage; -class RscXListBox; - -class RscDisplayGameOptions -{ - //onLoad = "((_this select 0) displayCtrl 140) lbAdd 'Default';((_this select 0) displayCtrl 140) lbAdd 'Debug';((_this select 0) displayCtrl 140) lbAdd 'None';((_this select 0) displayCtrl 140) lbSetCurSel (uiNamespace getVariable ['DZ_displayUI', 0]);"; - onUnload = "call ui_changeDisplay;"; /*diag_log[diag_tickTime,'RscDisplayGameOptions'];*/ - /*class controls - { - class CA_TextUIDisplay: CA_TextLanguage - { - x = 0.159803; - y = "(0.420549 + 4*0.069854)"; - text = "DayZ UI:"; - }; - class CA_ValueUIDisplay: RscXListBox - { - idc = 140; - x = 0.400534; - y = "(0.420549 + 4*0.069854)"; - w = 0.3; - onLBSelChanged = "(uiNamespace setVariable ['DZ_displayUI', (_this select 1)]);"; - }; - };*/ -}; - class RscDisplayMain : RscStandardDisplay { class controlsBackground diff --git a/SQF/dayz_code/compile/player_toggleStreamerMode.sqf b/SQF/dayz_code/compile/player_toggleStreamerMode.sqf new file mode 100644 index 000000000..bfdb0bcdd --- /dev/null +++ b/SQF/dayz_code/compile/player_toggleStreamerMode.sqf @@ -0,0 +1,15 @@ +private "_display"; +disableSerialization; +_display = uiNamespace getVariable ["wm_disp",displayNull]; + +if (!isNull _display) then { + if (profileNamespace getVariable ["streamerMode",0] == 1) then { + _display displayCtrl 1 ctrlShow false; + if (!isNil "dayz_rulesHandle") then { + terminate dayz_rulesHandle; + dayz_rulesHandle = nil; + }; + } else { + _display displayCtrl 1 ctrlShow true; + }; +}; \ No newline at end of file diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index 520e245d9..6472fea03 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -126,6 +126,7 @@ if (!isDedicated) then { //ui player_toggleSoundMute = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_toggleSoundMute.sqf"; + player_toggleStreamerMode = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_toggleStreamerMode.sqf"; player_selectSlot = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\ui_selectSlot.sqf"; player_selectWeapon = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_selectWeapon.sqf"; player_gearSet = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_gearSet.sqf"; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 01b06e9de..2b1499aca 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -7784,6 +7784,36 @@ Please change your controls. HoldBreath holds too many keys and has been blocked. Bitte ändere deine Steuerung. "Luft anhalten" liegt auf mehr als einer Taste und wurde blockiert. + + Streamer mode: + + + Hides server watermark and rules feed + + + Enabled + Activé + Activado + Attivato + Engedélyezve + włączony + Включен + Aktiviert + Povolen + 有効 + + + Disabled + Désactivé + Desactivado + Disattivato + Kikapcsolva + Wyłączone + Откл. + Deaktiviert + Zakázáno + 無効 + diff --git a/SQF/dayz_code/system/watermark.sqf b/SQF/dayz_code/system/watermark.sqf index 2328accb0..f80a4ebc7 100644 --- a/SQF/dayz_code/system/watermark.sqf +++ b/SQF/dayz_code/system/watermark.sqf @@ -4,4 +4,8 @@ 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 584dbcc05..0aeef0389 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/rules.sqf index a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ 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 12aa6c67c..db41af028 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; 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 a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf index 8ded4c682..4d66e2beb 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/rules.sqf index a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf index 3d3138bc2..670ee82e1 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/rules.sqf index a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf index 1fb71a7d5..4887fe274 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/rules.sqf index a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf index 6164a130b..d885d46d3 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/rules.sqf index a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf index ddfcc8d5f..90f025357 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/rules.sqf index a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf index 63a32052b..7223717da 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/rules.sqf index a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ 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 d114af56d..e6091b73f 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; 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 a434f9bbc..95c0a3795 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,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf index 15ed764b4..9da4ca5c4 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/rules.sqf index a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf index 2cb3a0dd9..33cecf6c7 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/rules.sqf index a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf index 233689d8d..9e853a4d1 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/rules.sqf index a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ 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 fcc12f490..f0f6acd42 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; 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 a434f9bbc..95c0a3795 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,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ 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 efbbdec40..081c86fd0 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; 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 a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf index 083d6b3c7..c54edc708 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/rules.sqf index a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf index 3aebf4168..a320f13be 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/rules.sqf index a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ 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 e3445e398..c8f702396 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; 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 a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ 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 b2c0c88d8..e3d4e88f4 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; 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 a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf index c9659f8b2..56ce25ed6 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/rules.sqf index a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ 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 61f9fcb66..335c81c90 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; 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 a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf index 49415bf2b..32adfad18 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/rules.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/rules.sqf index a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ 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 643269786..57f168d53 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; 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 a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [ 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 bd7772bc3..91693fc01 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 { ([4654,9595,0] nearestObject 145260) setDamage 1; }; - if (dayz_enableRules) then { execVM "rules.sqf"; }; + 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"; execFSM "\z\addons\dayz_code\system\player_monitor.fsm"; 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 a434f9bbc..95c0a3795 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/rules.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/rules.sqf @@ -1,6 +1,5 @@ private ["_messages","_timeout"]; -if (isServer) exitWith {}; waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")}; _messages = [