use of replaceFunc

raw/scripts/bots_test.gsc

@@ -1,98 +0,0 @@
-#include maps\mp\_utility;
-#include maps\mp\gametypes\_hud_util;
-#include common_scripts\utility;
-#include maps\mp\bots\_bot_utility;
-
-init()
-{
-	setDvarIfUninitialized( "bots_test", true );
-
-	if (!getDvarInt("bots_test"))
-		return;
-
-	level thread onConnected();
-	level thread onframe();
-}
-
-onframe()
-{
-	for(;;)
-	{
-		wait 0.05;
-
-		if(getDvarInt("developer")) print("time:" + getTime() + "  child0:" + getVarUsage(0) + "  child1:" + getVarUsage(1) + "  notifycount:" + getVarUsage(2) + "  sound:" + getVarUsage(3, 2140) + "  fx:" + getVarUsage(3, 2780) + "  vol:" + getVarUsage(3, 3036) + "  anim:" + getVarUsage(3, 3681) + "  veh:" + getVarUsage(3, 2108) + "  localstr:" + getVarUsage(3, 469) + "  mat:" + getVarUsage(3, 3084) + "  3340:" + getVarUsage(3, 3340) + "  2524:" + getVarUsage(3, 2524));
-	}
-}
-
-onConnected()
-{
-	for (;;)
-	{
-		level waittill("connected", player);
-
-		player thread test();
-		player thread onSpawn();
-	}
-}
-
-onSpawn()
-{
-	self endon("disconnect");
-
-	for (;;)
-	{
-		self waittill("spawned_player");
-
-		self thread spawned();
-	}
-}
-
-giveAllKillstreaks()
-{
-	killstreaks = maps\mp\bots\_bot_script::getKillstreaks();
-
-	for ( i = 0; i < killstreaks.size; i++ )
-	{
-		j = randomInt(killstreaks.size);
-		ks = killstreaks[i];
-		killstreaks[i] = killstreaks[j];
-		killstreaks[j] = ks;
-	}
-
-	for (i = 0; i < killstreaks.size; i++)
-	{
-		ks = killstreaks[i];
-
-		if (isSubstr(ks, "specialty_"))
-			continue;
-
-		self maps\mp\killstreaks\_killstreaks::giveKillstreak(ks);
-	}
-}
-
-spawned()
-{
-	self endon("disconnect");
-	self endon("death");
-
-	wait 0.5;
-
-	//self giveAllKillstreaks();
-}
-
-test()
-{
-	self endon("disconnect");
-
-	for (;;)
-	{
-		wait 0.05;
-
-		if (self is_bot())
-		{
-		}
-		else
-		{
-		}
-	}
-}

raw/scripts/nukespawns.gsc

@@ -1,3 +1,7 @@
+#include common_scripts\utility;
+#include maps\mp\_utility;
+#include maps\mp\gametypes\_hud_util;
+
 init()
 {
 	level thread watchNuke();
@@ -8,6 +12,454 @@ init()
 	level.allowPrintDamage = true;
 }
 
+main()
+{
+	// fix G-GetPlayereye bug
+	replaceFunc( maps\mp\killstreaks\_helicopter::heli_leave, ::heli_leave );
+	replaceFunc( maps\mp\killstreaks\_helicopter::heli_explode, ::heli_explode );
+
+	// allow scr_xpscale to be anything
+	replaceFunc( maps\mp\gametypes\_rank::init, ::rank_init );
+	replaceFunc( maps\mp\gametypes\_rank::syncXPStat, ::syncXPStat );
+
+	// add scr_spawnpointfavorweight dvar
+	replaceFunc( maps\mp\gametypes\_spawnlogic::getSpawnpoint_NearTeam, ::getSpawnpoint_NearTeam );
+
+	// add damage numbers
+	replaceFunc( maps\mp\gametypes\_damage::finishPlayerDamageWrapper, ::finishPlayerDamageWrapper );
+
+	// more perks for specialist bonus
+	replaceFunc( maps\mp\killstreaks\_killstreaks::giveAllPerks, ::giveAllPerks );
+
+	// scavenge all types of ammo
+	replaceFunc( maps\mp\gametypes\_weapons::handleScavengerBagPickup, ::handleScavengerBagPickup );
+}
+
+heli_explode( var_0 )
+{
+	self notify( "death" );
+
+	if ( isdefined( var_0 ) && isdefined( level.chopper_fx["explode"]["air_death"][self.heli_type] ) )
+	{
+		var_1 = self gettagangles( "tag_deathfx" );
+		playfx( level.chopper_fx["explode"]["air_death"][self.heli_type], self gettagorigin( "tag_deathfx" ), anglestoforward( var_1 ), anglestoup( var_1 ) );
+	}
+	else
+	{
+		var_2 = self.origin;
+		var_3 = self.origin + ( 0, 0, 1 ) - self.origin;
+		playfx( level.chopper_fx["explode"]["death"][self.heli_type], var_2, var_3 );
+	}
+
+	self playsound( level.heli_sound[self.team]["crash"] );
+	wait 0.05;
+
+	if ( isdefined( self.killCamEnt ) )
+		self.killCamEnt delete ();
+
+	if ( self.heliType == "osprey_gunner" )
+	{
+		if ( isDefined( self ) )
+			self hide();
+
+		wait 30;
+
+		maps\mp\_utility::decrementFauxVehicleCount();
+
+		if ( isDefined( self ) )
+			self delete ();
+	}
+	else
+	{
+		maps\mp\_utility::decrementFauxVehicleCount();
+		self delete ();
+	}
+}
+
+heli_leave( var_0 )
+{
+	self notify( "leaving" );
+
+	if ( isdefined( self.heliType ) && self.heliType == "osprey" && isdefined( self.pathGoal ) )
+	{
+		self setvehgoalpos( self.pathGoal, 1 );
+		common_scripts\utility::waittill_any_timeout( 5, "goal" );
+	}
+
+	if ( !isdefined( var_0 ) )
+	{
+		var_1 = level.heli_leave_nodes[randomint( level.heli_leave_nodes.size )];
+		var_0 = var_1.origin;
+	}
+
+	var_2 = spawn( "script_origin", var_0 );
+
+	if ( isdefined( var_2 ) )
+	{
+		self setlookatent( var_2 );
+		var_2 thread maps\mp\killstreaks\_helicopter::wait_and_delete( 3.0 );
+	}
+
+	maps\mp\killstreaks\_helicopter::heli_reset();
+	self vehicle_setspeed( 100, 45 );
+	self setvehgoalpos( var_0, 1 );
+	self waittillmatch( "goal" );
+	self notify( "death" );
+	wait 0.05;
+
+	if ( isdefined( self.killCamEnt ) )
+		self.killCamEnt delete ();
+
+	if ( self.heliType == "osprey_gunner" )
+	{
+		if ( isDefined( self ) )
+			self hide();
+
+		wait 30;
+
+		maps\mp\_utility::decrementFauxVehicleCount();
+
+		if ( isDefined( self ) )
+			self delete ();
+	}
+	else
+	{
+		maps\mp\_utility::decrementFauxVehicleCount();
+		self delete ();
+	}
+}
+
+syncXPStat()
+{
+	var_0 = maps\mp\gametypes\_rank::getRankXP();
+	maps\mp\gametypes\_persistence::statSet( "experience", var_0 );
+}
+
+rank_init()
+{
+	level.scoreInfo = [];
+	level.xpScale = getdvarint( "scr_xpscale" );
+	level.weaponxpscale = getdvarint( "scr_weaponxpscale" );
+	level.rankTable = [];
+	level.weaponRankTable = [];
+	precacheshader( "white" );
+	precachestring( &"RANK_PLAYER_WAS_PROMOTED_N" );
+	precachestring( &"RANK_PLAYER_WAS_PROMOTED" );
+	precachestring( &"RANK_WEAPON_WAS_PROMOTED" );
+	precachestring( &"RANK_PROMOTED" );
+	precachestring( &"RANK_PROMOTED_WEAPON" );
+	precachestring( &"MP_PLUS" );
+	precachestring( &"RANK_ROMANI" );
+	precachestring( &"RANK_ROMANII" );
+	precachestring( &"RANK_ROMANIII" );
+	precachestring( &"SPLASHES_LONGSHOT" );
+	precachestring( &"SPLASHES_PROXIMITYASSIST" );
+	precachestring( &"SPLASHES_PROXIMITYKILL" );
+	precachestring( &"SPLASHES_EXECUTION" );
+	precachestring( &"SPLASHES_AVENGER" );
+	precachestring( &"SPLASHES_ASSISTEDSUICIDE" );
+	precachestring( &"SPLASHES_DEFENDER" );
+	precachestring( &"SPLASHES_POSTHUMOUS" );
+	precachestring( &"SPLASHES_REVENGE" );
+	precachestring( &"SPLASHES_DOUBLEKILL" );
+	precachestring( &"SPLASHES_TRIPLEKILL" );
+	precachestring( &"SPLASHES_MULTIKILL" );
+	precachestring( &"SPLASHES_BUZZKILL" );
+	precachestring( &"SPLASHES_COMEBACK" );
+	precachestring( &"SPLASHES_KNIFETHROW" );
+	precachestring( &"SPLASHES_ONE_SHOT_KILL" );
+
+	if ( level.teamBased )
+	{
+		maps\mp\gametypes\_rank::registerScoreInfo( "kill", 100 );
+		maps\mp\gametypes\_rank::registerScoreInfo( "headshot", 100 );
+		maps\mp\gametypes\_rank::registerScoreInfo( "assist", 20 );
+		maps\mp\gametypes\_rank::registerScoreInfo( "proximityassist", 20 );
+		maps\mp\gametypes\_rank::registerScoreInfo( "proximitykill", 20 );
+		maps\mp\gametypes\_rank::registerScoreInfo( "suicide", 0 );
+		maps\mp\gametypes\_rank::registerScoreInfo( "teamkill", 0 );
+	}
+	else
+	{
+		maps\mp\gametypes\_rank::registerScoreInfo( "kill", 50 );
+		maps\mp\gametypes\_rank::registerScoreInfo( "headshot", 50 );
+		maps\mp\gametypes\_rank::registerScoreInfo( "assist", 0 );
+		maps\mp\gametypes\_rank::registerScoreInfo( "suicide", 0 );
+		maps\mp\gametypes\_rank::registerScoreInfo( "teamkill", 0 );
+	}
+
+	maps\mp\gametypes\_rank::registerScoreInfo( "win", 1 );
+	maps\mp\gametypes\_rank::registerScoreInfo( "loss", 0.5 );
+	maps\mp\gametypes\_rank::registerScoreInfo( "tie", 0.75 );
+	maps\mp\gametypes\_rank::registerScoreInfo( "capture", 300 );
+	maps\mp\gametypes\_rank::registerScoreInfo( "defend", 300 );
+	maps\mp\gametypes\_rank::registerScoreInfo( "challenge", 2500 );
+	level.maxRank = int( tablelookup( "mp/rankTable.csv", 0, "maxrank", 1 ) );
+	level.maxPrestige = int( tablelookup( "mp/rankIconTable.csv", 0, "maxprestige", 1 ) );
+	var_0 = 0;
+	var_1 = 0;
+
+	for ( var_0 = 0; var_0 <= min( 10, level.maxPrestige ); var_0++ )
+	{
+		for ( var_1 = 0; var_1 <= level.maxRank; var_1++ )
+			precacheshader( tablelookup( "mp/rankIconTable.csv", 0, var_1, var_0 + 1 ) );
+	}
+
+	var_2 = 0;
+
+	for ( var_3 = tablelookup( "mp/ranktable.csv", 0, var_2, 1 ); isdefined( var_3 ) && var_3 != ""; var_3 = tablelookup( "mp/ranktable.csv", 0, var_2, 1 ) )
+	{
+		level.rankTable[var_2][1] = tablelookup( "mp/ranktable.csv", 0, var_2, 1 );
+		level.rankTable[var_2][2] = tablelookup( "mp/ranktable.csv", 0, var_2, 2 );
+		level.rankTable[var_2][3] = tablelookup( "mp/ranktable.csv", 0, var_2, 3 );
+		level.rankTable[var_2][7] = tablelookup( "mp/ranktable.csv", 0, var_2, 7 );
+		precachestring( tablelookupistring( "mp/ranktable.csv", 0, var_2, 16 ) );
+		var_2++;
+	}
+
+	var_4 = int( tablelookup( "mp/weaponRankTable.csv", 0, "maxrank", 1 ) );
+
+	for ( var_5 = 0; var_5 < var_4 + 1; var_5++ )
+	{
+		level.weaponRankTable[var_5][1] = tablelookup( "mp/weaponRankTable.csv", 0, var_5, 1 );
+		level.weaponRankTable[var_5][2] = tablelookup( "mp/weaponRankTable.csv", 0, var_5, 2 );
+		level.weaponRankTable[var_5][3] = tablelookup( "mp/weaponRankTable.csv", 0, var_5, 3 );
+	}
+
+	maps\mp\gametypes\_missions::buildChallegeInfo();
+	level thread maps\mp\gametypes\_rank::patientZeroWaiter();
+	level thread maps\mp\gametypes\_rank::onPlayerConnect();
+}
+
+getSpawnpoint_NearTeam( var_0, var_1 )
+{
+	if ( !isdefined( var_0 ) )
+		return undefined;
+
+	maps\mp\gametypes\_spawnlogic::Spawnlogic_Begin();
+	maps\mp\gametypes\_spawnlogic::initWeights( var_0 );
+	var_2 = 2;
+	var_3 = self.team;
+	var_4 = maps\mp\_utility::getOtherTeam( var_3 );
+	var_5 = getentarray( "care_package", "targetname" );
+
+	foreach ( var_7 in var_0 )
+	{
+		if ( var_7.numPlayersAtLastUpdate > 0 )
+		{
+			var_8 = var_7.weightedDistSum[var_3];
+			var_9 = var_7.distSum[var_4];
+			var_7.weight = ( var_9 - var_2 * var_8 ) / var_7.numPlayersAtLastUpdate;
+
+			if ( isdefined( level.favorCloseSpawnEnt ) )
+			{
+				if ( !isdefined( level.favorCloseSpawnScalar ) )
+					level.favorCloseSpawnScalar = 1;
+
+				var_10 = distance( var_7.origin, level.favorCloseSpawnEnt.origin );
+				var_7.weight = var_7.weight - var_10 * level.favorCloseSpawnScalar;
+			}
+
+			if ( isdefined( level.favorclosespawnentattacker ) )
+			{
+				if ( !isdefined( level.favorclosespawnscalarattacker ) )
+					level.favorclosespawnscalarattacker = 1;
+
+				var_10 = distance( var_7.origin, level.favorclosespawnentattacker.origin );
+				var_7.weight = var_7.weight - var_10 * level.favorclosespawnscalarattacker;
+			}
+
+			if ( isdefined( level.favorclosespawnentdefender ) )
+			{
+				if ( !isdefined( level.favorclosespawnscalardefender ) )
+					level.favorclosespawnscalardefender = 1;
+
+				var_10 = distance( var_7.origin, level.favorclosespawnentdefender.origin );
+				var_7.weight = var_7.weight - var_10 * level.favorclosespawnscalardefender;
+			}
+		}
+		else
+			var_7.weight = 0;
+
+		if ( var_5.size && !canspawn( var_7.origin ) )
+			var_7.weight = var_7.weight - 500000;
+	}
+
+	favor_weight = getDVarInt( "scr_spawnpointfavorweight" );
+
+	if ( favor_weight == 0 )
+		favor_weight = 50000;
+
+	if ( isdefined( var_1 ) )
+	{
+		for ( var_12 = 0; var_12 < var_1.size; var_12++ )
+			var_1[var_12].weight = var_1[var_12].weight + favor_weight;
+	}
+
+	if ( isdefined( self.predictedSpawnPoint ) && isdefined( self.predictedSpawnPoint.weight ) )
+		self.predictedSpawnPoint.weight = self.predictedSpawnPoint.weight + 100;
+
+	maps\mp\gametypes\_spawnlogic::avoidSameSpawn();
+	maps\mp\gametypes\_spawnlogic::avoidWeaponDamage( var_0 );
+	maps\mp\gametypes\_spawnlogic::avoidVisibleEnemies( var_0, 1 );
+
+	if ( isdefined( self.lastDeathPos ) && level.gameType != "dom" )
+		maps\mp\gametypes\_spawnlogic::avoidRevengeSpawn( var_0, self.lastDeathPos );
+
+	var_13 = maps\mp\gametypes\_spawnlogic::getSpawnpoint_Final( var_0 );
+	return var_13;
+}
+
+doPrintDamage( dmg, hitloc, flags )
+{
+	huddamage = newclienthudelem( self );
+	huddamage.alignx = "center";
+	huddamage.horzalign = "center";
+	huddamage.x = 10;
+	huddamage.y = 235;
+	huddamage.fontscale = 1.6;
+	huddamage.font = "objective";
+	huddamage setvalue( dmg );
+
+	if ( ( flags & level.iDFLAGS_RADIUS ) != 0 )
+		huddamage.color = ( 0.25, 0.25, 0.25 );
+
+	if ( ( flags & level.iDFLAGS_PENETRATION ) != 0 )
+		huddamage.color = ( 1, 1, 0.25 );
+
+	if ( hitloc == "head" )
+		huddamage.color = ( 1, 0.25, 0.25 );
+
+	huddamage moveovertime( 1 );
+	huddamage fadeovertime( 1 );
+	huddamage.alpha = 0;
+	huddamage.x = randomIntRange( 25, 70 );
+
+	val = 1;
+
+	if ( randomInt( 2 ) )
+		val = -1;
+
+	huddamage.y = 235 + randomIntRange( 25, 70 ) * val;
+
+	wait 1;
+
+	huddamage destroy();
+}
+
+finishPlayerDamageWrapper( var_0, var_1, var_2, var_3, var_4, var_5, var_6, var_7, var_8, var_9, var_10 )
+{
+	if ( isDefined( level.allowPrintDamage ) && level.allowPrintDamage )
+	{
+		if ( isDefined( var_1 ) && isPlayer( var_1 ) && isDefined( var_1.printDamage ) && var_1.printDamage )
+			var_1 thread doPrintDamage( var_2, var_8, var_3 );
+		else if ( isDefined( var_1.owner ) && isPlayer( var_1.owner ) && isDefined( var_1.owner.printDamage ) && var_1.owner.printDamage )
+			var_1.owner thread doPrintDamage( var_2, var_8, var_3 );
+	}
+
+	if ( maps\mp\_utility::isUsingRemote() && var_2 >= self.health && !( var_3 & level.iDFLAGS_STUN ) )
+	{
+		if ( !isdefined( var_7 ) )
+			var_7 = ( 0, 0, 0 );
+
+		if ( !isdefined( var_1 ) && !isdefined( var_0 ) )
+		{
+			var_1 = self;
+			var_0 = var_1;
+		}
+
+		maps\mp\gametypes\_damage::PlayerKilled_internal( var_0, var_1, self, var_2, var_4, var_5, var_7, var_8, var_9, 0, 1 );
+	}
+	else
+	{
+		if ( !maps\mp\gametypes\_damage::Callback_KillingBlow( var_0, var_1, var_2 - var_2 * var_10, var_3, var_4, var_5, var_6, var_7, var_8, var_9 ) )
+			return;
+
+		if ( !isalive( self ) )
+			return;
+
+		self finishplayerdamage( var_0, var_1, var_2, var_3, var_4, var_5, var_6, var_7, var_8, var_9, var_10 );
+	}
+
+	if ( var_4 == "MOD_EXPLOSIVE_BULLET" )
+		self shellshock( "damage_mp", getdvarfloat( "scr_csmode" ) );
+
+	maps\mp\gametypes\_damage::damageShellshockAndRumble( var_0, var_5, var_4, var_2, var_3, var_1 );
+}
+
+giveAllPerks()
+{
+	var_0 = [];
+	var_0[var_0.size] = "specialty_longersprint";
+	var_0[var_0.size] = "specialty_fastreload";
+	var_0[var_0.size] = "specialty_scavenger";
+	var_0[var_0.size] = "specialty_blindeye";
+	var_0[var_0.size] = "specialty_paint";
+	var_0[var_0.size] = "specialty_hardline";
+	var_0[var_0.size] = "specialty_coldblooded";
+	var_0[var_0.size] = "specialty_quickdraw";
+	var_0[var_0.size] = "_specialty_blastshield";
+	var_0[var_0.size] = "specialty_detectexplosive";
+	var_0[var_0.size] = "specialty_autospot";
+	var_0[var_0.size] = "specialty_bulletaccuracy";
+	var_0[var_0.size] = "specialty_quieter";
+	var_0[var_0.size] = "specialty_stalker";
+	var_0[var_0.size] = "specialty_marksman";
+	var_0[var_0.size] = "specialty_sharp_focus";
+	var_0[var_0.size] = "specialty_longerrange";
+	var_0[var_0.size] = "specialty_fastermelee";
+	var_0[var_0.size] = "specialty_reducedsway";
+	var_0[var_0.size] = "specialty_lightweight";
+
+	// patch_mp removed these? why
+	var_0[ var_0.size ] = "specialty_bulletpenetration";
+	var_0[ var_0.size ] = "specialty_holdbreathwhileads";
+
+	// too op?
+	var_0[ var_0.size ] = "specialty_moredamage";
+
+	foreach ( var_2 in var_0 )
+	{
+		if ( !maps\mp\_utility::_hasPerk( var_2 ) )
+		{
+			maps\mp\_utility::givePerk( var_2, 0 );
+
+			if ( maps\mp\gametypes\_class::isPerkUpgraded( var_2 ) )
+			{
+				var_3 = tablelookup( "mp/perktable.csv", 1, var_2, 8 );
+				maps\mp\_utility::givePerk( var_3, 0 );
+			}
+		}
+	}
+}
+
+handleScavengerBagPickup( var_0 )
+{
+	self endon( "death" );
+	level endon( "game_ended" );
+	self waittill( "scavenger",  var_1  );
+	var_1 notify( "scavenger_pickup" );
+	var_1 playlocalsound( "scavenger_pack_pickup" );
+	var_2 = var_1 getweaponslistoffhands();
+
+	foreach ( var_4 in var_2 )
+	{
+		var_5 = var_1 getweaponammoclip( var_4 );
+		var_1 setweaponammoclip( var_4, var_5 + 1 );
+	}
+
+	var_7 = var_1 getweaponslistprimaries();
+
+	foreach ( var_9 in var_7 )
+	{
+		var_10 = var_1 getweaponammostock( var_9 );
+		var_11 = weaponclipsize( var_9 );
+		var_1 setweaponammostock( var_9, var_10 + var_11 );
+	}
+
+	var_1 maps\mp\gametypes\_damagefeedback::updateDamageFeedback( "scavenger" );
+}
+
 onPlayerConnect()
 {
 	for ( ;; )

raw/scripts/spawnTest.gsc

@@ -1,71 +0,0 @@
-init()
-{
-	if ( getDvarInt( "spawnpoints_test" ) )
-		level thread doSpawnPointTest();
-}
-
-drawNoSight(sp)
-{
-	newdeathicon = newHudElem();
-	newdeathicon.x = sp.origin[0];
-	newdeathicon.y = sp.origin[1];
-	newdeathicon.z = sp.origin[2] + 32;
-	newdeathicon.alpha = .61;
-	newdeathicon.archived = true;
-	newdeathicon setShader( "headicon_dead", 5, 5 );
-	newdeathicon setwaypoint( true, false );
-
-	if (isDefined(sp.wp))
-		sp.wp destroy();
-	
-	sp.wp = newdeathicon;
-}
-
-drawSight(sp)
-{
-	newdeathicon = newHudElem();
-	newdeathicon.x = sp.origin[0];
-	newdeathicon.y = sp.origin[1];
-	newdeathicon.z = sp.origin[2] + 32;
-	newdeathicon.alpha = .61;
-	newdeathicon.archived = true;
-	newdeathicon setShader( "rank_prestige1", 5, 5 );
-	newdeathicon setwaypoint( true, false );
-
-	if (isDefined(sp.wp))
-		sp.wp destroy();
-	
-	sp.wp = newdeathicon;
-}
-
-doSpawnPointTest()
-{
-	for ( ;; )
-	{
-		wait 0.05;
-
-		if ( !isdefined( level.spawnpoints ) )
-			return;
-
-		for (i = 0; i < level.spawnpoints.size; i++)
-		{
-			spawnpoint = level.spawnpoints[i];
-
-			sight = false;
-
-			if (level.teamBased)
-			{
-				sight = (spawnpoint.sights["axis"] > 0);
-				if (!sight)
-					sight = (spawnpoint.sights["allies"] > 0);
-			}
-			else
-				sight = (spawnpoint.sights > 0);
-
-			if (!sight)
-				drawNoSight(spawnpoint);
-			else
-				drawSight(spawnpoint);
-		}
-	}
-}