Reorganized the scripts so its easier to search thru.

This commit is contained in:
JezuzLizard 2021-08-07 11:41:57 -07:00
parent 98bfc67831
commit fe45c69381
1573 changed files with 152 additions and 4458 deletions

View File

@ -1,15 +1,16 @@
//checked includes match cerberus output
#include maps/mp/gametypes/_damagefeedback; #include maps/mp/gametypes/_damagefeedback;
#include maps/mp/gametypes/_globallogic_player; #include maps/mp/gametypes/_globallogic_player;
#include maps/mp/_utility; #include maps/mp/_utility;
#include common_scripts/utility; #include common_scripts/utility;
initburnplayer() initburnplayer() //checked matches cerberus output
{ {
level.flamedamage = 15; level.flamedamage = 15;
level.flameburntime = 1,5; level.flameburntime = 1.5;
} }
hitwithincendiary( attacker, inflictor, mod ) hitwithincendiary( attacker, inflictor, mod ) //checked changed to match cerberus output
{ {
if ( isDefined( self.burning ) ) if ( isDefined( self.burning ) )
{ {
@ -49,13 +50,11 @@ hitwithincendiary( attacker, inflictor, mod )
self setburn( 3 ); self setburn( 3 );
} }
} }
while ( isDefined( level._effect[ "character_fire_death_torso" ] ) ) if ( isDefined( level._effect[ "character_fire_death_torso" ] ) )
{ {
arrayindex = 0; for ( arrayIndex = 0; arrayIndex < tagArray.size; arrayIndex++ )
while ( arrayindex < tagarray.size )
{ {
playfxontag( level._effect[ "character_fire_death_sm" ], self, tagarray[ arrayindex ] ); playfxontag( level._effect[ "character_fire_death_sm" ], self, tagarray[ arrayindex ] );
arrayindex++;
} }
} }
if ( isai( self ) ) if ( isai( self ) )
@ -77,7 +76,7 @@ hitwithincendiary( attacker, inflictor, mod )
} }
} }
hitwithnapalmstrike( attacker, inflictor, mod ) hitwithnapalmstrike( attacker, inflictor, mod ) //checked changed to match cerberus output
{ {
if ( isDefined( self.burning ) || self hasperk( "specialty_fireproof" ) ) if ( isDefined( self.burning ) || self hasperk( "specialty_fireproof" ) )
{ {
@ -123,10 +122,9 @@ hitwithnapalmstrike( attacker, inflictor, mod )
self setburn( 3 ); self setburn( 3 );
} }
} }
while ( isDefined( level._effect[ "character_fire_death_sm" ] ) ) if ( isDefined( level._effect[ "character_fire_death_sm" ] ) )
{ {
arrayindex = 0; for ( arrayindex = 0; arrayindex < tagarray.size; arrayindex++ )
while ( arrayindex < tagarray.size )
{ {
playfxontag( level._effect[ "character_fire_death_sm" ], self, tagarray[ arrayindex ] ); playfxontag( level._effect[ "character_fire_death_sm" ], self, tagarray[ arrayindex ] );
arrayindex++; arrayindex++;
@ -148,7 +146,7 @@ hitwithnapalmstrike( attacker, inflictor, mod )
} }
} }
walkedthroughflames( attacker, inflictor, weapon ) walkedthroughflames( attacker, inflictor, weapon ) //checked changed to match cerberus output
{ {
if ( isDefined( self.burning ) || self hasperk( "specialty_fireproof" ) ) if ( isDefined( self.burning ) || self hasperk( "specialty_fireproof" ) )
{ {
@ -179,13 +177,11 @@ walkedthroughflames( attacker, inflictor, weapon )
tagarray[ tagarray.size ] = "J_Ankle_RI"; tagarray[ tagarray.size ] = "J_Ankle_RI";
tagarray[ tagarray.size ] = "J_Ankle_LE"; tagarray[ tagarray.size ] = "J_Ankle_LE";
} }
while ( isDefined( level._effect[ "character_fire_player_sm" ] ) ) if ( isDefined( level._effect[ "character_fire_player_sm" ] ) )
{ {
arrayindex = 0; for ( arrayindex = 0; arrayindex < tagarray.size; arrayindex++ )
while ( arrayindex < tagarray.size )
{ {
playfxontag( level._effect[ "character_fire_player_sm" ], self, tagarray[ arrayindex ] ); playfxontag( level._effect[ "character_fire_player_sm" ], self, tagarray[ arrayindex ] );
arrayindex++;
} }
} }
if ( !isalive( self ) ) if ( !isalive( self ) )
@ -200,7 +196,7 @@ walkedthroughflames( attacker, inflictor, weapon )
} }
} }
burnedwithflamethrower( attacker, inflictor, weapon ) burnedwithflamethrower( attacker, inflictor, weapon ) //checked changed to match cerberus output
{ {
if ( isDefined( self.burning ) ) if ( isDefined( self.burning ) )
{ {
@ -237,18 +233,16 @@ burnedwithflamethrower( attacker, inflictor, weapon )
self thread watchforwater( 7 ); self thread watchforwater( 7 );
self thread watchfordeath(); self thread watchfordeath();
} }
while ( isDefined( level._effect[ "character_fire_player_sm" ] ) ) if ( isDefined( level._effect[ "character_fire_player_sm" ] ) )
{ {
arrayindex = 0; for ( arrayindex = 0; arrayindex < tagarray.size; arrayindex++ )
while ( arrayindex < tagarray.size )
{ {
playfxontag( level._effect[ "character_fire_player_sm" ], self, tagarray[ arrayindex ] ); playfxontag( level._effect[ "character_fire_player_sm" ], self, tagarray[ arrayindex ] );
arrayindex++;
} }
} }
} }
burnedwithdragonsbreath( attacker, inflictor, weapon ) burnedwithdragonsbreath( attacker, inflictor, weapon ) //checked changed to match cerberus output
{ {
if ( isDefined( self.burning ) ) if ( isDefined( self.burning ) )
{ {
@ -287,18 +281,16 @@ burnedwithdragonsbreath( attacker, inflictor, weapon )
self thread watchfordeath(); self thread watchfordeath();
return; return;
} }
while ( isDefined( level._effect[ "character_fire_player_sm" ] ) ) if ( isDefined( level._effect[ "character_fire_player_sm" ] ) )
{ {
arrayindex = 0; for ( arrayindex = 0; arrayindex < tagarray.size; arrayindex++ )
while ( arrayindex < tagarray.size )
{ {
playfxontag( level._effect[ "character_fire_player_sm" ], self, tagarray[ arrayindex ] ); playfxontag( level._effect[ "character_fire_player_sm" ], self, tagarray[ arrayindex ] );
arrayindex++;
} }
} }
} }
burnedtodeath() burnedtodeath() //checked matches cerberus output
{ {
self.burning = 1; self.burning = 1;
self thread burn_blocker(); self thread burn_blocker();
@ -307,7 +299,7 @@ burnedtodeath()
self thread waitthenstoptanning( level.flameburntime ); self thread waitthenstoptanning( level.flameburntime );
} }
watchfordeath() watchfordeath() //checked matches cerberus output
{ {
self endon( "disconnect" ); self endon( "disconnect" );
self notify( "watching for death while on fire" ); self notify( "watching for death while on fire" );
@ -320,13 +312,13 @@ watchfordeath()
self.burning = undefined; self.burning = undefined;
} }
watchforwater( time ) watchforwater( time ) //checked matches cerberus output
{ {
self endon( "disconnect" ); self endon( "disconnect" );
self notify( "watching for water" ); self notify( "watching for water" );
self endon( "watching for water" ); self endon( "watching for water" );
wait 0,1; wait 0.1;
looptime = 0,1; looptime = 0.1;
while ( time > 0 ) while ( time > 0 )
{ {
wait looptime; wait looptime;
@ -339,7 +331,7 @@ watchforwater( time )
} }
} }
finish_burn() finish_burn() //checked changed to match cerberus output
{ {
self notify( "stop burn damage" ); self notify( "stop burn damage" );
tagarray = []; tagarray = [];
@ -348,13 +340,11 @@ finish_burn()
tagarray[ 2 ] = "J_Head"; tagarray[ 2 ] = "J_Head";
tagarray[ 3 ] = "j_knee_ri"; tagarray[ 3 ] = "j_knee_ri";
tagarray[ 4 ] = "j_knee_le"; tagarray[ 4 ] = "j_knee_le";
while ( isDefined( level._effect[ "fx_fire_player_sm_smk_2sec" ] ) ) if ( isDefined( level._effect[ "fx_fire_player_sm_smk_2sec" ] ) )
{ {
arrayindex = 0; for ( arrayindex = 0; arrayindex < tagarray.size; arrayindex++ )
while ( arrayindex < tagarray.size )
{ {
playfxontag( level._effect[ "fx_fire_player_sm_smk_2sec" ], self, tagarray[ arrayindex ] ); playfxontag( level._effect[ "fx_fire_player_sm_smk_2sec" ], self, tagarray[ arrayindex ] );
arrayindex++;
} }
} }
self.burning = undefined; self.burning = undefined;
@ -362,7 +352,7 @@ finish_burn()
self.ingroundnapalm = 0; self.ingroundnapalm = 0;
} }
donapalmstrikedamage( attacker, inflictor, mod ) donapalmstrikedamage( attacker, inflictor, mod ) //checked matches cerberus output
{ {
if ( isai( self ) ) if ( isai( self ) )
{ {
@ -380,7 +370,7 @@ donapalmstrikedamage( attacker, inflictor, mod )
} }
} }
donapalmgrounddamage( attacker, inflictor, mod ) donapalmgrounddamage( attacker, inflictor, mod ) //checked changed to match cerberus output dvars taken from beta dump
{ {
if ( self hasperk( "specialty_fireproof" ) ) if ( self hasperk( "specialty_fireproof" ) )
{ {
@ -409,13 +399,13 @@ donapalmgrounddamage( attacker, inflictor, mod )
self endon( "stop burn damage" ); self endon( "stop burn damage" );
if ( isDefined( level.groundburntime ) ) if ( isDefined( level.groundburntime ) )
{ {
if ( getDvar( #"6EC13261" ) == "" ) if ( getDvar( "scr_groundBurnTime" ) == "" )
{ {
waittime = level.groundburntime; waittime = level.groundburntime;
} }
else else
{ {
waittime = getDvarFloat( #"6EC13261" ); waittime = getDvarFloat( "scr_groundBurnTime" );
} }
} }
else else
@ -426,20 +416,20 @@ donapalmgrounddamage( attacker, inflictor, mod )
self.ingroundnapalm = 1; self.ingroundnapalm = 1;
while ( isDefined( level.napalmgrounddamage ) ) while ( isDefined( level.napalmgrounddamage ) )
{ {
if ( getDvar( #"3FFA6673" ) == "" ) if ( getDvar( "scr_napalmGroundDamage" ) == "" )
{ {
napalmgrounddamage = level.napalmgrounddamage; napalmgrounddamage = level.napalmgrounddamage;
} }
else else
{ {
napalmgrounddamage = getDvarFloat( #"3FFA6673" ); napalmgrounddamage = getDvarFloat( "scr_napalmGroundDamage" );
} }
while ( isDefined( self ) && isDefined( inflictor ) && self depthofplayerinwater() < 1 && waittime > 0 ) while ( isDefined( self ) && isDefined( inflictor ) && self depthofplayerinwater() < 1 && waittime > 0 )
{ {
self dodamage( level.napalmgrounddamage, self.origin, attacker, inflictor, "none", mod, 0, "napalm_mp" ); self dodamage( level.napalmgrounddamage, self.origin, attacker, inflictor, "none", mod, 0, "napalm_mp" );
if ( isplayer( self ) ) if ( isplayer( self ) )
{ {
self setburn( 1,1 ); self setburn( 1.1 );
} }
wait 1; wait 1;
waittime -= 1; waittime -= 1;
@ -448,7 +438,7 @@ donapalmgrounddamage( attacker, inflictor, mod )
self.ingroundnapalm = 0; self.ingroundnapalm = 0;
} }
dodognapalmstrikedamage( attacker, inflictor, mod ) dodognapalmstrikedamage( attacker, inflictor, mod ) //checked matches cerberus output
{ {
attacker endon( "disconnect" ); attacker endon( "disconnect" );
self endon( "death" ); self endon( "death" );
@ -460,7 +450,7 @@ dodognapalmstrikedamage( attacker, inflictor, mod )
} }
} }
dodognapalmgrounddamage( attacker, inflictor, mod ) dodognapalmgrounddamage( attacker, inflictor, mod ) //checked matches cerberus output
{ {
attacker endon( "disconnect" ); attacker endon( "disconnect" );
self endon( "death" ); self endon( "death" );
@ -472,7 +462,7 @@ dodognapalmgrounddamage( attacker, inflictor, mod )
} }
} }
burn_blocker() burn_blocker() //checked matches cerberus output
{ {
self endon( "disconnect" ); self endon( "disconnect" );
self endon( "death" ); self endon( "death" );
@ -480,7 +470,7 @@ burn_blocker()
self.burning = undefined; self.burning = undefined;
} }
doflamedamage( attacker, inflictor, weapon, time ) doflamedamage( attacker, inflictor, weapon, time ) //checked matches cerberus output
{ {
if ( isai( self ) ) if ( isai( self ) )
{ {
@ -517,9 +507,9 @@ doflamedamage( attacker, inflictor, weapon, time )
self thread finish_burn(); self thread finish_burn();
} }
dodogflamedamage( attacker, inflictor, weapon, time ) dodogflamedamage( attacker, inflictor, weapon, time ) //checked changed to match cerberus output
{ {
if ( isDefined( attacker ) || !isDefined( inflictor ) && !isDefined( weapon ) ) if ( isDefined( attacker ) || !isDefined( inflictor ) || !isDefined( weapon ) )
{ {
return; return;
} }
@ -536,7 +526,7 @@ dodogflamedamage( attacker, inflictor, weapon, time )
} }
} }
waitthenstoptanning( time ) waitthenstoptanning( time ) //checked matches cerberus output
{ {
self endon( "disconnect" ); self endon( "disconnect" );
self endon( "death" ); self endon( "death" );
@ -544,7 +534,7 @@ waitthenstoptanning( time )
self _stopburning(); self _stopburning();
} }
doburningsound() doburningsound() //checked matches cerberus output
{ {
self endon( "disconnect" ); self endon( "disconnect" );
self endon( "death" ); self endon( "death" );
@ -555,19 +545,21 @@ doburningsound()
self waittill( "StopBurnSound" ); self waittill( "StopBurnSound" );
if ( isDefined( fire_sound_ent ) ) if ( isDefined( fire_sound_ent ) )
{ {
fire_sound_ent stoploopsound( 0,5 ); fire_sound_ent stoploopsound( 0.5 );
} }
wait 0,5; wait 0.5;
if ( isDefined( fire_sound_ent ) ) if ( isDefined( fire_sound_ent ) )
{ {
fire_sound_ent delete(); fire_sound_ent delete();
} }
/*
/# /#
println( "sound stop burning" ); println( "sound stop burning" );
#/ #/
*/
} }
_stopburning() _stopburning() //checked matches cerberus output
{ {
self endon( "disconnect" ); self endon( "disconnect" );
self notify( "StopBurnSound" ); self notify( "StopBurnSound" );
@ -577,12 +569,14 @@ _stopburning()
} }
} }
firesounddeath( ent ) firesounddeath( ent ) //checked matches cerberus output
{ {
ent endon( "death" ); ent endon( "death" );
self waittill_any( "death", "disconnect" ); self waittill_any( "death", "disconnect" );
ent delete(); ent delete();
/*
/# /#
println( "sound delete burning" ); println( "sound delete burning" );
#/ #/
*/
} }

View File

@ -68,7 +68,7 @@ createproximitygrenadewatcher()
watcher.immediatedetonation = 1; watcher.immediatedetonation = 1;
watcher.detectiongraceperiod = level.proximitygrenadegraceperiod; watcher.detectiongraceperiod = level.proximitygrenadegraceperiod;
watcher.detonateradius = level.proximitygrenadedetectionradius; watcher.detonateradius = level.proximitygrenadedetectionradius;
watcher.stun = ::maps/mp/gametypes/_weaponobjects::weaponstun; watcher.stun = maps/mp/gametypes/_weaponobjects::weaponstun;
watcher.stuntime = 1; watcher.stuntime = 1;
watcher.detonate = ::proximitydetonate; watcher.detonate = ::proximitydetonate;
watcher.activationdelay = level.proximitygrenadeactivationtime; watcher.activationdelay = level.proximitygrenadeactivationtime;

Some files were not shown because too many files have changed in this diff Show More