Future/iw4_bot_warfare
1
0
Fork 0
mirror of https://github.com/ineedbots/iw4_bot_warfare.git synced 2025-04-23 06:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed rollover

Browse Source
This commit is contained in:
INeedBots 2020-10-01 21:28:46 -06:00
parent 5f9b5c5a20
commit 796085a5dc
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
userraw/maps/mp/killstreaks/_killstreaks.gsc
View File

@ -885,6 +885,7 @@ initKillstreakHud(inity)
self.killStreakHudElems[index] setPoint( "RIGHT", "RIGHT", 0, inity - 25 * i ); self.killStreakHudElems[index] setPoint( "RIGHT", "RIGHT", 0, inity - 25 * i );
self.killStreakHudElems[index] setShader( streakShader, 20, 20 ); self.killStreakHudElems[index] setShader( streakShader, 20, 20 );
self.killStreakHudElems[index].ks_cost = streakCost; self.killStreakHudElems[index].ks_cost = streakCost;
self.killStreakHudElems[index].ks_name = streakName;
self thread destroyOnEvents(self.killStreakHudElems[index]); self thread destroyOnEvents(self.killStreakHudElems[index]);
if (streakCost > highestStreak) if (streakCost > highestStreak)
@ -911,15 +912,15 @@ initKillstreakHud(inity)
for (i = self.killStreakHudElems.size - 1; i >= 1; i--) for (i = self.killStreakHudElems.size - 1; i >= 1; i--)
{ {
streakElem = self.killStreakHudElems[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; isUnderAStreak = true;
self.killStreakHudElems[0] setPoint( "RIGHT", "RIGHT", -25, inity - 25 * (i - 1) ); self.killStreakHudElems[0] setPoint( "RIGHT", "RIGHT", -25, inity - 25 * (i - 1) );
self.killStreakHudElems[0] setText( streakElem.ks_cost - curStreak ); self.killStreakHudElems[0] setText( streakElem.ks_cost - curStreak );
streakElem.alpha = 0.5; streakElem.alpha = 0.5;
} }
else
streakElem.alpha = 1;
} }
if (!isUnderAStreak && self.killStreakHudElems.size) if (!isUnderAStreak && self.killStreakHudElems.size)
@ -963,6 +964,7 @@ initMW3KillstreakHud()
ksIcon.hideWhenInMenu = true; ksIcon.hideWhenInMenu = true;
ksIcon.foreground = true; ksIcon.foreground = true;
ksIcon.ks_cost = streakCost; ksIcon.ks_cost = streakCost;
ksIcon.ks_name = streakName;
self thread destroyOnEvents(ksIcon); self thread destroyOnEvents(ksIcon);
self.killStreakHudElems[self.killStreakHudElems.size] = ksIcon; self.killStreakHudElems[self.killStreakHudElems.size] = ksIcon;
} }
@ -1012,7 +1014,7 @@ initMW3KillstreakHud()
{ {
elem = self.killStreakHudElems[i]; 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; elem.alpha = 0.9;
else else
{ {

6
userraw/maps/mp/killstreaks/_nuke.gsc
View File

@ -97,6 +97,12 @@ tryUseNuke( lifeId, allowCancel )
return false; return false;
} }
if (level.nukeEndsGame)
{
self iPrintLnBold( &"MP_NUKE_ALREADY_INBOUND" );
return false;
}
if ( self isUsingRemote() && ( !isDefined( level.gtnw ) || !level.gtnw ) ) if ( self isUsingRemote() && ( !isDefined( level.gtnw ) || !level.gtnw ) )
return false; return false;