From 6c28abdbaa94ee52d20d01a67abff78ef8fa5a69 Mon Sep 17 00:00:00 2001
From: INeedBots <ineedbots@outlook.com>
Date: Tue, 12 Jan 2021 14:28:00 -0600
Subject: [PATCH] fast ac130

---
 main/pvbrust.cfg                             |  1 +
 main/pvbvote.cfg                             |  1 +
 main/server.cfg                              |  1 +
 userraw/maps/mp/gametypes/_class.gsc         |  3 +++
 userraw/maps/mp/killstreaks/_ac130.gsc       | 11 ++++++++++-
 userraw/maps/mp/killstreaks/_killstreaks.gsc |  3 +++
 6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/main/pvbrust.cfg b/main/pvbrust.cfg
index 5f05015..de3f953 100644
--- a/main/pvbrust.cfg
+++ b/main/pvbrust.cfg
@@ -642,6 +642,7 @@ set scr_airdrop_patchDupeGlitch "0"
 // _ac130
 set scr_ac130_duration "30"
 set scr_ac130_flares "1"
+set scr_ac130_fast "1"
 
 // _uav
 set scr_uav_timeout "30"
diff --git a/main/pvbvote.cfg b/main/pvbvote.cfg
index 8fdc4c2..f72af99 100644
--- a/main/pvbvote.cfg
+++ b/main/pvbvote.cfg
@@ -642,6 +642,7 @@ set scr_airdrop_patchDupeGlitch "0"
 // _ac130
 set scr_ac130_duration "30"
 set scr_ac130_flares "1"
+set scr_ac130_fast "1"
 
 // _uav
 set scr_uav_timeout "30"
diff --git a/main/server.cfg b/main/server.cfg
index b748e60..b9d7555 100644
--- a/main/server.cfg
+++ b/main/server.cfg
@@ -642,6 +642,7 @@ set scr_airdrop_patchDupeGlitch "0"
 // _ac130
 set scr_ac130_duration "30"
 set scr_ac130_flares "1"
+set scr_ac130_fast "1"
 
 // _uav
 set scr_uav_timeout "30"
diff --git a/userraw/maps/mp/gametypes/_class.gsc b/userraw/maps/mp/gametypes/_class.gsc
index 9bf15cd..b5f4910 100644
--- a/userraw/maps/mp/gametypes/_class.gsc
+++ b/userraw/maps/mp/gametypes/_class.gsc
@@ -1114,6 +1114,9 @@ setKillstreaks( streak1, streak2, streak3 )
 
 	// defcon rollover
 	maxRollOvers = 10;
+	if (isDefined(level.maxKillstreakRollover))
+		maxRollOvers = level.maxKillstreakRollover;
+
 	newKillstreaks = self.killstreaks;
 	for ( rollOver = 1; rollOver <= maxRollOvers; rollOver++ )
 	{
diff --git a/userraw/maps/mp/killstreaks/_ac130.gsc b/userraw/maps/mp/killstreaks/_ac130.gsc
index 5e5d644..e4fe794 100644
--- a/userraw/maps/mp/killstreaks/_ac130.gsc
+++ b/userraw/maps/mp/killstreaks/_ac130.gsc
@@ -10,6 +10,9 @@
 		- scr_ac130_flares <int>
 			2 - (default) how many flares a ac130 has
 
+		- scr_ac130_fast <bool>
+			0 - (default) if to allow users to use ac130 faster
+
 	Thanks: H3X1C, Emosewaj
 */
 
@@ -22,8 +25,10 @@ init()
 
 	setDvarIfUninitialized( "scr_ac130_duration", 40 );				
 	setDvarIfUninitialized(  "scr_ac130_flares", 2 );
+	setDvarIfUninitialized(  "scr_ac130_fast", false );
 	level.ac130_use_duration = getDvarInt( "scr_ac130_duration" );
 	level.ac130_num_flares= getDvarInt( "scr_ac130_flares" );
+	level.ac130_fast= getDvarInt( "scr_ac130_fast" );
 
 	makeDvarServerInfo( "ui_ac130usetime", level.ac130_use_duration );
 	
@@ -660,6 +665,9 @@ removeAC130Player( player, disconnected )
 		level.ac130InUse = false;
 		return;
 	}
+
+	if (level.ac130_fast)
+		level.ac130InUse = false;
 	
 	ac130model = spawn( "script_model", level.ac130.planeModel getTagOrigin( "tag_origin" ) );
 	ac130model.angles = level.ac130.planeModel.angles;
@@ -676,7 +684,8 @@ removeAC130Player( player, disconnected )
 	wait ( 5.0 );
 	ac130model thread deployFlares( true );
 
-	level.ac130InUse = false;
+	if (!level.ac130_fast)
+		level.ac130InUse = false;
 
 	wait ( 30.0 );
 
diff --git a/userraw/maps/mp/killstreaks/_killstreaks.gsc b/userraw/maps/mp/killstreaks/_killstreaks.gsc
index b441b4b..43de916 100644
--- a/userraw/maps/mp/killstreaks/_killstreaks.gsc
+++ b/userraw/maps/mp/killstreaks/_killstreaks.gsc
@@ -13,6 +13,9 @@
 		- scr_maxKillstreakRollover <int>
 			10 - (default) allow to rollover killstreaks <int> times. (remember you are limited to 10 rollovers as defined in _class.gsc)
 
+		- scr_currentRolloverKillstreaksOnlyIncrease <bool>
+			0 - (default) if only killstreaks from their current rollover will increase streak
+
 		- scr_killstreak_mod <int>
 			0 - (default) offsets all killstreaks reward costs by <int> amount