Future/iw4_bot_warfare
1
0
Fork 0
mirror of https://github.com/ineedbots/iw4_bot_warfare.git synced 2025-04-22 22:05:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

goal

Browse Source
This commit is contained in:
Your Name 2020-08-30 13:42:08 -06:00
parent 054397f7da
commit 7de8d0e0ba
3 changed files with 58 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
userraw/maps/mp/bots/_bot_internal.gsc
View File

@ -2098,7 +2098,7 @@ walk()
if(hasTarget) if(hasTarget)
goal = self.bot.target.last_seen_pos; goal = self.bot.target.last_seen_pos;
self notify("new_goal"); self notify("new_goal_internal");
} }
self doWalk(goal, dist, isScriptGoal); self doWalk(goal, dist, isScriptGoal);
@ -2149,7 +2149,7 @@ watchOnGoal(goal, dis)
while(DistanceSquared(self.origin, goal) > dis) while(DistanceSquared(self.origin, goal) > dis)
wait 0.05; wait 0.05;
self notify("goal"); self notify("goal_internal");
} }
/* /*
@ -2204,23 +2204,22 @@ killWalkOnEvents()
self endon("disconnect"); self endon("disconnect");
self endon("death"); self endon("death");
self waittill_any("flash_rumble_loop", "new_enemy", "new_goal", "goal", "bad_path"); self waittill_any("flash_rumble_loop", "new_enemy", "new_goal_internal", "goal_internal", "bad_path_internal");
self notify("kill_goal"); self notify("kill_goal");
} }
doWalkScriptNotify() doWalkScriptNotify()
{ {
self endon("kill_goal");
self endon("disconnect"); self endon("disconnect");
self endon("death"); self endon("death");
ret = self waittill_any_return("goal", "bad_path"); ret = self waittill_any_return("kill_goal", "goal_internal", "bad_path_internal");
if (ret == "goal") if (ret == "goal_internal")
self notify("script_goal"); self notify("goal");
else else if (ret == "bad_path_internal")
self notify("script_bad_path"); self notify("bad_path");
} }
/* /*
@ -2229,7 +2228,7 @@ doWalkScriptNotify()
doWalk(goal, dist, isScriptGoal) doWalk(goal, dist, isScriptGoal)
{ {
self endon("kill_goal"); self endon("kill_goal");
self endon("goal");//so that the watchOnGoal notify can happen same frame, not a frame later self endon("goal_internal");//so that the watchOnGoal notify can happen same frame, not a frame later
distsq = dist*dist; distsq = dist*dist;
self thread killWalkOnEvents(); self thread killWalkOnEvents();
@ -2266,7 +2265,7 @@ doWalk(goal, dist, isScriptGoal)
wait 1; wait 1;
if(DistanceSquared(self.origin, goal) > distsq) if(DistanceSquared(self.origin, goal) > distsq)
self notify("bad_path"); self notify("bad_path_internal");
} }
/* /*
@ -2292,7 +2291,7 @@ movetowards(goal)
stucks = 0; stucks = 0;
if(stucks >= 3) if(stucks >= 3)
self notify("bad_path"); self notify("bad_path_internal");
lastOri = self.origin; lastOri = self.origin;
} }

87
userraw/maps/mp/bots/_bot_script.gsc
View File

@ -1042,9 +1042,9 @@ bot_inc_bots(obj, unreach)
obj.bots++; obj.bots++;
ret = self waittill_any_return("death", "disconnect", "script_bad_path", "script_goal", "bot_inc_bots"); ret = self waittill_any_return("death", "disconnect", "bad_path", "goal", "new_goal");
if (isDefined(obj) && (ret != "script_bad_path" || !isDefined(unreach))) if (isDefined(obj) && (ret != "bad_path" || !isDefined(unreach)))
obj.bots--; obj.bots--;
} }
@ -1052,8 +1052,9 @@ bots_watch_touch_obj(obj)
{ {
self endon ("death"); self endon ("death");
self endon ("disconnect"); self endon ("disconnect");
self endon ("script_bad_path"); self endon ("bad_path");
self endon ("script_goal"); self endon ("goal");
self endon ("new_goal");
for (;;) for (;;)
{ {
@ -1061,13 +1062,13 @@ bots_watch_touch_obj(obj)
if (!isDefined(obj)) if (!isDefined(obj))
{ {
self notify("script_bad_path"); self notify("bad_path");
return; return;
} }
if (self IsTouching(obj)) if (self IsTouching(obj))
{ {
self notify("script_goal"); self notify("goal");
return; return;
} }
} }
@ -1376,18 +1377,19 @@ bot_equipment_kill_think()
if (isDefined(target.enemyTrigger)) if (isDefined(target.enemyTrigger))
{ {
if ( self.bot_lock_goal || self HasScriptGoal() ) if ( self HasScriptGoal() )
continue; continue;
self thread bot_inc_bots(target, true); self thread bot_inc_bots(target, true);
self SetScriptGoal(target.origin, 16); self SetScriptGoal(target.origin, 16);
self thread bots_watch_touch_obj( target ); self thread bots_watch_touch_obj( target );
path = self waittill_any_return("script_bad_path", "script_goal"); path = self waittill_any_return("bad_path", "goal", "new_goal");
self ClearScriptGoal(); if (path != "new_goal")
self ClearScriptGoal();
if (path != "script_goal") if (path != "goal")
continue; continue;
target.enemyTrigger notify("trigger", self); target.enemyTrigger notify("trigger", self);
@ -1424,7 +1426,7 @@ bot_listen_to_steps()
{ {
wait 1; wait 1;
if(self HasScriptGoal() || self.bot_lock_goal) if(self HasScriptGoal())
continue; continue;
if(self.pers["bots"]["skill"]["base"] < 3) if(self.pers["bots"]["skill"]["base"] < 3)
@ -1507,8 +1509,9 @@ bot_listen_to_steps()
} }
self SetScriptGoal( heard.origin, 64 ); self SetScriptGoal( heard.origin, 64 );
self waittill_any( "script_goal", "script_bad_path" );
self ClearScriptGoal(); if (self waittill_any_return( "goal", "bad_path", "new_goal" ) != "new_goal")
self ClearScriptGoal();
} }
} }
@ -1521,7 +1524,7 @@ bot_uav_think()
{ {
wait 0.75; wait 0.75;
if ( self HasScriptGoal() || self.bot_lock_goal ) if ( self HasScriptGoal() )
continue; continue;
if(self.pers["bots"]["skill"]["base"] <= 1) if(self.pers["bots"]["skill"]["base"] <= 1)
@ -1569,9 +1572,8 @@ bot_uav_think()
{ {
self SetScriptGoal( player.origin, 128 ); self SetScriptGoal( player.origin, 128 );
self waittill_any( "script_goal", "script_bad_path" ); if (self waittill_any_return( "goal", "bad_path", "new_goal" ) != "new_goal")
self ClearScriptGoal();
self ClearScriptGoal();
break; break;
} }
} }
@ -1593,15 +1595,16 @@ bot_revenge_think()
{ {
wait( RandomIntRange( 1, 5 ) ); wait( RandomIntRange( 1, 5 ) );
if(self HasScriptGoal() || self.bot_lock_goal) if(self HasScriptGoal())
return; return;
if ( randomint( 100 ) < 75 ) if ( randomint( 100 ) < 75 )
return; return;
self SetScriptGoal( self.killerLocation, 64 ); self SetScriptGoal( self.killerLocation, 64 );
self waittill_any( "script_goal", "script_bad_path" );
self ClearScriptGoal(); if (self waittill_any_return( "goal", "bad_path", "new_goal" ) != "new_goal")
self ClearScriptGoal();
} }
} }
@ -1609,8 +1612,9 @@ turret_death_monitor(turret)
{ {
self endon ("death"); self endon ("death");
self endon ("disconnect"); self endon ("disconnect");
self endon ("script_bad_path"); self endon ("bad_path");
self endon ("script_goal"); self endon ("goal");
self endon ("new_goal");
for (;;) for (;;)
{ {
@ -1626,7 +1630,7 @@ turret_death_monitor(turret)
break; break;
} }
self notify("script_bad_path"); self notify("bad_path");
} }
bot_turret_attack( enemy ) bot_turret_attack( enemy )
@ -1724,15 +1728,14 @@ bot_turret_think()
if ( turret.bots >= 2 ) if ( turret.bots >= 2 )
continue; continue;
if(!facing && !self.bot_lock_goal && !self HasScriptGoal()) if(!facing && !self HasScriptGoal())
{ {
self thread bot_inc_bots(turret, true); self thread bot_inc_bots(turret, true);
self SetScriptGoal(turret.origin, 16); self SetScriptGoal(turret.origin, 16);
self thread turret_death_monitor( turret ); self thread turret_death_monitor( turret );
self waittill_any_return("script_bad_path", "script_goal"); if(self waittill_any_return("bad_path", "goal", "new_goal") != "new_goal")
self ClearScriptGoal();
self ClearScriptGoal();
} }
if(!isDefined(turret)) if(!isDefined(turret))
@ -1764,6 +1767,14 @@ bot_crate_think()
if ( RandomInt( 100 ) < 20 && ret != "crate_physics_done" ) if ( RandomInt( 100 ) < 20 && ret != "crate_physics_done" )
continue; continue;
if ( self HasScriptGoal() )
{
wait 0.1;//because bot_crate_landed notify causes a same frame ClearScriptGoal
if( self HasScriptGoal() )
continue;
}
if(self isDefusing() || self isPlanting()) if(self isDefusing() || self isPlanting())
continue; continue;
@ -1771,14 +1782,6 @@ bot_crate_think()
if(self IsUsingRemote() || self BotIsFrozen()) if(self IsUsingRemote() || self BotIsFrozen())
continue; continue;
if ( self HasScriptGoal() || self.bot_lock_goal )
{
wait 0.05;//because bot_crate_landed notify causes a same frame ClearScriptGoal
if( self HasScriptGoal() || self.bot_lock_goal )
continue;
}
crates = getEntArray( "care_package", "targetname" ); crates = getEntArray( "care_package", "targetname" );
if ( crates.size == 0 ) if ( crates.size == 0 )
continue; continue;
@ -1824,12 +1827,14 @@ bot_crate_think()
self SetScriptGoal(crate.origin, 32); self SetScriptGoal(crate.origin, 32);
self thread bots_watch_touch_obj(crate); self thread bots_watch_touch_obj(crate);
path = self waittill_any_return("script_bad_path", "script_goal"); path = self waittill_any_return("bad_path", "goal", "new_goal");
self.bot_lock_goal = false; self.bot_lock_goal = false;
self ClearScriptGoal();
if (path != "script_goal") if (path != "new_goal")
self ClearScriptGoal();
if (path != "goal")
continue; continue;
self _DisableWeapon(); self _DisableWeapon();
@ -2238,7 +2243,7 @@ bot_killstreak_think()
{ {
if (streakName == "airdrop_mega" || streakName == "airdrop_sentry_minigun" || streakName == "airdrop") if (streakName == "airdrop_mega" || streakName == "airdrop_sentry_minigun" || streakName == "airdrop")
{ {
if (self.bot_lock_goal || self HasScriptGoal()) if (self HasScriptGoal())
continue; continue;
if (streakName != "airdrop_mega" && level.littleBirds > 2) if (streakName != "airdrop_mega" && level.littleBirds > 2)
@ -2265,8 +2270,8 @@ bot_killstreak_think()
continue; continue;
} }
self waittill_any_timeout( 15, "script_bad_path", "crate_physics_done" ); if (self waittill_any_timeout( 15, "new_goal", "crate_physics_done" ) != "new_goal")
self ClearScriptGoal(); self ClearScriptGoal();
} }
else else
{ {

1
userraw/maps/mp/bots/_bot_utility.gsc
View File

@ -123,6 +123,7 @@ SetScriptGoal(goal, dist)
{ {
self.bot.script_goal = goal; self.bot.script_goal = goal;
self.bot.script_goal_dist = dist; self.bot.script_goal_dist = dist;
self notify("new_goal_internal");
self notify("new_goal"); self notify("new_goal");
} }