From 3c96c5df4285d9ce5be70cb33b2c630cddad12fa Mon Sep 17 00:00:00 2001
From: INeedBots <ineedbots@outlook.com>
Date: Sun, 20 Sep 2020 23:56:02 -0600
Subject: [PATCH] combathigh

---
 main/server.cfg                             | 3 +++
 userraw/maps/mp/{bots => }/perks/_perks.gsc | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 rename userraw/maps/mp/{bots => }/perks/_perks.gsc (95%)

diff --git a/main/server.cfg b/main/server.cfg
index 500c73a..26aa4c6 100644
--- a/main/server.cfg
+++ b/main/server.cfg
@@ -535,3 +535,6 @@ set scr_nukeKillsAll "0"
 
 // _emp
 set scr_empEffectsAll "0"
+
+// _perks
+set combathighIsJuiced "1"
diff --git a/userraw/maps/mp/bots/perks/_perks.gsc b/userraw/maps/mp/perks/_perks.gsc
similarity index 95%
rename from userraw/maps/mp/bots/perks/_perks.gsc
rename to userraw/maps/mp/perks/_perks.gsc
index 92e4863..371561f 100644
--- a/userraw/maps/mp/bots/perks/_perks.gsc
+++ b/userraw/maps/mp/perks/_perks.gsc
@@ -178,6 +178,9 @@ init()
 	level.perkSetFuncs["specialty_tacticalinsertion"] = ::setTacticalInsertion;
 	level.perkUnsetFuncs["specialty_tacticalinsertion"] = ::unsetTacticalInsertion;
 
+	setDvarIfUninitialized( "combathighIsJuiced", false );
+	level.combathighIsJuiced = getDvarInt( "combathighIsJuiced" );
+
 	initPerkDvars();
 
 	level thread onPlayerConnect();
@@ -323,7 +326,7 @@ cac_modified_damage( victim, attacker, damage, meansofdeath, weapon, impactPoint
 	//if ( ( victim.xpScaler == 2 && isDefined( attacker ) ) && ( isPlayer( attacker ) || attacker.classname == "scrip_vehicle" ) )
 	//	damageAdd += 200;
 	
-	if ( victim _hasperk( "specialty_combathigh" ) )
+	if ( victim _hasperk( "specialty_combathigh" ) && !level.combathighIsJuiced )
 	{
 		if ( IsDefined( self.damageBlockedTotal ) && (!level.teamBased || (isDefined( attacker ) && isDefined( attacker.team ) && victim.team != attacker.team)) )
 		{