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)) ) {