From 5d374fa928fed012b5e24c47cf94c3d88f314ccb Mon Sep 17 00:00:00 2001 From: HARLAN Date: Tue, 26 Nov 2013 18:23:52 -0500 Subject: [PATCH 1/6] spacing --- .../system/BIS_Effects/airdestruction.sqf | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/SQF/dayz_code/system/BIS_Effects/airdestruction.sqf b/SQF/dayz_code/system/BIS_Effects/airdestruction.sqf index 8c62ae2fd..db6ba690f 100644 --- a/SQF/dayz_code/system/BIS_Effects/airdestruction.sqf +++ b/SQF/dayz_code/system/BIS_Effects/airdestruction.sqf @@ -2,7 +2,7 @@ private["_fl","_sm","_expl","_dr","_tv","_i","_wave","_splash","_velz","_v","_in _v=_this select 0; _int=(fuel _v)*(8+random 2); _t=time; -if(!isDedicated)then{ +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]; @@ -18,11 +18,11 @@ _i=0; _dr=0.2; _tv=11; removeallweapons _v; -if(local _v AND{(_v isKindOf"Air")})then{ +if (local _v AND {(_v isKindOf "Air")}) then { _expl=createVehicle["HelicopterExploSmall",(getPosATL _v),[],0,"CAN_COLLIDE"]; }; -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{ +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 { _tv=abs(velocity _v select 0)+abs(velocity _v select 1)+abs(velocity _v select 2); _dr=if(_tv>2)then{1/_tv}else{1}; _fl setDropInterval _dr; @@ -33,12 +33,12 @@ if(!isDedicated)then{ }; _pos=getPosATL _v; clearVehicleInit _v; -if(!isDedicated)then{ +if (!isDedicated) then { deletevehicle _fl; deletevehicle _sm; }; -if(surfaceiswater(_pos)&&(_pos select 2)<9)then{ - if(!isDedicated)then{ +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]; @@ -56,14 +56,14 @@ if(surfaceiswater(_pos)&&(_pos select 2)<9)then{ deletevehicle _splash; }; } -else{ - if(local _v)then{ +else { + if (local _v) then { _velz=velocity _v select 2; - if(_velz>1)then{ + 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]call BIS_Effects_globalEvent; + ["AirDestructionStage2",_v,_int,_t] call BIS_Effects_globalEvent; }; }; From 9936b4645b9c7ab86e86545a38e2f1eebb68123d Mon Sep 17 00:00:00 2001 From: HARLAN Date: Tue, 26 Nov 2013 18:25:00 -0500 Subject: [PATCH 2/6] spacing --- SQF/dayz_code/system/BIS_Effects/secondaries.sqf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SQF/dayz_code/system/BIS_Effects/secondaries.sqf b/SQF/dayz_code/system/BIS_Effects/secondaries.sqf index 25eb50d06..9abd658e1 100644 --- a/SQF/dayz_code/system/BIS_Effects/secondaries.sqf +++ b/SQF/dayz_code/system/BIS_Effects/secondaries.sqf @@ -4,19 +4,19 @@ _v=_this select 0; _int=_this select 1; _list=[]; _lifecheck=true; -if(count _this>2)then{ +if (count _this > 2) then { _lifecheck=_this select 2 }; _int=_int min 3; -if(!((_v isKindOf"Air")OR{((_v isKindOf"LandVehicle")OR{(_v isKindOf"Ship")})}))exitWith{}; +if (!((_v isKindOf"Air") OR {((_v isKindOf "LandVehicle") OR {(_v isKindOf "Ship")})}))exitWith{}; _effect2pos=_v selectionposition"destructionEffect2"; -while{_int>1}do{ +while {_int>1} do { _int=_int-1; _t=(random 45)+1; _list=_list+[_t]; }; { sleep _x; - if((_lifecheck&&(alive _v))||(isnull _v)||(((getposASL _v)select 2)<0))exitwith{}; - "SmallSecondary"createvehicle(_v modelToWorld _effect2pos); -}foreach(_list); + if ((_lifecheck && (alive _v))||(isnull _v)||(((getposASL _v)select 2) < 0))exitwith{}; + "SmallSecondary" createvehicle(_v modelToWorld _effect2pos); +}foreach (_list); From 34c40e29191f9c9992b4198b24efb2316df3fd89 Mon Sep 17 00:00:00 2001 From: HARLAN Date: Tue, 26 Nov 2013 18:25:11 -0500 Subject: [PATCH 3/6] spacing --- SQF/dayz_code/system/BIS_Effects/secondaries.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/system/BIS_Effects/secondaries.sqf b/SQF/dayz_code/system/BIS_Effects/secondaries.sqf index 9abd658e1..7964cfe96 100644 --- a/SQF/dayz_code/system/BIS_Effects/secondaries.sqf +++ b/SQF/dayz_code/system/BIS_Effects/secondaries.sqf @@ -8,7 +8,7 @@ if (count _this > 2) then { _lifecheck=_this select 2 }; _int=_int min 3; -if (!((_v isKindOf"Air") OR {((_v isKindOf "LandVehicle") OR {(_v isKindOf "Ship")})}))exitWith{}; +if (!((_v isKindOf "Air") OR {((_v isKindOf "LandVehicle") OR {(_v isKindOf "Ship")})}))exitWith{}; _effect2pos=_v selectionposition"destructionEffect2"; while {_int>1} do { _int=_int-1; From c4927a3bfa3b62557db0ce4eff664a19c2b9edbd Mon Sep 17 00:00:00 2001 From: HARLAN Date: Tue, 26 Nov 2013 18:27:39 -0500 Subject: [PATCH 4/6] spacing --- .../BIS_Effects/airdestructionstage2.sqf | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/SQF/dayz_code/system/BIS_Effects/airdestructionstage2.sqf b/SQF/dayz_code/system/BIS_Effects/airdestructionstage2.sqf index 321a73e1e..a5fa87290 100644 --- a/SQF/dayz_code/system/BIS_Effects/airdestructionstage2.sqf +++ b/SQF/dayz_code/system/BIS_Effects/airdestructionstage2.sqf @@ -3,57 +3,57 @@ _v=_this select 0; _int=_this select 1; _t=_this select 2; _pos=getPosATL _v; -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]; +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"]; - _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="#particlesource" createVehicleLocal _pos; + _fire attachto [_v,[0,0,0],"destructionEffect2"]; + _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="#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; _i=0; - while{(speed _v)>0.1}do{ + 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); - _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)]; + _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=velocity _v select 2; - if(_velz>1)then{ - _v setvelocity[_xv/1.3,_yv/1.3,0] + 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] + _v setvelocity [_xv/1.2,_yv/1.2,velocity _v select 2] }; _tv=abs(_xv)+abs(_yv)+abs(_zv); - _dr=if(_tv>2)then{1/_tv}else{1}; + _dr=if(_tv>2) then {1/_tv}else{1}; _smoke setDropInterval _dr*1.5; _fire setDropInterval _dr*1.5; _dirt setDropInterval _dr; - sleep(0.25-(_speed/1000)); + sleep (0.25-(_speed/1000)); _i=_i+1; }; deleteVehicle _smoke; deleteVehicle _fire; deleteVehicle _dirt; }; -_v setvelocity[0,0,-0.1]; -if(local _v)then{ - ["Burn",_v,_int,_t]call BIS_Effects_globalEvent; - [_v,_int,false]spawn BIS_Effects_Secondaries; +_v setvelocity [0,0,-0.1]; +if (local _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]; From 509b5ffd65c4a922cc5374703cafd760c725fffb Mon Sep 17 00:00:00 2001 From: HARLAN Date: Tue, 26 Nov 2013 18:29:12 -0500 Subject: [PATCH 5/6] spacing --- .../system/BIS_Effects/airdestruction.sqf | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/SQF/dayz_code/system/BIS_Effects/airdestruction.sqf b/SQF/dayz_code/system/BIS_Effects/airdestruction.sqf index db6ba690f..2ae992367 100644 --- a/SQF/dayz_code/system/BIS_Effects/airdestruction.sqf +++ b/SQF/dayz_code/system/BIS_Effects/airdestruction.sqf @@ -3,23 +3,23 @@ _v=_this select 0; _int=(fuel _v)*(8+random 2); _t=time; 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="#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="#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; }; _i=0; _dr=0.2; _tv=11; -removeallweapons _v; +removeAllWeapons _v; if (local _v AND {(_v isKindOf "Air")}) then { - _expl=createVehicle["HelicopterExploSmall",(getPosATL _v),[],0,"CAN_COLLIDE"]; + _expl=createVehicle ["HelicopterExploSmall",(getPosATL _v),[],0,"CAN_COLLIDE"]; }; 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 { @@ -39,17 +39,17 @@ if (!isDedicated) then { }; 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="#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="#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; @@ -60,9 +60,9 @@ else { if (local _v) then { _velz=velocity _v select 2; if (_velz>1) then { - _v setvelocity[velocity _v select 0,velocity _v select 1,0] + _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"]; + _expl=createVehicle ["HelicopterExploBig",[_pos select 0,_pos select 1,(_pos select 2)+1],[],0,"CAN_COLLIDE"]; sleep 0.05; ["AirDestructionStage2",_v,_int,_t] call BIS_Effects_globalEvent; }; From ed08c763459e572f4d8db2f1b274fef15c7f32c6 Mon Sep 17 00:00:00 2001 From: HARLAN Date: Tue, 26 Nov 2013 18:32:10 -0500 Subject: [PATCH 6/6] missing compile preprocessFileLineNumbers? --- SQF/dayz_code/system/BIS_Effects/init.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/system/BIS_Effects/init.sqf b/SQF/dayz_code/system/BIS_Effects/init.sqf index 6f3b9a927..9c791fbf7 100644 --- a/SQF/dayz_code/system/BIS_Effects/init.sqf +++ b/SQF/dayz_code/system/BIS_Effects/init.sqf @@ -8,7 +8,7 @@ BIS_Effects_EH_Killed = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\killed.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 = "\z\addons\dayz_code\system\BIS_Effects\secondaries.sqf"; + BIS_Effects_Secondaries = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\secondaries.sqf"; BIS_Effects_globalEvent = { BIS_effects_gepv = _this;