From 703ae41222a0eaa07c3f2364dff7d6423b5d9585 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 18 Sep 2020 14:25:40 -0600 Subject: [PATCH] fix emp --- userraw/maps/mp/bots/_bot_script.gsc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/userraw/maps/mp/bots/_bot_script.gsc b/userraw/maps/mp/bots/_bot_script.gsc index dafbb87..e1c7278 100644 --- a/userraw/maps/mp/bots/_bot_script.gsc +++ b/userraw/maps/mp/bots/_bot_script.gsc @@ -3019,6 +3019,13 @@ bot_killstreak_think() self thread clear_remote_on_death(); wait 1; self notify("bot_clear_remote_on_death"); + + if (self isEMPed()) + { + self ClearUsingRemote(); + self setSpawnWeapon(curWeap); + continue; + } self maps\mp\killstreaks\_killstreaks::usedKillstreak( "predator_missile", true ); self maps\mp\killstreaks\_killstreaks::shuffleKillStreaksFILO( "predator_missile" ); @@ -3049,6 +3056,14 @@ bot_killstreak_think() wait 1; self notify("bot_clear_remote_on_death"); + if (self isEMPed()) // bcuz of the wait + { + level.ac130InUse = false; + self ClearUsingRemote(); + self setSpawnWeapon(curWeap); + continue; + } + self maps\mp\_matchdata::logKillstreakEvent( "ac130", self.origin ); self.ac130LifeId = self.pers["killstreaks"][0].lifeId; @@ -3076,6 +3091,13 @@ bot_killstreak_think() wait 1; self notify("bot_clear_remote_on_death"); + if (isDefined( level.chopper ) || self isEMPed()) + { + self ClearUsingRemote(); + self setSpawnWeapon(curWeap); + continue; + } + self thread maps\mp\killstreaks\_helicopter::startHelicopter(self.pers["killstreaks"][0].lifeId, "minigun"); self maps\mp\killstreaks\_killstreaks::usedKillstreak( "helicopter_minigun", true );