diff --git a/maps/mp/bots/_bot.gsc b/maps/mp/bots/_bot.gsc index 787d399..8ff7bdb 100644 --- a/maps/mp/bots/_bot.gsc +++ b/maps/mp/bots/_bot.gsc @@ -145,7 +145,7 @@ init() level.bots_minGrenadeDistance *= level.bots_minGrenadeDistance; level.bots_maxGrenadeDistance = 1024; level.bots_maxGrenadeDistance *= level.bots_maxGrenadeDistance; - level.bots_maxKnifeDistance = 80; + level.bots_maxKnifeDistance = 128; level.bots_maxKnifeDistance *= level.bots_maxKnifeDistance; level.bots_goalDistance = 27.5; level.bots_goalDistance *= level.bots_goalDistance; diff --git a/maps/mp/bots/_bot_internal.gsc b/maps/mp/bots/_bot_internal.gsc index 26ec2fb..bee086e 100644 --- a/maps/mp/bots/_bot_internal.gsc +++ b/maps/mp/bots/_bot_internal.gsc @@ -150,6 +150,7 @@ resetBotVars() self.bot.issmokingafter = false; self.bot.isknifing = false; self.bot.isknifingafter = false; + self.bot.knifing_target = undefined; self.bot.semi_time = false; self.bot.jump_time = undefined; @@ -295,7 +296,7 @@ doBotMovement_loop( data ) } // move! - if ( self.bot.wantsprint && self.bot.issprinting ) + if ( ( self.bot.wantsprint && self.bot.issprinting ) || isDefined( self.bot.knifing_target ) ) dir = ( 127, dir[1], 0 ); self BotBuiltinBotMovement( int( dir[0] ), int( dir[1] ) ); @@ -1370,7 +1371,7 @@ aim_loop() } else { - if ( self canAds( dist, curweap ) ) + if ( self canFire( curweap ) && self isInRange( dist, curweap ) && self canAds( dist, curweap ) ) { if ( !self.bot.is_cur_sniper || !self.pers["bots"]["behavior"]["quickscope"] ) self thread pressAds(); @@ -1399,7 +1400,9 @@ aim_loop() conedot = getConeDot( aimpos, eyePos, angles ); - if ( !nadeAimOffset && conedot > 0.999 && lengthsquared( aimoffset ) < 0.05 ) + if ( isDefined( self.bot.knifing_target ) ) + self thread bot_lookat( target getTagOrigin( "j_spine4" ), 0.05 ); + else if ( !nadeAimOffset && conedot > 0.999 && lengthsquared( aimoffset ) < 0.05 ) self thread bot_lookat( aimpos, 0.05 ); else self thread bot_lookat( aimpos, aimspeed, target getVelocity(), true ); @@ -1413,13 +1416,17 @@ aim_loop() conedot = getConeDot( aimpos, eyePos, angles ); - self thread bot_lookat( aimpos, aimspeed ); + if ( !nadeAimOffset && conedot > 0.999 && lengthsquared( aimoffset ) < 0.05 ) + self thread bot_lookat( aimpos, 0.05 ); + else + self thread bot_lookat( aimpos, aimspeed ); } + // knifing dogs? if ( isplay && !self.bot.isknifingafter && conedot > 0.9 && dist < level.bots_maxKnifeDistance && trace_time > reaction_time && getDvarInt( "bots_play_knife" ) ) { self clear_bot_after_target(); - self thread knife(); + self thread knife( target ); return; } @@ -2174,16 +2181,54 @@ sprint() self BotBuiltinBotAction( "-sprint" ); } +/* + Performs melee target +*/ +do_knife_target( target ) +{ + self endon( "death" ); + self endon( "disconnect" ); + self endon( "bot_knife" ); + + if ( !isDefined( target ) || ( !isPlayer( target ) && !isai( target ) ) ) + { + self.bot.knifing_target = undefined; + self BotBuiltinBotMeleeParams( 0, 0 ); + return; + } + + dist = distance( target.origin, self.origin ); + + if ( dist > getDvarFloat( "aim_automelee_range" ) ) + { + self.bot.knifing_target = undefined; + self BotBuiltinBotMeleeParams( 0, 0 ); + return; + } + + self.bot.knifing_target = target; + + angles = VectorToAngles( target.origin - self.origin ); + self BotBuiltinBotMeleeParams( angles[1], dist ); + + wait 1; + + self.bot.knifing_target = undefined; + self BotBuiltinBotMeleeParams( 0, 0 ); +} + /* Bot will knife. */ -knife() +knife( target ) { self endon( "death" ); self endon( "disconnect" ); self notify( "bot_knife" ); self endon( "bot_knife" ); + self thread do_knife_target( target ); + self.bot.isknifing = true; self.bot.isknifingafter = true; diff --git a/maps/mp/bots/_bot_script.gsc b/maps/mp/bots/_bot_script.gsc index 6dae7cb..bcdc402 100644 --- a/maps/mp/bots/_bot_script.gsc +++ b/maps/mp/bots/_bot_script.gsc @@ -2426,7 +2426,7 @@ doReloadCancel() */ bot_weapon_think_loop( data ) { - self waittill_any_timeout( randomIntRange( 2, 4 ), "bot_force_check_switch" ); + ret = self waittill_any_timeout( randomIntRange( 2, 4 ), "bot_force_check_switch" ); if ( self BotIsFrozen() ) return; @@ -2450,6 +2450,8 @@ bot_weapon_think_loop( data ) } } + force = (ret == "bot_force_check_switch"); + if ( data.first ) { data.first = false; @@ -2467,6 +2469,8 @@ bot_weapon_think_loop( data ) if ( hasTarget ) return; } + else + force = true; } weaponslist = self getweaponslist(); @@ -2477,7 +2481,7 @@ bot_weapon_think_loop( data ) weapon = weaponslist[randomInt( weaponslist.size )]; weaponslist = array_remove( weaponslist, weapon ); - if ( !self getAmmoCount( weapon ) ) + if ( !self getAmmoCount( weapon ) && !force ) continue; if ( maps\mp\gametypes\_weapons::isHackWeapon( weapon ) ) diff --git a/maps/mp/bots/_bot_utility.gsc b/maps/mp/bots/_bot_utility.gsc index aaf3f0a..76f5319 100644 --- a/maps/mp/bots/_bot_utility.gsc +++ b/maps/mp/bots/_bot_utility.gsc @@ -118,6 +118,17 @@ BotBuiltinIsBot() return false; } +/* + Sets melee params +*/ +BotBuiltinBotMeleeParams( yaw, dist ) +{ + if ( isDefined( level.bot_builtins ) && isDefined( level.bot_builtins["botmeleeparams"] ) ) + { + self [[ level.bot_builtins["botmeleeparams" ]]]( yaw, dist ); + } +} + /* Returns if player is the host */ diff --git a/scripts/bots_adapter.gsc b/scripts/bots_adapter_pt4.gsc similarity index 82% rename from scripts/bots_adapter.gsc rename to scripts/bots_adapter_pt4.gsc index 3aea71b..903cd75 100644 --- a/scripts/bots_adapter.gsc +++ b/scripts/bots_adapter_pt4.gsc @@ -7,6 +7,7 @@ init() level.bot_builtins["botaction"] = ::do_botaction; level.bot_builtins["botstop"] = ::do_botstop; level.bot_builtins["botmovement"] = ::do_botmovement; + level.bot_builtins["botmeleeparams"] = ::do_botmeleeparams; level.bot_builtins["isbot"] = ::do_isbot; } @@ -48,6 +49,11 @@ do_botmovement( forward, right ) self BotMovement( forward, right ); } +do_botmeleeparams( yaw, dist ) +{ + // self BotMeleeParams( yaw, dist ); +} + do_isbot() { return self isBot();