From 764a12dc7f9a7dd4674f903cfe4a70e71181aea8 Mon Sep 17 00:00:00 2001 From: ineed bots Date: Tue, 30 Apr 2024 12:43:16 -0600 Subject: [PATCH] small update --- maps/bots/_bot_internal.gsc | 6 +++--- maps/bots/_bot_utility.gsc | 12 +++++++++++- scripts/sp/bots_adapter_pt4.gsc | 7 +++++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/maps/bots/_bot_internal.gsc b/maps/bots/_bot_internal.gsc index 898ea4a..dc6bf08 100644 --- a/maps/bots/_bot_internal.gsc +++ b/maps/bots/_bot_internal.gsc @@ -830,7 +830,7 @@ bot_lookat( pos, time, vel, doAimPredict ) for ( i = 0; i < steps; i++ ) { myAngle = ( angleclamp180( myAngle[ 0 ] + X ), angleclamp180( myAngle[ 1 ] + Y ), 0 ); - self setplayerangles( myAngle ); + self BotBuiltinBotAngles( myAngle ); wait 0.05; } } @@ -1477,7 +1477,7 @@ aim_loop() { self thread bot_lookat( target gettagorigin( "j_spine4" ), 0.05 ); } - else if ( !nadeAimOffset && conedot > 0.999 && lengthsquared( aimoffset ) < 0.05 ) + else if ( !nadeAimOffset && conedot > 0.999995 && lengthsquared( aimoffset ) < 0.05 ) { self thread bot_lookat( aimpos, 0.05 ); } @@ -1495,7 +1495,7 @@ aim_loop() conedot = getConeDot( aimpos, eyePos, angles ); - if ( !nadeAimOffset && conedot > 0.999 && lengthsquared( aimoffset ) < 0.05 ) + if ( !nadeAimOffset && conedot > 0.999995 && lengthsquared( aimoffset ) < 0.05 ) { self thread bot_lookat( aimpos, 0.05 ); } diff --git a/maps/bots/_bot_utility.gsc b/maps/bots/_bot_utility.gsc index 1bd3f9a..fe672a0 100644 --- a/maps/bots/_bot_utility.gsc +++ b/maps/bots/_bot_utility.gsc @@ -85,8 +85,18 @@ BotBuiltinBotMeleeParams( yaw, dist ) } /* - Test if is a bot + Sets angles +*/ +BotBuiltinBotAngles( angles ) +{ + if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botangles" ] ) ) + { + self [[ level.bot_builtins[ "botangles" ] ]]( angles ); + } +} +/* + Test if is a bot */ BotBuiltinIsBot() { diff --git a/scripts/sp/bots_adapter_pt4.gsc b/scripts/sp/bots_adapter_pt4.gsc index 26eda3c..59921e0 100644 --- a/scripts/sp/bots_adapter_pt4.gsc +++ b/scripts/sp/bots_adapter_pt4.gsc @@ -5,6 +5,7 @@ init() level.bot_builtins[ "botstop" ] = ::do_botstop; level.bot_builtins[ "botmovement" ] = ::do_botmovement; level.bot_builtins[ "botmeleeparams" ] = ::do_botmeleeparams; + level.bot_builtins[ "botangles" ] = ::do_botangles; level.bot_builtins[ "isbot" ] = ::do_isbot; level.bot_builtins[ "generatepath" ] = ::do_generatepath; level.bot_builtins[ "getfunction" ] = ::do_getfunction; @@ -46,6 +47,12 @@ do_botmeleeparams( yaw, dist ) self botmeleeparams( yaw, dist ); } +do_botangles( angles ) +{ + self setplayerangles( angles ); + // self botangles( angles[ 0 ], angles[ 1 ], angles[ 2 ] ); +} + do_isbot() { return self isbot();