From 796085a5dc7dfdbdc166375583e83751ed89bfb1 Mon Sep 17 00:00:00 2001
From: INeedBots <ineedbots@outlook.com>
Date: Thu, 1 Oct 2020 21:28:46 -0600
Subject: [PATCH] Fixed rollover

---
 userraw/maps/mp/killstreaks/_killstreaks.gsc | 12 +++++++-----
 userraw/maps/mp/killstreaks/_nuke.gsc        |  6 ++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/userraw/maps/mp/killstreaks/_killstreaks.gsc b/userraw/maps/mp/killstreaks/_killstreaks.gsc
index e31161f..6b70144 100644
--- a/userraw/maps/mp/killstreaks/_killstreaks.gsc
+++ b/userraw/maps/mp/killstreaks/_killstreaks.gsc
@@ -885,6 +885,7 @@ initKillstreakHud(inity)
 		self.killStreakHudElems[index] setPoint( "RIGHT", "RIGHT", 0, inity - 25 * i );
 		self.killStreakHudElems[index] setShader( streakShader, 20, 20 );
 		self.killStreakHudElems[index].ks_cost = streakCost;
+		self.killStreakHudElems[index].ks_name = streakName;
 		self thread destroyOnEvents(self.killStreakHudElems[index]);
 
 		if (streakCost > highestStreak)
@@ -911,15 +912,15 @@ initKillstreakHud(inity)
 		for (i = self.killStreakHudElems.size - 1; i >= 1; i--)
 		{
 			streakElem = self.killStreakHudElems[i];
-			if (curStreak < streakElem.ks_cost)
-			{
+			if (curStreak >= streakElem.ks_cost || (timesRolledOver > 0 && isSubStr(streakElem.ks_name, "specialty_")))
+				streakElem.alpha = 1;
+			else
+			{	
 				isUnderAStreak = true;
 				self.killStreakHudElems[0] setPoint( "RIGHT", "RIGHT", -25, inity - 25 * (i - 1) );
 				self.killStreakHudElems[0] setText( streakElem.ks_cost - curStreak );
 				streakElem.alpha = 0.5;
 			}
-			else
-				streakElem.alpha = 1;
 		}
 
 		if (!isUnderAStreak && self.killStreakHudElems.size)
@@ -963,6 +964,7 @@ initMW3KillstreakHud()
 		ksIcon.hideWhenInMenu = true;
 		ksIcon.foreground = true;
 		ksIcon.ks_cost = streakCost;
+		ksIcon.ks_name = streakName;
 		self thread destroyOnEvents(ksIcon);
 		self.killStreakHudElems[self.killStreakHudElems.size] = ksIcon;
 	}
@@ -1012,7 +1014,7 @@ initMW3KillstreakHud()
 		{
 			elem = self.killStreakHudElems[i];
 
-			if (curStreak >= elem.ks_cost)
+			if (curStreak >= elem.ks_cost || (timesRolledOver > 0 && isSubStr(elem.ks_name, "specialty_")))
 				elem.alpha = 0.9;
 			else
 			{
diff --git a/userraw/maps/mp/killstreaks/_nuke.gsc b/userraw/maps/mp/killstreaks/_nuke.gsc
index 2c6a548..8df96a7 100644
--- a/userraw/maps/mp/killstreaks/_nuke.gsc
+++ b/userraw/maps/mp/killstreaks/_nuke.gsc
@@ -97,6 +97,12 @@ tryUseNuke( lifeId, allowCancel )
 		return false;	
 	}
 
+	if (level.nukeEndsGame)
+	{
+		self iPrintLnBold( &"MP_NUKE_ALREADY_INBOUND" );
+		return false;
+	}
+
 	if ( self isUsingRemote() && ( !isDefined( level.gtnw ) || !level.gtnw ) )
 		return false;