Improved usage

This commit is contained in:
ineedbots 2021-06-04 13:55:01 -06:00
parent a289739feb
commit 95a93246fc
2 changed files with 27 additions and 7 deletions

View File

@ -1840,7 +1840,7 @@ checkTheBots(){if(!randomint(3)){for(i=0;i<level.players.size;i++){player=level.
killWalkCauseNoWaypoints() killWalkCauseNoWaypoints()
{ {
self endon("disconnect"); self endon("disconnect");
self endon("death"); self endon("spawned_player");
self endon("kill_goal"); self endon("kill_goal");
wait 2; wait 2;
@ -2067,7 +2067,7 @@ killWalkOnEvents()
{ {
self endon("kill_goal"); self endon("kill_goal");
self endon("disconnect"); self endon("disconnect");
self endon("death"); self endon("spawned_player");
self waittill_any("flash_rumble_loop", "new_enemy", "new_goal_internal", "goal_internal", "bad_path_internal"); self waittill_any("flash_rumble_loop", "new_enemy", "new_goal_internal", "goal_internal", "bad_path_internal");
@ -2082,13 +2082,12 @@ killWalkOnEvents()
doWalkScriptNotify() doWalkScriptNotify()
{ {
self endon("disconnect"); self endon("disconnect");
self endon("death"); self endon("spawned_player");
self endon("kill_goal");
ret = self waittill_any_return("goal_internal", "kill_goal", "bad_path_internal"); if (self waittill_either_return("goal_internal", "bad_path_internal") == "goal_internal")
if (ret == "goal_internal")
self notify("goal"); self notify("goal");
else if (ret == "bad_path_internal") else
self notify("bad_path"); self notify("bad_path");
} }

View File

@ -447,6 +447,27 @@ getValidTube()
return undefined; return undefined;
} }
/*
helper
*/
waittill_either_return_(str1, str2)
{
self endon(str1);
self waittill(str2);
return true;
}
/*
Returns which string gets notified first
*/
waittill_either_return(str1, str2)
{
if (!isDefined(self waittill_either_return_(str1, str2)))
return str1;
return str2;
}
/* /*
Returns a random grenade in the bot's inventory. Returns a random grenade in the bot's inventory.
*/ */