This commit is contained in:
Your Name 2020-08-12 23:09:34 -06:00
parent f7c2c8992d
commit eaacca432f
2 changed files with 26 additions and 10 deletions

View File

@ -59,7 +59,7 @@ onKilled(eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc,
if(level.teamBased && eAttacker.team == self.team) if(level.teamBased && eAttacker.team == self.team)
return; return;
if ( IsDefined( eInflictor ) && (eInflictor.classname == "script_vehicle" || eInflictor.classname == "grenade" )) if ( !IsDefined( eInflictor ) || eInflictor.classname != "player")
return; return;
if(!isAlive(eAttacker)) if(!isAlive(eAttacker))
@ -94,7 +94,7 @@ onDamage(eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint
if(level.teamBased && eAttacker.team == self.team) if(level.teamBased && eAttacker.team == self.team)
return; return;
if ( IsDefined( eInflictor ) && (eInflictor.classname == "script_vehicle" || eInflictor.classname == "grenade" )) if ( !IsDefined( eInflictor ) || eInflictor.classname != "player")
return; return;
if(!isAlive(eAttacker)) if(!isAlive(eAttacker))
@ -935,13 +935,13 @@ bot_weapon_think()
if(self IsBotReloading() || self IsBotSmoking() || self IsBotFragging()) if(self IsBotReloading() || self IsBotSmoking() || self IsBotFragging())
continue; continue;
if(isDefined(self.isDefusing) && self.isDefusing) if(self isDefusing() || self isPlanting())
continue; continue;
if(isDefined(self.isPlanting) && self.isPlanting) curWeap = self GetCurrentWeapon();
if (!isWeaponDroppable(curWeap))
continue; continue;
curWeap = self getCurrentWeapon();
hasTarget = self hasThreat(); hasTarget = self hasThreat();
if(hasTarget) if(hasTarget)
@ -1016,13 +1016,14 @@ bot_killstreak_think()
if(self HasThreat()) if(self HasThreat())
continue; continue;
if(self IsBotReloading() || self IsBotSmoking() || IsBotFragging()) if(self IsBotReloading() || self IsBotSmoking() || self IsBotFragging())
continue; continue;
if(isDefined(self.isDefusing) && self.isDefusing) if(self isDefusing() || self isPlanting())
continue; continue;
if(isDefined(self.isPlanting) && self.isPlanting) curWeap = self GetCurrentWeapon();
if (!isWeaponDroppable(curWeap))
continue; continue;
targetPos = undefined; targetPos = undefined;

View File

@ -338,6 +338,21 @@ isItemUnlocked(what, lvl)
} }
} }
isWeaponDroppable(weap)
{
return (maps\mp\gametypes\_weapons::mayDropWeapon(weap));
}
IsDefusing()
{
return (isDefined(self.isDefusing) && self.isDefusing);
}
isPlanting()
{
return (isDefined(self.isPlanting) && self.isPlanting);
}
/* /*
Returns if we are stunned. Returns if we are stunned.
*/ */