From c15caf5f8f508cbda0102095e389a04f35a7fa97 Mon Sep 17 00:00:00 2001 From: icomrade Date: Fri, 20 Jan 2017 11:51:55 -0500 Subject: [PATCH] Improve BIS_Effects fix #1883 Now stops particle effects loops when wreck is deleted. Exucuted in an EH, so it should resolve any issue where the corepatch fix version, or broken A2 version takes priority. Minor script formating and performance improvements --- SQF/dayz_code/config.cpp | 4 + SQF/dayz_code/init/compiles.sqf | 1 - .../system/BIS_Effects/airdestruction.sqf | 207 +++++++----------- .../BIS_Effects/airdestructionstage2.sqf | 133 +++++------ SQF/dayz_code/system/BIS_Effects/init.sqf | 109 ++++----- .../MPMissions/DayZ_Epoch_1.Takistan/init.sqf | 2 - .../DayZ_Epoch_10.Mountains_ACR/init.sqf | 2 - .../DayZ_Epoch_11.Chernarus/init.sqf | 2 - .../DayZ_Epoch_12.isladuala/init.sqf | 2 - .../MPMissions/DayZ_Epoch_13.Tavi/init.sqf | 2 - .../MPMissions/DayZ_Epoch_15.namalsk/init.sqf | 2 - .../DayZ_Epoch_16.Panthera2/init.sqf | 2 - .../DayZ_Epoch_17.Chernarus/init.sqf | 2 - .../DayZ_Epoch_19.FDF_Isle1_a/init.sqf | 2 - .../MPMissions/DayZ_Epoch_2.Utes/init.sqf | 2 - .../MPMissions/DayZ_Epoch_20.fapovo/init.sqf | 2 - .../MPMissions/DayZ_Epoch_21.Caribou/init.sqf | 2 - .../DayZ_Epoch_22.smd_sahrani_A2/init.sqf | 2 - .../DayZ_Epoch_23.cmr_ovaron/init.sqf | 2 - .../MPMissions/DayZ_Epoch_24.Napf/init.sqf | 2 - .../DayZ_Epoch_25.sauerland/init.sqf | 2 - .../DayZ_Epoch_26.sauerland_winter/init.sqf | 2 - .../DayZ_Epoch_3.Shapur_BAF/init.sqf | 2 - .../MPMissions/DayZ_Epoch_4.Zargabad/init.sqf | 2 - .../DayZ_Epoch_5.Bootcamp_ACR/init.sqf | 2 - .../MPMissions/DayZ_Epoch_7.Lingor/init.sqf | 2 - .../DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf | 2 - .../DayZ_Epoch_9.Woodland_ACR/init.sqf | 2 - 28 files changed, 192 insertions(+), 308 deletions(-) diff --git a/SQF/dayz_code/config.cpp b/SQF/dayz_code/config.cpp index 65bb433cb..6c7f44a36 100644 --- a/SQF/dayz_code/config.cpp +++ b/SQF/dayz_code/config.cpp @@ -92,6 +92,10 @@ class CfgAddons }; }; +class DefaultEventhandlers { + init = "if (isNil 'BIS_Effects_Init_DZE') then {[] call compile preProcessFileLineNumbers '\z\addons\dayz_code\system\BIS_Effects\init.sqf';};"; +}; + #include "Configs\rscTitles.hpp" #include "Configs\CfgWorlds.hpp" #include "Configs\CfgMoves.hpp" diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index 95cdb9328..e05be85d1 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -19,7 +19,6 @@ if (!isDedicated) then { fn_dropItem = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_dropItem.sqf"; fn_dynamicTool = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_dynamicTool.sqf"; fn_nearWaterHole = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_nearWaterHole.sqf"; - BIS_Effects_Burn = compile preprocessFile "\ca\Data\ParticleEffects\SCRIPTS\destruction\burn.sqf"; player_zombieCheck = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_zombieCheck.sqf"; //Run on a players computer, checks if the player is near a zombie player_zombieAttack = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_zombieAttack.sqf"; //Run on a players computer, causes a nearby zombie to attack them player_attackdelay = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_attackfsmdelay.sqf"; diff --git a/SQF/dayz_code/system/BIS_Effects/airdestruction.sqf b/SQF/dayz_code/system/BIS_Effects/airdestruction.sqf index 5fd1fde94..813622b89 100644 --- a/SQF/dayz_code/system/BIS_Effects/airdestruction.sqf +++ b/SQF/dayz_code/system/BIS_Effects/airdestruction.sqf @@ -1,142 +1,83 @@ -private ["_fl","_sm","_expl","_dr","_tv","_i","_wave","_splash","_velz","_v","_int","_t","_pos"]; +private ["_fl","_sm","_expl","_dr","_velocity","_tv","_i","_wave","_splash","_velz","_v","_int","_t","_pos"]; -_v=_this select 0; -_int = (fuel _v)*(8+random 2); -_t=time; +_v =_this select 0; +_int = ((fuel _v) * (8 + (random 2))); +_t = time; +_i = 0; +_dr = 0.2; +_tv = 11; -if (!isDedicated) then { //dw, particle stuff don't need run on dedicated -_fl = "#particlesource" createVehicleLocal getPosATL _v; -_fl attachto [_v,[0,0,0],"destructionEffect2"]; -_fl setParticleRandom [0.3, [1, 1, 0], [0, 0, 0], 0, 0.3, [0, 0, 0, 0], 0, 0]; -_fl setParticleParams [["\Ca\Data\ParticleEffects\Universal\Universal", 16, 10, 32], "", "Billboard", 1, 2, "destructionEffect2", - [0, 0, 5], 0, 10, 7.9, 0.075, [4,7,9,10], [[1, 1, 1, -1], [1, 1, 1, -1], - [1, 1, 1, -1], [1, 1, 1, -0.5], [1, 1, 1, -0]], [1,0.5], 1, 0, "", "", _v]; -_fl setDropInterval 1; +if (!isDedicated) then { + _fl = "#particlesource" createVehicleLocal getPosATL _v; + _fl attachto [_v,[0,0,0],"destructionEffect2"]; + _fl setParticleRandom [0.3, [1, 1, 0], [0, 0, 0], 0, 0.3, [0, 0, 0, 0], 0, 0]; + _fl setParticleParams [["\Ca\Data\ParticleEffects\Universal\Universal", 16, 10, 32], "", "Billboard", 1, 2, "destructionEffect2", + [0, 0, 5], 0, 10, 7.9, 0.075, [4,7,9,10], [[1, 1, 1, -1], [1, 1, 1, -1], + [1, 1, 1, -1], [1, 1, 1, -0.5], [1, 1, 1, -0]], [1,0.5], 1, 0, "", "", _v]; + _fl setDropInterval 1; -_sm = "#particlesource" createVehicleLocal getPosATL _v; -_sm attachto [_v,[0,0,0],"destructionEffect1"]; -_sm setParticleRandom [2, [2, 2, 0], [0, 0, 0], 0, 0.3, [0, 0, 0, 0.1], 0, 0]; -_sm setParticleParams [["\Ca\Data\ParticleEffects\Universal\Universal", 16, 7, 48], "", "Billboard", 1, 5, "destructionEffect1", - [0, 0, 5], 0, 10, 7.9, 0.075, [4,8,12,14], [[0.3, 0.3, 0.3, 1], - [0.45, 0.45, 0.45, 1],[0.6, 0.6, 0.6, 0.6], [0.7, 0.7, 0.7, 0.25], [1, 1, 1, 0]], [0.8,0.3,0.25], 1, 0, "", "", _v]; -_sm setDropInterval 1; - -}; // end of dedicated check - -_i=0; -_dr=0.2; -_tv=11; - - -//Remove weapons/ammo to prevent explosion. Script will create its own explosions (doesnt work?) -removeallweapons _v; -if (local _v) then {_expl=createVehicle ["HelicopterExploSmall", (getPosATL _v), [], 0, "CAN_COLLIDE"];}; - -if (!isDedicated) then { //dw, particle stuff don't need run on dedicated -while {_i <1200 && ((velocity _v select 2)<-20 || (getPosATL _v select 2)>8) && !(alive _v) && !(isnull _v) && (getPosATL _v select 2)>1} do -{ -_tv=abs(velocity _v select 0)+abs(velocity _v select 1)+abs(velocity _v select 2); -if (_tv>2) then {_dr=1/_tv} else {_dr=1}; -_fl setDropInterval _dr; -_sm setDropInterval _dr; -_i=_i+1; -sleep 0.2; + _sm = "#particlesource" createVehicleLocal getPosATL _v; + _sm attachto [_v,[0,0,0],"destructionEffect1"]; + _sm setParticleRandom [2, [2, 2, 0], [0, 0, 0], 0, 0.3, [0, 0, 0, 0.1], 0, 0]; + _sm setParticleParams [["\Ca\Data\ParticleEffects\Universal\Universal", 16, 7, 48], "", "Billboard", 1, 5, "destructionEffect1", + [0, 0, 5], 0, 10, 7.9, 0.075, [4,8,12,14], [[0.3, 0.3, 0.3, 1], + [0.45, 0.45, 0.45, 1],[0.6, 0.6, 0.6, 0.6], [0.7, 0.7, 0.7, 0.25], [1, 1, 1, 0]], [0.8,0.3,0.25], 1, 0, "", "", _v]; + _sm setDropInterval 1; }; -}; // end of dedicated check -_pos=getPosATL _v; -clearVehicleInit _v; +removeallweapons _v; +if (local _v) then {_expl = createVehicle ["HelicopterExploSmall", (getPosATL _v), [], 0, "CAN_COLLIDE"];}; -if (!isDedicated) then { //dw, particle stuff don't need run on dedicated -deletevehicle _fl;deletevehicle _sm; -}; // end of dedicated check -if (surfaceiswater(_pos) && (_pos select 2)<9 ) then -{ -if (!isDedicated) then { //dw, particle stuff don't need run on dedicated - _wave = "#particlesource" createVehicleLocal getPosATL _v; - _wave attachto [_v,[0,0,0],"destructionEffect1"]; - _wave setParticleRandom [0.3, [1, 1, 0], [0.5, 0.5, 0], 0, 0.3, [0, 0, 0, 0], 0, 0]; - _wave setParticleParams [["\Ca\Data\ParticleEffects\Universal\Universal", 16, 12, 13,0], "", "Billboard", 1, 1.6, "destructionEffect1", - [0, 0, 0], 0, 10, 7.9, 0.075, [3,8], - [[0.7,0.8,1,0.6],[0.85,0.9,1,0.0]], [1000], 1, 0, "", "", _v]; - _wave setparticlecircle [2,[0,16,0]]; - _wave setDropInterval 0.0015; - - _splash = "#particlesource" createVehicleLocal getPosATL _v; - _splash attachto [_v,[0,0,0],"destructionEffect1"]; - _splash setParticleRandom [2, [2, 2, 0], [2, 2, 7], 0, 0.5, [0, 0, 0, 0], 0, 0]; - _splash setParticleParams [["\Ca\Data\ParticleEffects\Universal\Universal", 16, 13, 6, 0], "", "Billboard", 1, 4, "destructionEffect1", - [0, 0, 0], 0, 30, 7.9, 0.075, [8,15], - [[0.7,0.7,0.7,1],[1,1,1,0]], [1000], 1, 0, "", "", _v]; - _splash setparticlecircle [2,[0,3,15]]; - _splash setDropInterval 0.002; - - sleep 0.2; - deletevehicle _wave;deletevehicle _splash; -}; // end of dedicated check - /* - if (local _v) then - { - _wreck=GetText (configFile >> "CfgVehicles" >> (typeof _v) >> "wreck"); - if (_wreck!="") then - { - _pos = getpos _v; - _dir = vectordir _v; - _vecUp = vectorup _v; - _vel = velocity _v; - - clearvehicleinit _v; - _crw= crew _v; - clearvehicleinit _v; - deleteVehicle _v; - _v =(_wreck) createvehicle _pos; - {_x moveincargo _v} foreach _crw; - _v setVectorDirAndUp [_dir,_vecUp]; - _v setFuel 0; - _v setdamage 0; - _v setvelocity _vel; - //Send to garbage collecter so wreck can be deleted later - [_v] call BIS_GC_trashItFunc; - - }; - }; */ -} -else -{ - if (local _v) then +if (!isDedicated) then { + while {(_i < 1200) && ((((velocity _v) select 2) < -20) || (((getPosATL _v) select 2) > 8)) && !(alive _v) && !(isnull _v) && (((getPosATL _v) select 2) > 1)} do { - //_velx = velocity _v select 0; _velx = _velx / 4; - //_vely = velocity _v select 1; _vely = _vely / 4; - _velz=velocity _v select 2; - if (_velz>1) then {_v setvelocity [velocity _v select 0,velocity _v select 1,0]}; - _expl = createVehicle ["HelicopterExploBig", [_pos select 0,_pos select 1,(_pos select 2) + 1], [], 0, "CAN_COLLIDE"]; - sleep 0.05; - /* - _wreck=GetText (configFile >> "CfgVehicles" >> (typeof _v) >> "wreck"); - if (_wreck!="") then - { - _pos = getpos _v; - _dir = vectordir _v; - _vecUp = vectorup _v; - _vel = velocity _v; - - _crw= crew _v; - clearvehicleinit _v; - deleteVehicle _v; - _v =(_wreck) createvehicle _pos; - {_x moveincargo _v} foreach _crw; - //sleep 0.05; - _v setvelocity _vel; - //_v setPos _pos; - _v setvectordir (_dir); - _v setvectorup _vecUp; - _v setFuel 0; - _v setdamage 0; - - - }; */ - //_v setVehicleInit format ["[this, %1, %2]spawn BIS_Effects_AirDestructionStage2",_int, _t]; - //processInitCommands; //ClearvehicleInit done at end of burn script - ["AirDestructionStage2", _v, _int, _t] call BIS_Effects_globalEvent; + _velocity = velocity _v; + _tv = (abs(_velocity select 0) + abs(_velocity select 1) + abs(_velocity select 2)); + if (_tv > 2) then {_dr = (1/_tv)} else {_dr = 1}; + _fl setDropInterval _dr; + _sm setDropInterval _dr; + _i = _i + 1; + sleep 0.2; + }; +}; + +_pos = getPosATL _v; +clearVehicleInit _v; + +if (!isDedicated) then { + deletevehicle _fl; + deletevehicle _sm; +}; + +if (surfaceiswater(_pos) && {(_pos select 2 ) < 9} ) then { + if (!isDedicated) then { + _wave = "#particlesource" createVehicleLocal (getPosATL _v); + _wave attachto [_v,[0,0,0],"destructionEffect1"]; + _wave setParticleRandom [0.3, [1, 1, 0], [0.5, 0.5, 0], 0, 0.3, [0, 0, 0, 0], 0, 0]; + _wave setParticleParams [["\Ca\Data\ParticleEffects\Universal\Universal", 16, 12, 13,0], "", "Billboard", 1, 1.6, "destructionEffect1", + [0, 0, 0], 0, 10, 7.9, 0.075, [3,8], + [[0.7,0.8,1,0.6],[0.85,0.9,1,0.0]], [1000], 1, 0, "", "", _v]; + _wave setparticlecircle [2,[0,16,0]]; + _wave setDropInterval 0.0015; + + _splash = "#particlesource" createVehicleLocal (getPosATL _v); + _splash attachto [_v,[0,0,0],"destructionEffect1"]; + _splash setParticleRandom [2, [2, 2, 0], [2, 2, 7], 0, 0.5, [0, 0, 0, 0], 0, 0]; + _splash setParticleParams [["\Ca\Data\ParticleEffects\Universal\Universal", 16, 13, 6, 0], "", "Billboard", 1, 4, "destructionEffect1", + [0, 0, 0], 0, 30, 7.9, 0.075, [8,15], + [[0.7,0.7,0.7,1],[1,1,1,0]], [1000], 1, 0, "", "", _v]; + _splash setparticlecircle [2,[0,3,15]]; + _splash setDropInterval 0.002; + + sleep 0.2; + deletevehicle _wave;deletevehicle _splash; + }; +} else { + if ((local _v) && {!isNull _v}) then { + _velz = (velocity _v) select 2; + if (_velz > 1) then {_v setvelocity [velocity _v select 0,velocity _v select 1,0]}; + _expl = createVehicle ["HelicopterExploBig", [_pos select 0,_pos select 1,(_pos select 2) + 1], [], 0, "CAN_COLLIDE"]; + sleep 0.05; + ["AirDestructionStage2", _v, _int, _t, (getPosATL _v)] call BIS_Effects_globalEvent; }; }; diff --git a/SQF/dayz_code/system/BIS_Effects/airdestructionstage2.sqf b/SQF/dayz_code/system/BIS_Effects/airdestructionstage2.sqf index 4fef42c78..ee5ae8a68 100644 --- a/SQF/dayz_code/system/BIS_Effects/airdestructionstage2.sqf +++ b/SQF/dayz_code/system/BIS_Effects/airdestructionstage2.sqf @@ -1,88 +1,71 @@ -private ["_dr","_pos","_xv","_yv","_dir","_Crater","_speed","_velz","_tv","_zv","_i","_smoke","_fire","_dirt","_v","_int","_t"]; +private ["_dr","_pos","_vel","_xv","_yv","_zv","_dir","_Crater","_speed","_velz","_tv","_i","_smoke","_fire","_dirt","_v","_int","_t"]; + _v = _this select 0; _int = _this select 1; -_t=_this select 2; -_pos=getPosATL _v; -// Particle effects -if (!isDedicated) then { //dw, particle stuff don't need run on dedicated -_smoke = "#particlesource" createVehicleLocal _pos; -_smoke attachto [_v,[0,0,0],"destructionEffect1"]; -_smoke setParticleParams [["\ca\Data\ParticleEffects\Universal\Universal",16,7,48], - "", "Billboard", 1, 15, [0, 0, 0], [0, 0, 0], 1, 1.275, 1, 0, [8,14], - [[0.1,0.1,0.1,1],[0.1,0.1,0.1,0]], [0.5], 0.1, 0.1, "", "", _v]; -//_smoke setParticleCircle [2,[0,0,0]]; -_smoke setParticleRandom [4, [2, 2, 2], [0, 0, 0], 0, 0, [0, 0, 0, 0], 0, 0]; -_smoke setDropInterval 0.02; +_t = _this select 2; +_pos = _this select 3; -_fire = "#particlesource" createVehicleLocal _pos; -_fire attachto [_v,[0,0,0],"destructionEffect2"]; -/*_fire setParticleParams [["\ca\Data\ParticleEffects\Universal\Universal",16,2,32], "", "Billboard", 1, 1, [0, 1, 0], [0, 0, 0], 1, 1.275, 1, 0, [10,15], - [[1,1,1,-1],[1,1,1,0]], [0.5], 0.01, 0.01, "", "", _v,360]; */ -_fire setParticleParams [["\ca\Data\ParticleEffects\Universal\Universal",16,2,80], - "", "Billboard", 1, 2, [0, 1, 0], [0, 0, 0], 1, 1.275, 1, 0, [7,13], - [[1,1,1,-1],[1,1,1,0]], [0.5], 0.01, 0.01, "", "", _v,360]; -_fire setParticleRandom [0.5, [0.5, 0.5, 0.5], [0, 0, 0], 0, 0, [0, 0, 0, 0], 0, 0]; -_fire setDropInterval 0.01; -/* -_shards = "#particlesource" createVehicleLocal _pos; -//_shards attachto [_v,[0,0,0],"destructionEffect1"]; -_shards setParticleParams [["\CA\Data\ParticleEffects\Shard\shard",1,0,1], "", "SpaceObject", 1, 60, [0, 0, 0], [0, 0, 0], 0, 1.275, 1, 0, [1,1], - [[1,1,1,1]], [0.5], 0, 0, "", "", _v]; - _shards setParticleRandom [30, [1, 1, 0], [0, 0, 0], 0, 0, [0, 0, 0, 0], 0, 0]; -_shards setParticleCircle [2,[0.001,0.001,-0.001]]; -_shards setDropInterval 0.05; -*/ -_dirt = "#particlesource" createVehicleLocal _pos; -_dirt attachto [_v,[0,0,0],"destructionEffect1"]; -_dirt setParticleParams [["\ca\Data\ParticleEffects\Universal\Universal",16,12,9,0], "", "Billboard", 1, 5, [0, 0, 0], [0, 0, 5], 0, 5, 1, 0, [10,20], - [[0.1,0.1,0.1,1],[0.1,0.1,0.1,0.7],[0.1,0.1,0.1,0]], [1000], 0, 0, "", "", _v,360]; - _dirt setParticleRandom [0, [1, 1, 1], [1, 1, 2.5], 0, 0, [0, 0, 0, 0.5], 0, 0]; -_dirt setDropInterval 0.05; +if (!isDedicated) then { + _smoke = "#particlesource" createVehicleLocal _pos; + _smoke attachto [_v,[0,0,0],"destructionEffect1"]; + _smoke setParticleParams [["\ca\Data\ParticleEffects\Universal\Universal",16,7,48], + "", "Billboard", 1, 15, [0, 0, 0], [0, 0, 0], 1, 1.275, 1, 0, [8,14], + [[0.1,0.1,0.1,1],[0.1,0.1,0.1,0]], [0.5], 0.1, 0.1, "", "", _v]; + _smoke setParticleRandom [4, [2, 2, 2], [0, 0, 0], 0, 0, [0, 0, 0, 0], 0, 0]; + _smoke setDropInterval 0.02; + _fire = "#particlesource" createVehicleLocal _pos; + _fire attachto [_v,[0,0,0],"destructionEffect2"]; - //creating ground craters - _i=0; - while {(speed _v) > 0.1} do - { - _pos=getPosATL _v; - _xv=velocity _v select 0; - _yv=velocity _v select 1; - _zv=velocity _v select 2; - _dir = abs(_xv atan2 _yv); + _fire setParticleParams [["\ca\Data\ParticleEffects\Universal\Universal",16,2,80], + "", "Billboard", 1, 2, [0, 1, 0], [0, 0, 0], 1, 1.275, 1, 0, [7,13], + [[1,1,1,-1],[1,1,1,0]], [0.5], 0.01, 0.01, "", "", _v,360]; + _fire setParticleRandom [0.5, [0.5, 0.5, 0.5], [0, 0, 0], 0, 0, [0, 0, 0, 0], 0, 0]; + _fire setDropInterval 0.01; + _dirt = "#particlesource" createVehicleLocal _pos; + _dirt attachto [_v,[0,0,0],"destructionEffect1"]; + _dirt setParticleParams [["\ca\Data\ParticleEffects\Universal\Universal",16,12,9,0], "", "Billboard", 1, 5, [0, 0, 0], [0, 0, 5], 0, 5, 1, 0, [10,20], + [[0.1,0.1,0.1,1],[0.1,0.1,0.1,0.7],[0.1,0.1,0.1,0]], [1000], 0, 0, "", "", _v,360]; + _dirt setParticleRandom [0, [1, 1, 1], [1, 1, 2.5], 0, 0, [0, 0, 0, 0.5], 0, 0]; + _dirt setDropInterval 0.05; - _Crater= "CraterLong" createvehiclelocal [_pos select 0, _pos select 1, 0]; - _Crater setdir (_dir + (180 * _i)); - _Crater setpos [_pos select 0, _pos select 1, 0]; - _Crater setPos [_pos select 0, _pos select 1, ((0 - _i)/13)]; //all setpos commands so it is placed correctly on sloped terrain - _speed = (speed _v); - _velz=velocity _v select 2; + _i = 0; + while {(speed _v) > 0.1 && (!isNull _v)} do + { + _pos = getPosATL _v; + _vel = velocity _v; + _xv =_vel select 0; + _yv = _vel select 1; + _zv = _vel select 2; + _dir = abs(_xv atan2 _yv); + _Crater= "CraterLong" createvehiclelocal [_pos select 0, _pos select 1, 0]; + _Crater setdir (_dir + (180 * _i)); + _Crater setpos [_pos select 0, _pos select 1, 0]; + _Crater setPos [_pos select 0, _pos select 1, ((0 - _i)/13)]; + _speed = (speed _v); + _velz = _vel select 2; + if (_velz > 1) then {_v setvelocity [(_xv/1.3),(_yv/1.3),0]} + else {_v setvelocity [(_xv/1.2),(_yv/1.2),(velocity _v) select 2]}; + _tv = (abs(_xv) + abs(_yv) + abs(_zv)); + if (_tv > 2) then {_dr = (1/_tv)} else {_dr = 1}; + _smoke setDropInterval (_dr * 1.5); + _fire setDropInterval (_dr * 1.5); + _dirt setDropInterval _dr; + sleep (0.25 - (_speed / 1000)); + _i = _i + 1; + }; - if (_velz>1) then {_v setvelocity [_xv/1.3,_yv/1.3,0]} - else {_v setvelocity [_xv/1.2,_yv/1.2,velocity _v select 2]}; + deleteVehicle _smoke; + deleteVehicle _fire; + deleteVehicle _dirt; - _tv=abs(_xv)+abs(_yv)+abs(_zv); - if (_tv>2) then {_dr=1/_tv} else {_dr=1}; - _smoke setDropInterval _dr*1.5; - _fire setDropInterval _dr*1.5; - _dirt setDropInterval _dr; - //_shards setDropInterval _dr; - - sleep (0.25 - (_speed / 1000)); - _i = _i + 1; - }; -deleteVehicle _smoke; -deleteVehicle _fire; -//deleteVehicle _shards; -deleteVehicle _dirt; - -}; // end of dedicated check +}; _v setvelocity [0,0,-0.1]; -if (local _v) then -{ - //_v setVehicleInit format ["[this, %1, %2,false,true]spawn BIS_Effects_Burn",_int, _t]; - //processInitCommands; //ClearvehicleInit done at end of burn script + +if (local _v && (!isNull _v)) then { ["Burn", _v, _int, _t] call BIS_Effects_globalEvent; [_v,_int,false] spawn BIS_Effects_Secondaries; }; + sleep 0.5; -_v setvelocity [0,0,-0.01]; +_v setvelocity [0,0,-0.01]; \ No newline at end of file diff --git a/SQF/dayz_code/system/BIS_Effects/init.sqf b/SQF/dayz_code/system/BIS_Effects/init.sqf index f7488bf44..79ef6e499 100644 --- a/SQF/dayz_code/system/BIS_Effects/init.sqf +++ b/SQF/dayz_code/system/BIS_Effects/init.sqf @@ -1,58 +1,61 @@ -BIS_Effects_Init = true; //A2 won't overwrite this if var is not nil -/* BIS_Effects_* fixes from Dwarden */ -diag_log "Res3tting B!S effects..."; -BIS_Effects_EH_Fired=compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\fired.sqf"; // Allows tanks to use smoke counter measures -BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; -BIS_Effects_Rifle = {false}; -BIS_Effects_Cannon=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\cannon.sqf"; -BIS_Effects_HeavyCaliber=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\heavycaliber.sqf"; -BIS_Effects_HeavySniper=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\heavysniper.sqf"; -BIS_Effects_Rocket=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\rocket.sqf"; -BIS_Effects_SmokeShell=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\smokeshell.sqf"; -BIS_Effects_SmokeLauncher=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\smokelauncher.sqf"; -BIS_Effects_Flares=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\flares.sqf"; -BIS_Effects_Burn=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\destruction\burn.sqf"; -BIS_Effects_AircraftVapour=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\misc\aircraftvapour.sqf"; -BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; -BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; -BIS_Effects_Secondaries = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\secondaries.sqf"; -BIS_Effects_globalEvent = { - BIS_effects_gepv = _this; - publicVariable "BIS_effects_gepv"; - _this call BIS_Effects_startEvent; - -}; -BIS_Effects_startEvent = { - private "_KillEject"; - _KillEject = { - private "_cancel"; - if (((vehicle player) == (_this select 0)) && {(vehicle player) != player} && {player in (crew (_This select 0))}) then { - _cancel = false; - { - if ((isInTraderCity || !canbuild) && {(player distance (_x select 0)) < (_x select 1)}) exitWith {_cancel = true;}; - } count DZE_SafeZonePosArray; - player action ["getOut", (_this select 0)]; - if (!_cancel && {!((_this select 0) iskindof "car")}) then { - [player, "explosion"] call player_death; +BIS_Effects_Init = true; + +if (isNil "BIS_Effects_Init_DZE") then { + BIS_Effects_Init_DZE = true; + diag_log "Res3tting B!S effects..."; + BIS_Effects_EH_Fired=compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\fired.sqf"; // Allows tanks to use smoke counter measures + BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.sqf"; + BIS_Effects_Rifle = {false}; + BIS_Effects_Cannon=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\cannon.sqf"; + BIS_Effects_HeavyCaliber=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\heavycaliber.sqf"; + BIS_Effects_HeavySniper=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\heavysniper.sqf"; + BIS_Effects_Rocket=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\rocket.sqf"; + BIS_Effects_SmokeShell=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\smokeshell.sqf"; + BIS_Effects_SmokeLauncher=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\smokelauncher.sqf"; + BIS_Effects_Flares=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\muzzle\flares.sqf"; + BIS_Effects_Burn=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\destruction\burn.sqf"; + BIS_Effects_AircraftVapour=compile preprocessFileLineNumbers "\ca\Data\ParticleEffects\SCRIPTS\misc\aircraftvapour.sqf"; + BIS_Effects_AirDestruction = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestruction.sqf"; + BIS_Effects_AirDestructionStage2 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\AirDestructionStage2.sqf"; + BIS_Effects_Secondaries = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\secondaries.sqf"; + BIS_Effects_globalEvent = { + BIS_effects_gepv = _this; + publicVariable "BIS_effects_gepv"; + _this call BIS_Effects_startEvent; + + }; + BIS_Effects_startEvent = { + private "_KillEject"; + _KillEject = { + private "_cancel"; + if (((vehicle player) == (_this select 0)) && {(vehicle player) != player} && {player in (crew (_This select 0))}) then { + _cancel = false; + { + if ((isInTraderCity || !canbuild) && {(player distance (_x select 0)) < (_x select 1)}) exitWith {_cancel = true;}; + } count DZE_SafeZonePosArray; + player action ["getOut", (_this select 0)]; + if (!_cancel && {!((_this select 0) iskindof "car")}) then { + [player, "explosion"] call player_death; + }; + }; + }; + switch (_this select 0) do { + case "AirDestruction": { + [_this select 1] spawn BIS_Effects_AirDestruction; + [_This select 1] call _KillEject; + }; + case "AirDestructionStage2": { + [_this select 1, _this select 2, _this select 3, _this select 4] spawn BIS_Effects_AirDestructionStage2; + }; + case "Burn": { + [_this select 1, _this select 2, _this select 3, false, true, _this select 4] spawn BIS_Effects_Burn; + }; + case "Eject": { + [_This select 1] call _KillEject; }; }; }; - switch (_this select 0) do { - case "AirDestruction": { - [_this select 1] spawn BIS_Effects_AirDestruction; - [_This select 1] call _KillEject; - }; - case "AirDestructionStage2": { - [_this select 1, _this select 2, _this select 3] spawn BIS_Effects_AirDestructionStage2; - }; - case "Burn": { - [_this select 1, _this select 2, _this select 3, false, true] spawn BIS_Effects_Burn; - }; - case "Eject": { - [_This select 1] call _KillEject; - }; + "BIS_effects_gepv" addPublicVariableEventHandler { + (_this select 1) call BIS_Effects_startEvent; }; -}; -"BIS_effects_gepv" addPublicVariableEventHandler { - (_this select 1) call BIS_Effects_startEvent; }; \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf index c17598c47..46c5f165b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\takistan.sqf"; //Add trader city objects locally on each machine early 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 e107341b2..bb5d22481 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\mountains_acr.sqf"; //Add trader city objects locally on each machine early diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf index 04f4c39c3..b04cc86e4 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus11.sqf"; //Add trader city objects locally on each machine early diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf index c040a9bda..cd530bc2e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\isladuala.sqf"; //Add trader city objects locally on each machine early diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf index fc1af382b..185a7dead 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\tavi.sqf"; //Add trader city objects locally on each machine early diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf index edcddbb46..fb98edfd2 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\namalsk.sqf"; //Add trader city objects locally on each machine early diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf index bf88cb265..1c514b51f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\panthera2.sqf"; //Add trader city objects locally on each machine early diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf index 7ce3891da..21c2b8c34 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus17.sqf"; //Add trader city objects locally on each machine early 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 c21675413..0ed99adc0 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 @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\fdf_isle1_a.sqf"; //Add trader city objects locally on each machine early diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf index b78eef6fd..b39296e0b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\utes.sqf"; //Add trader city objects locally on each machine early diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf index 72104cb83..147c1bb0e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\fapovo.sqf"; //Add trader city objects locally on each machine early diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf index 4fb388d4e..d38932a98 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\caribou.sqf"; //Add trader city objects locally on each machine early 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 6a10f090f..a91976908 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 @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\smd_sahrani_a2.sqf"; //Add trader city objects locally on each machine early 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 baf1c2e95..9dbf2934e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\cmr_ovaron.sqf"; //Add trader city objects locally on each machine early diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf index 6725a9844..6bb801fa1 100644 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\napf.sqf"; //Add trader city objects locally on each machine early diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf index bab4fb882..58acd7194 100644 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\sauerland.sqf"; //Add trader city objects locally on each machine early 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 0846d442a..7606ea286 100644 --- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "custom\compiles.sqf"; //Compile custom compiles 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 e7b5142a3..849018df8 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\shapur_baf.sqf"; //Add trader city objects locally on each machine early diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf index 218db8e38..ee950eb9d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\zargabad.sqf"; //Add trader city objects locally on each machine early 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 0d78cb28d..cf416346a 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\bootcamp_acr.sqf"; //Add trader city objects locally on each machine early diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf index a1c076616..dad583f72 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\lingor.sqf"; //Add trader city objects locally on each machine early 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 5e783d79b..657eafb1c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\provinggrounds_pmc.sqf"; //Add trader city objects locally on each machine early 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 57368c29d..cdf60be9f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf @@ -98,8 +98,6 @@ progressLoadingScreen 0.1; call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf"; progressLoadingScreen 0.15; call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf"; -progressLoadingScreen 0.2; -call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf"; progressLoadingScreen 0.25; call compile preprocessFileLineNumbers "server_traders.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\woodland_acr.sqf"; //Add trader city objects locally on each machine early