Fix sentry weapon, and reload cancel edge case

This commit is contained in:
INeedBots 2021-03-19 14:49:19 -06:00
parent 52e9373610
commit 3204c22f16

View File

@ -3671,7 +3671,7 @@ doReloadCancel()
curWeap = self GetCurrentWeapon(); curWeap = self GetCurrentWeapon();
// check single reloads // check single reloads
if (self GetCurrentWeaponClipAmmo() < WeaponClipSize(curWeap)) if (self GetWeaponAmmoClip(curWeap) < WeaponClipSize(curWeap))
continue; continue;
// check difficulty // check difficulty
@ -3679,7 +3679,7 @@ doReloadCancel()
continue; continue;
// check if got another weapon // check if got another weapon
weaponslist = self getweaponslistall(); weaponslist = self GetWeaponsListPrimaries();
weap = ""; weap = "";
while(weaponslist.size) while(weaponslist.size)
{ {
@ -3976,6 +3976,8 @@ bot_killstreak_think()
self endon("death"); self endon("death");
level endon("game_ended"); level endon("game_ended");
self thread maps\mp\killstreaks\_killstreaks::giveKillstreak( "sentry", false, false, self );
doFastContinue = false; doFastContinue = false;
for (;;) for (;;)
@ -4083,6 +4085,7 @@ bot_killstreak_think()
self notify("place_sentry"); self notify("place_sentry");
wait 0.05; wait 0.05;
self notify("cancel_sentry"); self notify("cancel_sentry");
wait 0.5;
self thread changeToWeapon(curWeap); self thread changeToWeapon(curWeap);