From 9496e3c12279b1aa527ad4af544680b3dff30539 Mon Sep 17 00:00:00 2001 From: INeedBots Date: Tue, 22 Dec 2020 17:11:08 -0600 Subject: [PATCH] ignore smoke if have thermal scope --- userraw/maps/mp/bots/_bot_internal.gsc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/userraw/maps/mp/bots/_bot_internal.gsc b/userraw/maps/mp/bots/_bot_internal.gsc index 4b8a4b9..a17ad28 100644 --- a/userraw/maps/mp/bots/_bot_internal.gsc +++ b/userraw/maps/mp/bots/_bot_internal.gsc @@ -748,6 +748,7 @@ target() initReactTime = self.pers["bots"]["skill"]["init_react_time"]; hasTarget = isDefined(self.bot.target); usingRemote = self isUsingRemote(); + ignoreSmoke = isSubStr(self GetCurrentWeapon(), "_thermal_"); vehEnt = undefined; if (usingRemote) @@ -786,7 +787,7 @@ target() if (isDefined(self.bot.script_target_offset)) entOrigin += self.bot.script_target_offset; - if(SmokeTrace(myEye, entOrigin, level.smokeRadius) && bulletTracePassed(myEye, entOrigin, false, ent)) + if(ignoreSmoke || (SmokeTrace(myEye, entOrigin, level.smokeRadius)) && bulletTracePassed(myEye, entOrigin, false, ent)) { if(!isObjDef) { @@ -852,7 +853,8 @@ target() distanceSquared(PhysicsTrace( myEye, targetAnkleLeft, false, self ), targetAnkleLeft) < 0.05 || distanceSquared(PhysicsTrace( myEye, targetAnkleRight, false, self ), targetAnkleRight) < 0.05) - && (SmokeTrace(myEye, player.origin, level.smokeRadius) || + && (ignoreSmoke || + SmokeTrace(myEye, player.origin, level.smokeRadius) || daDist < level.bots_maxKnifeDistance*4) && (getConeDot(player.origin, self.origin, myAngles) >= myFov ||