From 0ed8dcc4accca479f5844a9cb4a2ec50ae2590ed Mon Sep 17 00:00:00 2001
From: INeedBots <ineedbots@outlook.com>
Date: Sat, 3 Oct 2020 23:43:17 -0600
Subject: [PATCH] fix multiple ?

---
 .gitignore                                   |  1 +
 userraw/maps/mp/killstreaks/_killstreaks.gsc | 21 +++++++++++++++-----
 userraw/todo.txt                             |  1 -
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5c8c546..4322a64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@
 *.stat
 logs/
 demos/
+images/
 missingasset.csv
 userraw/scripts/_commands.gsc
 userraw/scripts/_customcallbacks.gsc
diff --git a/userraw/maps/mp/killstreaks/_killstreaks.gsc b/userraw/maps/mp/killstreaks/_killstreaks.gsc
index 376609f..f0fce91 100644
--- a/userraw/maps/mp/killstreaks/_killstreaks.gsc
+++ b/userraw/maps/mp/killstreaks/_killstreaks.gsc
@@ -1277,6 +1277,15 @@ startSpecialist()
 	}
 }
 
+getSpecialistKillstreakCount(slot, count)
+{
+	dvarAmount = getDVarInt("scr_specialist_killCount_" + slot);
+	if (dvarAmount < 2)
+		return count;
+
+	return dvarAmount;
+}
+
 applySpecialistKillstreaks()
 {
 	if ( self _hasPerk( "specialty_hardline" ) )
@@ -1285,10 +1294,10 @@ applySpecialistKillstreaks()
 		modifier = 0;
 
 	killstreaks = [];
-	killstreaks[2 + modifier] = self.pers["specialist_perks"][self.class_num][0];
-	killstreaks[4 + modifier] = self.pers["specialist_perks"][self.class_num][1];
-	killstreaks[6 + modifier] = self.pers["specialist_perks"][self.class_num][2];
-	killstreaks[8 + modifier] = "specialty_onemanarmy";
+	killstreaks[getSpecialistKillstreakCount(0, 2) + modifier] = self.pers["specialist_perks"][self.class_num][0];
+	killstreaks[getSpecialistKillstreakCount(1, 4) + modifier] = self.pers["specialist_perks"][self.class_num][1];
+	killstreaks[getSpecialistKillstreakCount(2, 6) + modifier] = self.pers["specialist_perks"][self.class_num][2];
+	killstreaks[getSpecialistKillstreakCount(3, 8) + modifier] = "specialty_onemanarmy";
 
 	maxVal = -1;
 	oldStreaks = [];
@@ -1351,13 +1360,15 @@ applySpecialistKillstreaks()
 	self startKSHud();
 
 	// give xp every second kill like in mw3
-	waittillframeend;
 	self thread watchSpecialistOnKill();
 }
 
 watchSpecialistOnKill()
 {
 	self endon("disconnect");
+	
+	waittillframeend;
+	
 	self notify("watchSpecialistOnKill");
 	self endon("watchSpecialistOnKill");
 
diff --git a/userraw/todo.txt b/userraw/todo.txt
index d8bcfa2..f7a755d 100644
--- a/userraw/todo.txt
+++ b/userraw/todo.txt
@@ -4,6 +4,5 @@ unreleased gamemodes
 
 _other:
 dvars, loadout, behaviour, menu
-fun menu
 documentation and tutorials
 modules (iw4x (http), iw4m1)