modded gsc

This commit is contained in:
INeedBots
2020-09-22 18:45:44 -06:00
parent 1480e11f0a
commit a42a4dc37b
8 changed files with 2439 additions and 843 deletions

View File

@ -1,3 +1,10 @@
/*
_perkfunctions modded
Author: INeedGames
Date: 09/22/2020
Readds optional painkiller and one man army refills noobtubes.
*/
/*******************************************************************
// _perkfunctions.gsc
//
@ -121,8 +128,11 @@ setCombatHigh()
level endon( "end_game" );
self.damageBlockedTotal = 0;
self.moveSpeedScaler = 1.25;
self maps\mp\gametypes\_weapons::updateMoveSpeedScale( "primary" );
if (level.combathighIsJuiced)
{
self.moveSpeedScaler = 1.25;
self maps\mp\gametypes\_weapons::updateMoveSpeedScale( "primary" );
}
//self visionSetNakedForPlayer( "end_game", 1 );
if ( level.splitscreen )
@ -149,7 +159,11 @@ setCombatHigh()
self.combatHighTimer = createTimer( "hudsmall", 1.0 );
self.combatHighTimer setPoint( "CENTER", "CENTER", 0, yOffset );
self.combatHighTimer setTimer( 7.0 );
if (level.combathighIsJuiced)
self.combatHighTimer setTimer( 7.0 );
else
self.combatHighTimer setTimer( 10.0 );
self.combatHighTimer.color = (.8,.8,0);
self.combatHighTimer.archived = false;
self.combatHighTimer.foreground = true;
@ -170,7 +184,10 @@ setCombatHigh()
self thread unsetCombatHighOnDeath();
wait( 5 );
if (level.combathighIsJuiced)
wait( 5 );
else
wait( 8 );
self.combatHighIcon fadeOverTime( 2.0 );
self.combatHighIcon.alpha = 0.0;
@ -184,14 +201,17 @@ setCombatHigh()
wait( 2 );
self.damageBlockedTotal = undefined;
self.moveSpeedScaler = 1;
if (self _hasperk( "specialty_lightweight" ))
if (level.combathighIsJuiced)
{
self.moveSpeedScaler = 1.07;
}
self.moveSpeedScaler = 1;
self maps\mp\gametypes\_weapons::updateMoveSpeedScale( "primary" );
if (self _hasperk( "specialty_lightweight" ))
{
self.moveSpeedScaler = 1.07;
}
self maps\mp\gametypes\_weapons::updateMoveSpeedScale( "primary" );
}
self _unsetPerk( "specialty_combathigh" );
}
@ -203,11 +223,14 @@ unsetCombatHighOnDeath()
self waittill ( "death" );
self.moveSpeedScaler = 1;
if (self _hasperk( "specialty_lightweight" ))
if (level.combathighIsJuiced)
{
self.moveSpeedScaler = 1.07;
self.moveSpeedScaler = 1;
if (self _hasperk( "specialty_lightweight" ))
{
self.moveSpeedScaler = 1.07;
}
}
self thread _unsetPerk( "specialty_combathigh" );
@ -220,11 +243,14 @@ unsetCombatHigh()
self.combatHighIcon destroy();
self.combatHighTimer destroy();
self.moveSpeedScaler = 1;
if (self _hasperk( "specialty_lightweight" ))
if (level.combathighIsJuiced)
{
self.moveSpeedScaler = 1.07;
self.moveSpeedScaler = 1;
if (self _hasperk( "specialty_lightweight" ))
{
self.moveSpeedScaler = 1.07;
}
}
}
@ -366,9 +392,12 @@ setLightWeight()
{
self.moveSpeedScaler = 1.07;
if (self _hasperk( "specialty_combathigh" ))
if (level.combathighIsJuiced)
{
self.moveSpeedScaler = 1.4;
if (self _hasperk( "specialty_combathigh" ))
{
self.moveSpeedScaler = 1.4;
}
}
self maps\mp\gametypes\_weapons::updateMoveSpeedScale( "primary" );
@ -693,6 +722,9 @@ giveOneManArmyClass( className )
self notify ( "changed_kit" );
level notify ( "changed_kit" );
if (level.onemanarmyRefillsTubes)
return;
weaponNameSize = self getCurrentWeapon().size;
if( getSubStr( self getCurrentWeapon(), weaponNameSize - 6, weaponNameSize ) == "_gl_mp" )

View File

@ -1,3 +1,19 @@
/*
_perks modded
Author: INeedGames
Date: 09/22/2020
Readds optional painkiller and one man army refills noobtubes.
DVARS:
- combathighIsJuiced <bool>
false - painkiller is in the game
true - (default) replaces painkiller with juiced from mw3
- onemanarmyRefillsTubes <bool>
false - (default) One Man Army does not refill the gl attachment
true - it does
*/
#include common_scripts\utility;
#include maps\mp\_utility;
#include maps\mp\gametypes\_hud_util;
@ -178,6 +194,12 @@ init()
level.perkSetFuncs["specialty_tacticalinsertion"] = ::setTacticalInsertion;
level.perkUnsetFuncs["specialty_tacticalinsertion"] = ::unsetTacticalInsertion;
setDvarIfUninitialized( "combathighIsJuiced", true );
level.combathighIsJuiced = getDvarInt( "combathighIsJuiced" );
setDvarIfUninitialized( "onemanarmyRefillsTubes", false );
level.onemanarmyRefillsTubes = getDvarInt( "onemanarmyRefillsTubes" );
initPerkDvars();
level thread onPlayerConnect();
@ -320,10 +342,10 @@ 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.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)) )
{
@ -351,7 +373,7 @@ cac_modified_damage( victim, attacker, damage, meansofdeath, weapon, impactPoint
break;
}
}
}*/
}
return int( damage + damageAdd );
}