fix multiple ?

This commit is contained in:
INeedBots 2020-10-03 23:43:17 -06:00
parent 51238d5c94
commit 0ed8dcc4ac
3 changed files with 17 additions and 6 deletions

1
.gitignore vendored
View File

@ -20,6 +20,7 @@
*.stat *.stat
logs/ logs/
demos/ demos/
images/
missingasset.csv missingasset.csv
userraw/scripts/_commands.gsc userraw/scripts/_commands.gsc
userraw/scripts/_customcallbacks.gsc userraw/scripts/_customcallbacks.gsc

View File

@ -1277,6 +1277,15 @@ startSpecialist()
} }
} }
getSpecialistKillstreakCount(slot, count)
{
dvarAmount = getDVarInt("scr_specialist_killCount_" + slot);
if (dvarAmount < 2)
return count;
return dvarAmount;
}
applySpecialistKillstreaks() applySpecialistKillstreaks()
{ {
if ( self _hasPerk( "specialty_hardline" ) ) if ( self _hasPerk( "specialty_hardline" ) )
@ -1285,10 +1294,10 @@ applySpecialistKillstreaks()
modifier = 0; modifier = 0;
killstreaks = []; killstreaks = [];
killstreaks[2 + modifier] = self.pers["specialist_perks"][self.class_num][0]; killstreaks[getSpecialistKillstreakCount(0, 2) + modifier] = self.pers["specialist_perks"][self.class_num][0];
killstreaks[4 + modifier] = self.pers["specialist_perks"][self.class_num][1]; killstreaks[getSpecialistKillstreakCount(1, 4) + modifier] = self.pers["specialist_perks"][self.class_num][1];
killstreaks[6 + modifier] = self.pers["specialist_perks"][self.class_num][2]; killstreaks[getSpecialistKillstreakCount(2, 6) + modifier] = self.pers["specialist_perks"][self.class_num][2];
killstreaks[8 + modifier] = "specialty_onemanarmy"; killstreaks[getSpecialistKillstreakCount(3, 8) + modifier] = "specialty_onemanarmy";
maxVal = -1; maxVal = -1;
oldStreaks = []; oldStreaks = [];
@ -1351,13 +1360,15 @@ applySpecialistKillstreaks()
self startKSHud(); self startKSHud();
// give xp every second kill like in mw3 // give xp every second kill like in mw3
waittillframeend;
self thread watchSpecialistOnKill(); self thread watchSpecialistOnKill();
} }
watchSpecialistOnKill() watchSpecialistOnKill()
{ {
self endon("disconnect"); self endon("disconnect");
waittillframeend;
self notify("watchSpecialistOnKill"); self notify("watchSpecialistOnKill");
self endon("watchSpecialistOnKill"); self endon("watchSpecialistOnKill");

View File

@ -4,6 +4,5 @@ unreleased gamemodes
_other: _other:
dvars, loadout, behaviour, menu dvars, loadout, behaviour, menu
fun menu
documentation and tutorials documentation and tutorials
modules (iw4x (http), iw4m1) modules (iw4x (http), iw4m1)