This commit is contained in:
INeedBots 2020-11-28 00:54:24 -06:00
parent dc0d892de4
commit 950d4cab02
3 changed files with 2697 additions and 6 deletions

View File

@ -496,9 +496,6 @@ watch_grenade(grenade)
if(self.bot.isfraggingafter || self.bot.issmokingafter) if(self.bot.isfraggingafter || self.bot.issmokingafter)
continue; continue;
if (self.disabledWeapon)
continue;
self thread frag(); self thread frag();
} }
} }
@ -1033,10 +1030,14 @@ aim()
nade = self getValidGrenade(); nade = self getValidGrenade();
if(isDefined(nade) && rand <= self.pers["bots"]["behavior"]["nade"] && bulletTracePassed(eyePos, eyePos + (0, 0, 75), false, self) && bulletTracePassed(last_pos, last_pos + (0, 0, 100), false, target) && dist > level.bots_minGrenadeDistance && dist < level.bots_maxGrenadeDistance && getDvarInt("bots_play_nade")) if(isDefined(nade) && rand <= self.pers["bots"]["behavior"]["nade"] && bulletTracePassed(eyePos, eyePos + (0, 0, 75), false, self) && bulletTracePassed(last_pos, last_pos + (0, 0, 100), false, target) && dist > level.bots_minGrenadeDistance && dist < level.bots_maxGrenadeDistance && getDvarInt("bots_play_nade"))
{ {
if(nade == "frag_grenade_mp") time = 0.5;
self thread frag(2.5); if (nade == "frag_grenade_mp")
time = 2;
if(!isSecondaryGrenade(nade))
self thread frag(time);
else else
self thread smoke(0.5); self thread smoke(time);
self notify("kill_goal"); self notify("kill_goal");
} }

File diff suppressed because it is too large Load Diff

View File

@ -415,6 +415,14 @@ getValidGrenade()
return random(possibles); return random(possibles);
} }
/*
If weap is a secondary gnade
*/
isSecondaryGrenade(gnade)
{
return (gnade == "tabun_gas_mp" || gnade == "m8_white_smoke_mp" || gnade == "signal_flare_mp");
}
/* /*
Returns if the given weapon is full auto. Returns if the given weapon is full auto.
*/ */