From 484a25a81b140061db1b663a0cc4d38644b809fe Mon Sep 17 00:00:00 2001
From: INeedBots <ineedbots@outlook.com>
Date: Tue, 22 Sep 2020 20:13:19 -0600
Subject: [PATCH] allow queue

---
 main/server.cfg                             | 47 +++++++++++----------
 userraw/maps/mp/killstreaks/_helicopter.gsc |  6 ++-
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/main/server.cfg b/main/server.cfg
index dab2226..954d012 100644
--- a/main/server.cfg
+++ b/main/server.cfg
@@ -461,20 +461,20 @@ set scr_gtnw_promode "0"
 
 set sv_maprotation "map mp_rust"
 
+// vanilla script
+set perk_scavengerMode "0"
+set scr_deleteexplosivesonspawn "1"
+set scr_maxPerPlayerExplosives "2"
+set scr_nukeCancelMode "0"
 
+// iw4x
+set scr_player_forceautoassign "1"
+set scr_rankedmatch "1"
 set sv_enableJavelinBug "1"
 set g_playerEjection "1"
 set g_playerCollision "1"
 set sv_enableBounces "1"
 
-set perk_scavengerMode "0"
-set scr_deleteexplosivesonspawn "1"
-set scr_maxPerPlayerExplosives "2"
-
-
-set scr_player_forceautoassign "1"
-set scr_rankedmatch "1"
-
 
 // CUSTOM
 
@@ -509,7 +509,7 @@ set sv_printradarupdates "1"
 set scr_extraDamageFeedback "1"
 set scr_printDamage "1"
 set scr_disableKnife "0"
-set scr_intermission_time "0"
+set scr_intermissionTime "0"
 set scr_forceKillcam "1"
 set scr_forceKillcam_winnersKill "0"
 set scr_game_allowFinalKillcam "1"
@@ -524,9 +524,7 @@ set scr_voting_bots "0"
 set scr_nuke_increases_streak "0"
 set headshot_detach_head "1"
 
-
 // _weapon
-
 set scr_allowDropWeaponOnCommand "1"
 set scr_allowPickUpEquipment "1"
 set scr_allowDropWeaponOnDeath "1"
@@ -534,21 +532,24 @@ set scr_allowClaymoreBounces "1"
 set scr_extraTeamIcons "1"
 set scr_deleteNadeOnTeamChange "1"
 
-
-// _nuke
-set scr_nukeEndsGame "0"
-set scr_nukeKillsAll "0"
-
-// _emp
-set scr_empEffectsAll "0"
-
-// _perks
-set combathighIsJuiced "1"
-
 // _perkfunctions
+set combathighIsJuiced "1"
 set onemanarmyRefillsTubes "1"
 
 // _killstreaks
-set scr_killstreaksRollover "1"
+set scr_killstreak_rollover "1"
 set scr_killstreakHud "1"
 set scr_maxKillstreakRollover "1"
+set scr_killstreak_mod "0"
+
+// _nuke
+set scr_nuke_is_moab "1"
+set scr_nuke_kills_all "0"
+set scr_nuke_emp_duration "30"
+
+// _emp
+set scr_emp_doesFriendlyFire "0"
+set scr_emp_duration "60"
+
+// _helicopter
+set scr_helicopter_allowQueue "0"
diff --git a/userraw/maps/mp/killstreaks/_helicopter.gsc b/userraw/maps/mp/killstreaks/_helicopter.gsc
index 7651777..4609cb7 100644
--- a/userraw/maps/mp/killstreaks/_helicopter.gsc
+++ b/userraw/maps/mp/killstreaks/_helicopter.gsc
@@ -33,6 +33,10 @@ init()
 	
 	level.chopper = undefined;
 
+	setDvarIfUninitialized( "scr_helicopter_allowQueue", true );
+
+	level.helicopter_allowQueue = getDVarInt("scr_helicopter_allowQueue");
+
 	// array of paths, each element is an array of start nodes that all leads to a single destination node
 	level.heli_start_nodes = getEntArray( "heli_start", "targetname" );
 	assertEx( level.heli_start_nodes.size, "No \"heli_start\" nodes found in map!" );
@@ -219,7 +223,7 @@ tryUseHelicopter( lifeId, heliType )
 		return false;
 	}
 	
-	if ( (!isDefined( heliType ) || heliType == "flares") && isDefined( level.chopper ) )
+	if ( (!isDefined( heliType ) || heliType == "flares") && isDefined( level.chopper ) && level.helicopter_allowQueue )
 	{
 		self iPrintLnBold( &"MP_HELI_IN_QUEUE" );