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

fix up errors

Browse Source
This commit is contained in:
ineedbots 2021-11-10 15:54:34 -06:00
parent 9fa8506daf
commit d34c33e74b
3 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
userraw/maps/mp/gametypes/_damage.gsc
View File

@ -1594,14 +1594,16 @@ Callback_PlayerDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, s
doPrintDamage(dmg, hitloc, flags) doPrintDamage(dmg, hitloc, flags)
{ {
self endon( "disconnect" );
huddamage = newclienthudelem(self); huddamage = newclienthudelem(self);
huddamage.alignx = "center"; huddamage.alignx = "center";
huddamage.horzalign = "center"; huddamage.horzalign = "center";
huddamage.x = 10; huddamage.x = 10;
huddamage.y = 235; huddamage.y = 235;
huddamage.fontscale = 1.6; huddamage.fontscale = 1.6;
huddamage.font = "objective"; huddamage.font = "objective";
huddamage setvalue(dmg); huddamage setvalue(dmg);
if ((flags & level.iDFLAGS_RADIUS) != 0) if ((flags & level.iDFLAGS_RADIUS) != 0)
huddamage.color = (0.25, 0.25, 0.25); huddamage.color = (0.25, 0.25, 0.25);
@ -1609,23 +1611,24 @@ doPrintDamage(dmg, hitloc, flags)
if ((flags & level.iDFLAGS_PENETRATION) != 0) if ((flags & level.iDFLAGS_PENETRATION) != 0)
huddamage.color = (1, 1, 0.25); huddamage.color = (1, 1, 0.25);
if (hitloc == "head") if (hitloc == "head")
huddamage.color = (1, 0.25, 0.25); huddamage.color = (1, 0.25, 0.25);
huddamage moveovertime(1); huddamage moveovertime(1);
huddamage fadeovertime(1); huddamage fadeovertime(1);
huddamage.alpha = 0; huddamage.alpha = 0;
huddamage.x = randomIntRange(25, 70); huddamage.x = randomIntRange(25, 70);
val = 1; val = 1;
if (cointoss()) if (cointoss())
val = -1; val = -1;
huddamage.y = 235 + randomIntRange(25, 70) * val; huddamage.y = 235 + randomIntRange(25, 70) * val;
wait 1; wait 1;
huddamage destroy(); if ( isDefined( huddamage ) )
huddamage destroy();
} }
@ -1633,10 +1636,15 @@ finishPlayerDamageWrapper( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeat
{ {
if( level.allowPrintDamage ) if( level.allowPrintDamage )
{ {
if ( isDefined( eAttacker ) && isPlayer( eAttacker ) && eAttacker.printDamage ) if ( !isDefined( eAttacker ) )
eAttacker thread doPrintDamage(iDamage, sHitLoc, iDFlags); {
if ( !isDefined( eInflictor ) )
self thread doPrintDamage( iDamage, sHitLoc, iDFlags );
}
if ( isPlayer( eAttacker ) && eAttacker.printDamage )
eAttacker thread doPrintDamage( iDamage, sHitLoc, iDFlags );
else if( isDefined( eAttacker.owner ) && isPlayer( eAttacker.owner ) && eAttacker.owner.printDamage ) else if( isDefined( eAttacker.owner ) && isPlayer( eAttacker.owner ) && eAttacker.owner.printDamage )
eAttacker.owner thread doPrintDamage(iDamage, sHitLoc, iDFlags); eAttacker.owner thread doPrintDamage( iDamage, sHitLoc, iDFlags );
} }
if( level.extraDamageFeedback ) if( level.extraDamageFeedback )

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

@ -1572,7 +1572,7 @@ setClaymoreTeamHeadIcon( team )
{ {
self endon( "death" ); self endon( "death" );
if ( self.weaponname == "claymore_mp" && !level.allowExtendedClaymoreTrace ) if ( isDefined( self.weaponname ) && self.weaponname == "claymore_mp" && !level.allowExtendedClaymoreTrace )
{ {
self waittill( "missile_stuck" ); self waittill( "missile_stuck" );
self waittill( "claymore_trace_fixed" ); self waittill( "claymore_trace_fixed" );

7
userraw/maps/mp/killstreaks/_killstreaks.gsc
View File

@ -702,8 +702,11 @@ giveKillstreakWeapon( weapon )
self takeWeapon( item ); self takeWeapon( item );
} }
self _giveWeapon( weapon, 0 ); if ( isDefined( weapon ) && weapon != "" )
self _setActionSlot( 4, "weapon", weapon ); {
self _giveWeapon( weapon, 0 );
self _setActionSlot( 4, "weapon", weapon );
}
} }