From fb6daae11427ee278c1708f7e3b228af0b99b81a Mon Sep 17 00:00:00 2001 From: ineedbots Date: Wed, 26 May 2021 12:56:06 -0600 Subject: [PATCH] Some fix ups --- main_shared/maps/mp/bots/_bot_internal.gsc | 28 ++++++++++++++++++++++ main_shared/maps/mp/bots/_bot_script.gsc | 2 ++ main_shared/maps/mp/bots/_bot_utility.gsc | 8 +++++++ 3 files changed, 38 insertions(+) diff --git a/main_shared/maps/mp/bots/_bot_internal.gsc b/main_shared/maps/mp/bots/_bot_internal.gsc index 7515b6c..05c7b3f 100644 --- a/main_shared/maps/mp/bots/_bot_internal.gsc +++ b/main_shared/maps/mp/bots/_bot_internal.gsc @@ -328,6 +328,9 @@ watchGrenadeFire() { self waittill( "grenade_fire", nade, weapname ); + if (!isDefined(nade)) + continue; + if ( weapname == "satchel_charge_mp" ) self thread watchC4Thrown(nade); } @@ -539,6 +542,10 @@ reload_watch() break; weap = self GetCurrentWeapon(); + + if (weap == "none") + break; + if (self GetWeaponAmmoClip(weap) >= WeaponClipSize(weap)) break; } @@ -2113,6 +2120,27 @@ pressADS(time) self botAction("-ads"); } +/* + Bot will press use for a time. +*/ +use(time) +{ + self endon("death"); + self endon("disconnect"); + self notify("bot_use"); + self endon("bot_use"); + + if(!isDefined(time)) + time = 0.05; + + self botAction("+use"); + + if(time) + wait time; + + self botAction("-use"); +} + /* Bot will jump. */ diff --git a/main_shared/maps/mp/bots/_bot_script.gsc b/main_shared/maps/mp/bots/_bot_script.gsc index d88d14c..4f62bd6 100644 --- a/main_shared/maps/mp/bots/_bot_script.gsc +++ b/main_shared/maps/mp/bots/_bot_script.gsc @@ -3094,6 +3094,8 @@ bot_dom_spawn_kill_think() { if ( level.flags[i] maps\mp\gametypes\dom::getFlagTeam() == myTeam ) continue; + + flag = level.flags[i]; } if(!isDefined(flag)) diff --git a/main_shared/maps/mp/bots/_bot_utility.gsc b/main_shared/maps/mp/bots/_bot_utility.gsc index 0b2a2ad..2ce9aa8 100644 --- a/main_shared/maps/mp/bots/_bot_utility.gsc +++ b/main_shared/maps/mp/bots/_bot_utility.gsc @@ -84,6 +84,14 @@ BotPressADS(time) self maps\mp\bots\_bot_internal::pressADS(time); } +/* + Bot presses the use button for time. +*/ +BotPressUse(time) +{ + self maps\mp\bots\_bot_internal::use(time); +} + /* Bot presses the frag button for time. */