Future/iw4_bot_warfare
1
0
Fork 0
mirror of https://github.com/ineedbots/iw4_bot_warfare.git synced 2025-04-22 22:05:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix emp leave friendlyfire

Browse Source
This commit is contained in:
INeedBots 2021-01-12 14:07:40 -06:00
parent 9ee21cb5e5
commit abb05306f5
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
userraw/maps/mp/killstreaks/_emp.gsc
View File

@ -134,7 +134,7 @@ EMP_JamTeam( teamName, duration, delay, silent )
level.teamEMPed[teamName] = true; level.teamEMPed[teamName] = true;
level notify ( "emp_update" ); level notify ( "emp_update" );
level destroyActiveVehicles( self, !level.empDoesFriendlyFire ); level destroyActiveVehicles( self, !level.empDoesFriendlyFire, teamName );
maps\mp\gametypes\_hostmigration::waitLongDurationWithHostMigrationPause( duration ); maps\mp\gametypes\_hostmigration::waitLongDurationWithHostMigrationPause( duration );
@ -284,7 +284,7 @@ EMP_PlayerTracker()
} }
} }
destroyActiveVehicles( attacker, friendlyFireCheck ) destroyActiveVehicles( attacker, friendlyFireCheck, teamName )
{ {
if (!isDefined(friendlyFireCheck)) if (!isDefined(friendlyFireCheck))
friendlyFireCheck = false; friendlyFireCheck = false;
@ -331,24 +331,30 @@ destroyActiveVehicles( attacker, friendlyFireCheck )
else else
{ {
foreach ( heli in level.helis ) foreach ( heli in level.helis )
radiusDamage( heli.origin, 384, 5000, 5000 ); if (!friendlyFireCheck || (level.teamBased && isDefined(teamName) && heli.team == teamName))
radiusDamage( heli.origin, 384, 5000, 5000 );
foreach ( littleBird in level.littleBird ) foreach ( littleBird in level.littleBird )
radiusDamage( littleBird.origin, 384, 5000, 5000 ); if (!friendlyFireCheck || (level.teamBased && isDefined(teamName) && littleBird.team == teamName))
radiusDamage( littleBird.origin, 384, 5000, 5000 );
foreach ( turret in level.turrets ) foreach ( turret in level.turrets )
radiusDamage( turret.origin, 16, 5000, 5000 ); if (!friendlyFireCheck || (level.teamBased && isDefined(teamName) && turret.team == teamName))
radiusDamage( turret.origin, 16, 5000, 5000 );
foreach ( rocket in level.rockets ) foreach ( rocket in level.rockets )
rocket notify ( "death" ); if (!friendlyFireCheck || (level.teamBased && isDefined(teamName) && rocket.team == teamName))
rocket notify ( "death" );
if ( level.teamBased ) if ( level.teamBased )
{ {
foreach ( uav in level.uavModels["allies"] ) foreach ( uav in level.uavModels["allies"] )
radiusDamage( uav.origin, 384, 5000, 5000 ); if (!friendlyFireCheck || (isDefined(teamName) && uav.team == teamName))
radiusDamage( uav.origin, 384, 5000, 5000 );
foreach ( uav in level.uavModels["axis"] ) foreach ( uav in level.uavModels["axis"] )
radiusDamage( uav.origin, 384, 5000, 5000 ); if (!friendlyFireCheck || (isDefined(teamName) && uav.team == teamName))
radiusDamage( uav.origin, 384, 5000, 5000 );
} }
else else
{ {
@ -357,6 +363,7 @@ destroyActiveVehicles( attacker, friendlyFireCheck )
} }
if ( isDefined( level.ac130player ) ) if ( isDefined( level.ac130player ) )
radiusDamage( level.ac130.planeModel.origin+(0,0,10), 1000, 5000, 5000 ); if (!friendlyFireCheck || (level.teamBased && isDefined(teamName) && level.ac130player.team == teamName))
radiusDamage( level.ac130.planeModel.origin+(0,0,10), 1000, 5000, 5000 );
} }
} }