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

Fix script errors

Browse Source
This commit is contained in:
INeedBots 2021-01-13 16:34:39 -06:00
parent 66c823081f
commit d12ed8606e
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
main_shared/maps/mp/bots/_bot_script.gsc
View File

@ -1110,7 +1110,7 @@ bot_turret_think()
{ {
tempTurret = turrets[i]; tempTurret = turrets[i];
if (!isDefined(tempTurret)) if (!isDefined(tempTurret) || !isDefined(tempTurret.damageTaken))
continue; continue;
if (tempTurret.damageTaken >= tempTurret.health) if (tempTurret.damageTaken >= tempTurret.health)
@ -1231,9 +1231,12 @@ bot_watch_stuck_on_crate()
{ {
crate = crates[i]; crate = crates[i];
if (!isDefined(crate) || !isDefined(crate.origin))
continue;
if ( DistanceSquared( self.origin, crate.origin ) < radius * radius ) if ( DistanceSquared( self.origin, crate.origin ) < radius * radius )
{ {
if ( crate.owner == self ) if ( isDefined(crate.owner) && crate.owner == self )
{ {
self PressUseButton( level.crateOwnerUseTime / 1000 + 0.5 ); self PressUseButton( level.crateOwnerUseTime / 1000 + 0.5 );
wait level.crateOwnerUseTime / 1000 + 0.5; wait level.crateOwnerUseTime / 1000 + 0.5;
@ -1243,6 +1246,8 @@ bot_watch_stuck_on_crate()
self PressUseButton( level.crateNonOwnerUseTime / 1000 + 0.5 ); self PressUseButton( level.crateNonOwnerUseTime / 1000 + 0.5 );
wait level.crateNonOwnerUseTime / 1000 + 0.5; wait level.crateNonOwnerUseTime / 1000 + 0.5;
} }
break;
} }
} }
} }
@ -1298,7 +1303,7 @@ bot_crate_think()
{ {
tempCrate = crates[i]; tempCrate = crates[i];
if (!IsDefined( tempCrate.friendlyObjID )) if (!isDefined(tempCrate) || !IsDefined( tempCrate.friendlyObjID ))
continue; continue;
if ( myteam == tempCrate.team ) if ( myteam == tempCrate.team )
@ -1349,13 +1354,13 @@ bot_crate_think()
if (path != "new_goal") if (path != "new_goal")
self ClearBotGoal(); self ClearBotGoal();
if (path != "goal" || DistanceSquared(self.origin, crate.origin) > radius*radius) if (path != "goal" || !isDefined(crate) || DistanceSquared(self.origin, crate.origin) > radius*radius)
continue; continue;
if(isdefined( crate.crateType.hint_gambler ) && self hasPerk("specialty_gambler") && randomInt(3)) if(isdefined( crate.crateType.hint_gambler ) && self hasPerk("specialty_gambler") && randomInt(3))
crate notify( "trigger_use_doubletap", self ); crate notify( "trigger_use_doubletap", self );
if ( crate.owner == self ) if ( isDefined(crate.owner) && crate.owner == self )
{ {
self PressUseButton( level.crateOwnerUseTime / 1000 + 0.5 ); self PressUseButton( level.crateOwnerUseTime / 1000 + 0.5 );
wait( level.crateOwnerUseTime / 1000 + 0.5 ); wait( level.crateOwnerUseTime / 1000 + 0.5 );
@ -1619,7 +1624,7 @@ bot_revive_think()
if (event != "new_goal") if (event != "new_goal")
self ClearBotGoal(); self ClearBotGoal();
if(event != "goal" || (isDefined(revivePlayer.currentlyBeingRevived) && revivePlayer.currentlyBeingRevived) || !self isTouching(revivePlayer.revivetrigger) || self InLastStand()) if(event != "goal" || !isDefined(revivePlayer) || (isDefined(revivePlayer.currentlyBeingRevived) && revivePlayer.currentlyBeingRevived) || !self isTouching(revivePlayer.revivetrigger) || self InLastStand())
{ {
self.bot_lock_goal = false; self.bot_lock_goal = false;
continue; continue;

5
main_shared/maps/mp/gametypes/_bot.gsc
View File

@ -717,11 +717,14 @@ scramble_nearby(trig)
for(;;) for(;;)
{ {
trig waittill("trigger", player); trig waittill("trigger", player);
if (!isDefined(player) || !isDefined(player.team))
continue;
if(self maps\mp\gametypes\_weaponobjects::isStunned()) if(self maps\mp\gametypes\_weaponobjects::isStunned())
continue; continue;
if(player == self.owner) if(isDefined(self.owner) && player == self.owner)
continue; continue;
if(level.teamBased && self.team == player.team) if(level.teamBased && self.team == player.team)