diff --git a/maps/bots/_bot_internal.gsc b/maps/bots/_bot_internal.gsc index 39d5f3e..c51ffbb 100644 --- a/maps/bots/_bot_internal.gsc +++ b/maps/bots/_bot_internal.gsc @@ -453,7 +453,7 @@ stance_loop() if ( self.bot.sprintendtime != -1 && time - self.bot.sprintendtime < 2000 ) return; - if ( !isDefined( self.bot.towards_goal ) || DistanceSquared( self.origin, physicsTrace( self getEyePos(), self getEyePos() + anglesToForward( self getPlayerAngles() ) * 1024, false, undefined ) ) < level.bots_minSprintDistance || getConeDot( self.bot.towards_goal, self.origin, self GetPlayerAngles() ) < 0.75 ) + if ( !isDefined( self.bot.towards_goal ) || DistanceSquared( self.origin, physicsTrace( self getEye(), self getEye() + anglesToForward( self getPlayerAngles() ) * 1024, false, undefined ) ) < level.bots_minSprintDistance || getConeDot( self.bot.towards_goal, self.origin, self GetPlayerAngles() ) < 0.75 ) return; self thread sprint(); @@ -699,7 +699,7 @@ bot_lookat( pos, time, vel, doAimPredict ) if ( steps < 1 ) steps = 1; - myEye = self GetEyePos(); // get our eye pos + myEye = self getEye(); // get our eye pos if ( doAimPredict ) { @@ -787,7 +787,7 @@ canAds( dist, curweap ) */ target_loop() { - myEye = self GetEyePos(); + myEye = self getEye(); theTime = getTime(); myAngles = self GetPlayerAngles(); myFov = self.pers["bots"]["skill"]["fov"]; @@ -1181,7 +1181,7 @@ aim_loop() { aimspeed = self.pers["bots"]["skill"]["aim_time"]; - eyePos = self getEyePos(); + eyePos = self getEye(); curweap = self getCurrentWeapon(); angles = self GetPlayerAngles(); adsAmount = self PlayerADS(); @@ -1274,7 +1274,7 @@ aim_loop() } } - self thread bot_lookat( last_pos + ( 0, 0, self getEyeHeight() + nadeAimOffset ), aimspeed ); + self thread bot_lookat( last_pos + ( 0, 0, self GetPlayerViewHeight() + nadeAimOffset ), aimspeed ); return; } @@ -1373,7 +1373,7 @@ aim_loop() nadeAimOffset = dist / 3000; } - aimpos = last_pos + ( 0, 0, self getEyeHeight() + nadeAimOffset ); + aimpos = last_pos + ( 0, 0, self GetPlayerViewHeight() + nadeAimOffset ); conedot = getConeDot( aimpos, eyePos, angles ); self thread bot_lookat( aimpos, aimspeed ); @@ -1425,7 +1425,7 @@ aim_loop() lookat = self.bot.towards_goal; if ( isDefined( lookat ) ) - self thread bot_lookat( lookat + ( 0, 0, self getEyeHeight() ), aimspeed ); + self thread bot_lookat( lookat + ( 0, 0, self GetPlayerViewHeight() ), aimspeed ); } } @@ -1488,7 +1488,7 @@ walk_loop() return; } - if ( isAi( self.bot.target.entity ) self.bot.target.trace_time && self canFire( curweap ) && self isInRange( self.bot.target.dist, curweap ) ) + if ( isAi( self.bot.target.entity ) && self.bot.target.trace_time && self canFire( curweap ) && self isInRange( self.bot.target.dist, curweap ) ) { if ( self inLastStand() || self GetStance() == "prone" || ( self.bot.is_cur_sniper && self PlayerADS() > 0 ) ) return; diff --git a/maps/bots/_bot_utility.gsc b/maps/bots/_bot_utility.gsc index 8491fdc..1f4dc37 100644 --- a/maps/bots/_bot_utility.gsc +++ b/maps/bots/_bot_utility.gsc @@ -159,7 +159,7 @@ BotBuiltinGetGuid() /* */ -BotBuiltinsSetAllowedTraversals( bot_allowed_negotiation_links ) +BotBuiltinSetAllowedTraversals( bot_allowed_negotiation_links ) { if ( isDefined( level.bot_builtins ) && isDefined( level.bot_builtins["setallowedtraversals"] ) ) { @@ -169,7 +169,7 @@ BotBuiltinsSetAllowedTraversals( bot_allowed_negotiation_links ) /* */ -BotBuiltinsSetIgnoredLinks( bot_ignore_links ) +BotBuiltinSetIgnoredLinks( bot_ignore_links ) { if ( isDefined( level.bot_builtins ) && isDefined( level.bot_builtins["setignoredlinks"] ) ) { @@ -712,24 +712,6 @@ WeaponIsFullAuto( weap ) return isDefined( weaptoks[0] ) && isString( weaptoks[0] ) && isdefined( level.bots_fullautoguns[weaptoks[0]] ); } -/* - Returns what our eye height is. -*/ -GetEyeHeight() -{ - myEye = self GetEyePos(); - - return myEye[2] - self.origin[2]; -} - -/* - Returns (iw4) eye pos. -*/ -GetEyePos() -{ - return self getTagOrigin( "tag_eye" ); -} - /* helper */ @@ -1159,8 +1141,8 @@ load_waypoints() } // arrays are passed by value in gsc... hope this isnt gunna run out of vars - BotBuiltinsSetAllowedTraversals( bot_allowed_negotiation_links ); - BotBuiltinsSetIgnoredLinks( bot_ignore_links ); + BotBuiltinSetAllowedTraversals( bot_allowed_negotiation_links ); + BotBuiltinSetIgnoredLinks( bot_ignore_links ); level.bot_ignore_links = bot_ignore_links; level.waypoints = GetAllNodes(); diff --git a/scripts/sp/bots_adapter_pt4.gsc b/scripts/sp/bots_adapter_pt4.gsc index 84a72c3..b944089 100644 --- a/scripts/sp/bots_adapter_pt4.gsc +++ b/scripts/sp/bots_adapter_pt4.gsc @@ -113,5 +113,5 @@ do_cmdexec( a ) do_ishost() { - self isHost(); + return self isHost(); }