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

fix gren missile death bug, c4 claymore emp bug

Browse Source
This commit is contained in:
INeedBots 2021-04-13 18:59:02 -06:00
parent bc6595eef5
commit f94a845a2f
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
userraw/maps/mp/gametypes/_weapons.gsc
View File

@ -7,6 +7,8 @@
Fixes claymores from tripping when the victim is elevated from the claymore. Fixes claymores from tripping when the victim is elevated from the claymore.
Fixes stuns and flashes friendly fire on claymores and c4s. Fixes stuns and flashes friendly fire on claymores and c4s.
Fixes direct impact stun stunning the victim. Fixes direct impact stun stunning the victim.
Fixes missile and grenade threads being killed on death.
Fixes new c4s and claymores after an emp not being affected
DVARS: DVARS:
- scr_allowDropWeaponOnCommand <bool> - scr_allowDropWeaponOnCommand <bool>
@ -1179,7 +1181,7 @@ friendlyFireCheck( owner, attacker, forcedFriendlyFireRule )
watchGrenadeUsage() watchGrenadeUsage()
{ {
self endon( "death" ); self endon( "spawned_player" );
self endon( "disconnect" ); self endon( "disconnect" );
self.throwingGrenade = undefined; self.throwingGrenade = undefined;
@ -1247,6 +1249,7 @@ watchGrenadeUsage()
deleteOnOwnerTeamChange( owner ) deleteOnOwnerTeamChange( owner )
{ {
self notify( "delete_on_team_overlap" );
self endon( "delete_on_team_overlap" ); self endon( "delete_on_team_overlap" );
self endon( "death" ); self endon( "death" );
@ -1258,7 +1261,7 @@ deleteOnOwnerTeamChange( owner )
beginGrenadeTracking() beginGrenadeTracking()
{ {
self endon( "death" ); self endon( "spawned_player" );
self endon( "disconnect" ); self endon( "disconnect" );
self endon( "offhand_end" ); self endon( "offhand_end" );
self endon( "weapon_change" ); self endon( "weapon_change" );
@ -1329,7 +1332,7 @@ AddMissileToSightTraces( team )
watchMissileUsage() watchMissileUsage()
{ {
self endon( "death" ); self endon( "spawned_player" );
self endon( "disconnect" ); self endon( "disconnect" );
for ( ;; ) for ( ;; )
@ -1412,7 +1415,7 @@ empExplodeWaiter()
beginC4Tracking() beginC4Tracking()
{ {
self endon( "death" ); self endon( "spawned_player" );
self endon( "disconnect" ); self endon( "disconnect" );
self waittill_any( "grenade_fire", "weapon_change", "offhand_end" ); self waittill_any( "grenade_fire", "weapon_change", "offhand_end" );
@ -1421,7 +1424,7 @@ beginC4Tracking()
watchForThrowbacks() watchForThrowbacks()
{ {
self endon( "death" ); self endon( "spawned_player" );
self endon( "disconnect" ); self endon( "disconnect" );
for ( ;; ) for ( ;; )
@ -1446,10 +1449,7 @@ watchForThrowbacks()
if( level.extraTeamIcons ) if( level.extraTeamIcons )
grenade thread setClaymoreTeamHeadIcon( self.pers[ "team" ] ); grenade thread setClaymoreTeamHeadIcon( self.pers[ "team" ] );
if ( level.deleteNadeOnTeamChange ) if ( level.deleteNadeOnTeamChange )
{
grenade notify( "delete_on_team_overlap" );
grenade thread deleteOnOwnerTeamChange( self ); grenade thread deleteOnOwnerTeamChange( self );
}
} }
} }
@ -1529,6 +1529,12 @@ c4EMPKillstreakWait()
{ {
self endon( "death" ); self endon( "death" );
if ( (level.teamBased && level.teamEMPed[self.team]) || (!level.teamBased && isDefined( level.empPlayer ) && level.empPlayer != self.owner ) )
{
self.disabled = true;
self notify( "disabled" );
}
for ( ;; ) for ( ;; )
{ {
level waittill( "emp_update" ); level waittill( "emp_update" );
@ -1949,7 +1955,7 @@ waitAndDetonate( delay )
deleteC4AndClaymoresOnDisconnect() deleteC4AndClaymoresOnDisconnect()
{ {
self endon( "death" ); self endon( "spawned_player" );
self waittill( "disconnect" ); self waittill( "disconnect" );
c4array = self.c4array; c4array = self.c4array;