From 99ed783fa764bae0b1762081557c4a2efc23b593 Mon Sep 17 00:00:00 2001 From: Skaronator Date: Mon, 4 Nov 2013 14:15:53 +0100 Subject: [PATCH] Remove waitUntil Mission should be run instancly w/o any sleeps or waitUntil (tip from rocket) --- .../MPMissions/DayZ_Epoch_1.Takistan/init.sqf | 12 ------------ .../DayZ_Epoch_10.Mountains_ACR/init.sqf | 12 ------------ .../MPMissions/DayZ_Epoch_11.Chernarus/init.sqf | 12 ------------ .../MPMissions/DayZ_Epoch_12.isladuala/init.sqf | 12 ------------ .../MPMissions/DayZ_Epoch_13.Tavi/init.sqf | 12 ------------ .../MPMissions/DayZ_Epoch_15.namalsk/init.sqf | 12 ------------ .../MPMissions/DayZ_Epoch_16.Panthera2/init.sqf | 12 ------------ .../MPMissions/DayZ_Epoch_17.Chernarus/init.sqf | 12 ------------ .../MPMissions/DayZ_Epoch_18.Sara/init.sqf | 12 ------------ .../MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf | 12 ------------ Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf | 12 ------------ .../MPMissions/DayZ_Epoch_20.fapovo/init.sqf | 12 ------------ .../MPMissions/DayZ_Epoch_21.Caribou/init.sqf | 14 +------------- .../MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf | 12 ------------ .../MPMissions/DayZ_Epoch_4.Zargabad/init.sqf | 12 ------------ .../MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf | 12 ------------ .../MPMissions/DayZ_Epoch_6.Dingor/init.sqf | 12 ------------ .../MPMissions/DayZ_Epoch_7.Lingor/init.sqf | 12 ------------ .../DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf | 12 ------------ .../MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf | 12 ------------ Server Files/MPMissions/TEMPLATE/init.sqf | 14 +------------- 21 files changed, 2 insertions(+), 254 deletions(-) diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf index fb5347e9c..30d6e1b82 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf @@ -79,18 +79,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs 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 46f776d08..a1124513c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf @@ -79,18 +79,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf index a8d103ba5..08afe55aa 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf @@ -79,18 +79,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf index a43fa55a1..ccefd6f79 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf @@ -79,18 +79,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf index d865137e4..c8cb1c25e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf @@ -85,18 +85,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf index c32292178..781e57bc0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf @@ -81,18 +81,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf index 783f13d98..1dee8a856 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf @@ -52,18 +52,6 @@ progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf index a8d103ba5..08afe55aa 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf @@ -79,18 +79,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs diff --git a/Server Files/MPMissions/DayZ_Epoch_18.Sara/init.sqf b/Server Files/MPMissions/DayZ_Epoch_18.Sara/init.sqf index 568b958af..cd214a48e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_18.Sara/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_18.Sara/init.sqf @@ -50,18 +50,6 @@ progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs 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 fee250ab8..d34a46dbd 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 @@ -78,18 +78,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf index a22c83849..7247af575 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf @@ -79,18 +79,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf index e8070b99d..e68b624a1 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf @@ -79,18 +79,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf index 4e4a16ce6..9c8bccf23 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf @@ -20,7 +20,7 @@ enableRadio false; // DayZ Epoch config spawnShoremode = 1; // Default = 1 (on shore) spawnArea = 1500; // Default = 1500 -MaxHeliCrashes= 5; // Default = 5 +MaxHeliCrashes = 5; // Default = 5 MaxVehicleLimit = 200; // Default = 50 MaxDynamicDebris = 250; // Default = 100 dayz_MapArea = 6000; // Default = 10000 @@ -79,18 +79,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs 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 3076354c6..6c5ce3351 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf @@ -79,18 +79,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf index f537940d3..fb893c21d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf @@ -79,18 +79,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs 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 1d954fc27..ac2cdc8ad 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf @@ -79,18 +79,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs diff --git a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/init.sqf index f198c6ed6..d0d87bb15 100644 --- a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/init.sqf @@ -80,18 +80,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf index dd5e5c6c2..4ac9b046b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf @@ -80,18 +80,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs 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 038eef414..7167da753 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf @@ -79,18 +79,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs 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 b4121bf64..85c223f31 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf @@ -79,18 +79,6 @@ BIS_Effects_startEvent = { (_this select 1) call BIS_Effects_startEvent; }; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs diff --git a/Server Files/MPMissions/TEMPLATE/init.sqf b/Server Files/MPMissions/TEMPLATE/init.sqf index 1dabfa9f7..4af8f2e71 100644 --- a/Server Files/MPMissions/TEMPLATE/init.sqf +++ b/Server Files/MPMissions/TEMPLATE/init.sqf @@ -20,7 +20,7 @@ enableRadio false; // DayZ Epochconfig spawnShoremode = 0; // Default = 1 (on shore) spawnArea= 500; // Default = 1500 -MaxHeliCrashes= 3; // Default = 5 +MaxHeliCrashes = 3; // Default = 5 MaxVehicleLimit = 50; // Default = 50 MaxDynamicDebris = 100; // Default = 100 dayz_MapArea = 4000; // Default = 10000 @@ -51,18 +51,6 @@ progressLoadingScreen 1.0; "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; -if ((!isServer) && (isNull player) ) then -{ -waitUntil {!isNull player}; -waitUntil {time > 3}; -}; - -if ((!isServer) && (player != player)) then -{ - waitUntil {player == player}; - waitUntil {time > 3}; -}; - if (isServer) then { call compile preprocessFileLineNumbers "dynamic_vehicle.sqf"; //Compile vehicle configs