Future/t4sp_bot_warfare
1
0
Fork 0
mirror of https://github.com/JezuzLizard/t4sp_bot_warfare.git synced 2025-04-21 14:05:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
ineed bots 2023-12-11 17:11:08 -06:00
parent f95e0ac9fb
commit 7458491ac1
3 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
maps/bots/_bot_internal.gsc
View File

@ -453,7 +453,7 @@ stance_loop()
if ( self.bot.sprintendtime != -1 && time - self.bot.sprintendtime < 2000 ) if ( self.bot.sprintendtime != -1 && time - self.bot.sprintendtime < 2000 )
return; 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; return;
self thread sprint(); self thread sprint();
@ -699,7 +699,7 @@ bot_lookat( pos, time, vel, doAimPredict )
if ( steps < 1 ) if ( steps < 1 )
steps = 1; steps = 1;
myEye = self GetEyePos(); // get our eye pos myEye = self getEye(); // get our eye pos
if ( doAimPredict ) if ( doAimPredict )
{ {
@ -787,7 +787,7 @@ canAds( dist, curweap )
*/ */
target_loop() target_loop()
{ {
myEye = self GetEyePos(); myEye = self getEye();
theTime = getTime(); theTime = getTime();
myAngles = self GetPlayerAngles(); myAngles = self GetPlayerAngles();
myFov = self.pers["bots"]["skill"]["fov"]; myFov = self.pers["bots"]["skill"]["fov"];
@ -1181,7 +1181,7 @@ aim_loop()
{ {
aimspeed = self.pers["bots"]["skill"]["aim_time"]; aimspeed = self.pers["bots"]["skill"]["aim_time"];
eyePos = self getEyePos(); eyePos = self getEye();
curweap = self getCurrentWeapon(); curweap = self getCurrentWeapon();
angles = self GetPlayerAngles(); angles = self GetPlayerAngles();
adsAmount = self PlayerADS(); 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; return;
} }
@ -1373,7 +1373,7 @@ aim_loop()
nadeAimOffset = dist / 3000; nadeAimOffset = dist / 3000;
} }
aimpos = last_pos + ( 0, 0, self getEyeHeight() + nadeAimOffset ); aimpos = last_pos + ( 0, 0, self GetPlayerViewHeight() + nadeAimOffset );
conedot = getConeDot( aimpos, eyePos, angles ); conedot = getConeDot( aimpos, eyePos, angles );
self thread bot_lookat( aimpos, aimspeed ); self thread bot_lookat( aimpos, aimspeed );
@ -1425,7 +1425,7 @@ aim_loop()
lookat = self.bot.towards_goal; lookat = self.bot.towards_goal;
if ( isDefined( lookat ) ) 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; 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 ) ) if ( self inLastStand() || self GetStance() == "prone" || ( self.bot.is_cur_sniper && self PlayerADS() > 0 ) )
return; return;

26
maps/bots/_bot_utility.gsc
View File

@ -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"] ) ) 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"] ) ) 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]] ); 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 helper
*/ */
@ -1159,8 +1141,8 @@ load_waypoints()
} }
// arrays are passed by value in gsc... hope this isnt gunna run out of vars // arrays are passed by value in gsc... hope this isnt gunna run out of vars
BotBuiltinsSetAllowedTraversals( bot_allowed_negotiation_links ); BotBuiltinSetAllowedTraversals( bot_allowed_negotiation_links );
BotBuiltinsSetIgnoredLinks( bot_ignore_links ); BotBuiltinSetIgnoredLinks( bot_ignore_links );
level.bot_ignore_links = bot_ignore_links; level.bot_ignore_links = bot_ignore_links;
level.waypoints = GetAllNodes(); level.waypoints = GetAllNodes();

2
scripts/sp/bots_adapter_pt4.gsc
View File

@ -113,5 +113,5 @@ do_cmdexec( a )
do_ishost() do_ishost()
{ {
self isHost(); return self isHost();
} }