Merge pull request #56 from x3Karma/main

Add One in the Chamber and The Hidden to available playlists

10 files changed, 724 insertions, 73 deletions

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_english.txt b/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
index b7a4c758e..4cb793541 100644
--- a/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
+++ b/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
diff --git a/Northstar.Custom/keyvalues/playlists_v2.txt b/Northstar.Custom/keyvalues/playlists_v2.txt
index 813accb64..37734025c 100644
--- a/Northstar.Custom/keyvalues/playlists_v2.txt
+++ b/Northstar.Custom/keyvalues/playlists_v2.txt
@@ -202,6 +202,45 @@ playlists
 				gamemode_score_hint #GAMEMODE_SCORE_HINT_TDM
 			}
 		}
+		chamber
+		{
+			inherit defaults
+			vars
+			{
+				name #PL_chamber
+				lobbytitle #PL_chamber_lobby
+				description #PL_chamber_desc
+				hint #PL_chamber_hint
+				abbreviation #PL_chamber_abbr
+				max_players 12
+				max_teams 12
+				classic_mp 1
+
+				gamemode_score_hint #GAMEMODE_SCORE_HINT_FFA
+				gamemode_bullet_001	#GAMEMODE_BULLET_FFA_001
+				gamemode_bullet_002	#GAMEMODE_BULLET_FFA_002
+				gamemode_bullet_003	#GAMEMODE_BULLET_FFA_003
+				gamemode_bullet_004	#GAMEMODE_BULLET_FFA_004
+				gamemode_bullet_005	#GAMEMODE_BULLET_FFA_005
+			}
+		}
+		hidden
+		{
+			inherit defaults
+			vars
+			{
+				name #PL_hidden
+				lobbytitle #PL_hidden_lobby
+				description #PL_hidden_desc
+				hint #PL_hidden_hint
+				abbreviation #PL_hidden_abbr
+				max_players 16
+				max_teams 2
+				classic_mp 1
+
+				gamemode_score_hint #GAMEMODE_SCORE_HINT_TDM
+			}
+		}
 	}
 	Playlists
 	{
@@ -225,18 +264,18 @@ playlists
 				{
 					maps
 					{
-					    mp_forwardbase_kodai 1
-                        mp_grave 1
-                        mp_homestead 1
-                        mp_thaw 1
-                        mp_black_water_canal 1
-                        mp_eden 1
-                        mp_drydock 1
-                        mp_crashsite3 1
-                        mp_complex3 1
-                        mp_angel_city 1
-                        mp_colony02 1
-                        mp_glitch 1
+						mp_forwardbase_kodai 1
+						mp_grave 1
+						mp_homestead 1
+						mp_thaw 1
+						mp_black_water_canal 1
+						mp_eden 1
+						mp_drydock 1
+						mp_crashsite3 1
+						mp_complex3 1
+						mp_angel_city 1
+						mp_colony02 1
+						mp_glitch 1
 						mp_lf_stacks 1
 						mp_lf_deck 1
 						mp_lf_meadow 1
@@ -269,18 +308,19 @@ playlists
 				{
 					maps
 					{
-					    mp_forwardbase_kodai 1
-                        mp_grave 1
-                        mp_homestead 1
-                        mp_thaw 1
-                        mp_black_water_canal 1
-                        mp_eden 1
-                        mp_drydock 1
-                        mp_crashsite3 1
-                        mp_complex3 1
-                        mp_angel_city 1
-                        mp_colony02 1
-                        mp_glitch 1
+						mp_forwardbase_kodai 1
+						mp_grave 1
+						mp_homestead 1
+						mp_thaw 1
+						mp_black_water_canal 1
+						mp_eden 1
+						mp_drydock 1
+						mp_crashsite3 1
+						mp_complex3 1
+						mp_angel_city 1
+						mp_colony02 1
+						mp_glitch 1
+						mp_lf_stacks 1
 						mp_relic02 1
 						mp_wargames 1
 						mp_rise 1
@@ -307,18 +347,19 @@ playlists
 				{
 					maps
 					{
-					    mp_forwardbase_kodai 1
-                        mp_grave 1
-                        mp_homestead 1
-                        mp_thaw 1
-                        mp_black_water_canal 1
-                        mp_eden 1
-                        mp_drydock 1
-                        mp_crashsite3 1
-                        mp_complex3 1
-                        mp_angel_city 1
-                        mp_colony02 1
-                        mp_glitch 1
+						mp_forwardbase_kodai 1
+						mp_grave 1
+						mp_homestead 1
+						mp_thaw 1
+						mp_black_water_canal 1
+						mp_eden 1
+						mp_drydock 1
+						mp_crashsite3 1
+						mp_complex3 1
+						mp_angel_city 1
+						mp_colony02 1
+						mp_glitch 1
+						mp_lf_stacks 1
 						mp_lf_stacks 1
 						mp_lf_deck 1
 						mp_lf_meadow 1
@@ -360,18 +401,19 @@ playlists
 				{
 					maps
 					{
-					    mp_forwardbase_kodai 1
-                        mp_grave 1
-                        mp_homestead 1
-                        mp_thaw 1
-                        mp_black_water_canal 1
-                        mp_eden 1
-                        mp_drydock 1
-                        mp_crashsite3 1
-                        mp_complex3 1
-                        mp_angel_city 1
-                        mp_colony02 1
-                        mp_glitch 1
+						mp_forwardbase_kodai 1
+						mp_grave 1
+						mp_homestead 1
+						mp_thaw 1
+						mp_black_water_canal 1
+						mp_eden 1
+						mp_drydock 1
+						mp_crashsite3 1
+						mp_complex3 1
+						mp_angel_city 1
+						mp_colony02 1
+						mp_glitch 1
+						mp_lf_stacks 1
 						mp_lf_stacks 1
 						mp_lf_deck 1
 						mp_lf_meadow 1
@@ -408,18 +450,19 @@ playlists
 				{
 					maps
 					{
-					    mp_forwardbase_kodai 1
-                        mp_grave 1
-                        mp_homestead 1
-                        mp_thaw 1
-                        mp_black_water_canal 1
-                        mp_eden 1
-                        mp_drydock 1
-                        mp_crashsite3 1
-                        mp_complex3 1
-                        mp_angel_city 1
-                        mp_colony02 1
-                        mp_glitch 1
+						mp_forwardbase_kodai 1
+						mp_grave 1
+						mp_homestead 1
+						mp_thaw 1
+						mp_black_water_canal 1
+						mp_eden 1
+						mp_drydock 1
+						mp_crashsite3 1
+						mp_complex3 1
+						mp_angel_city 1
+						mp_colony02 1
+						mp_glitch 1
+						mp_lf_stacks 1
 						mp_lf_stacks 1
 						mp_lf_deck 1
 						mp_lf_meadow 1
@@ -459,18 +502,19 @@ playlists
 				{
 					maps
 					{
-					    mp_forwardbase_kodai 1
-                        mp_grave 1
-                        mp_homestead 1
-                        mp_thaw 1
-                        mp_black_water_canal 1
-                        mp_eden 1
-                        mp_drydock 1
-                        mp_crashsite3 1
-                        mp_complex3 1
-                        mp_angel_city 1
-                        mp_colony02 1
-                        mp_glitch 1
+						mp_forwardbase_kodai 1
+						mp_grave 1
+						mp_homestead 1
+						mp_thaw 1
+						mp_black_water_canal 1
+						mp_eden 1
+						mp_drydock 1
+						mp_crashsite3 1
+						mp_complex3 1
+						mp_angel_city 1
+						mp_colony02 1
+						mp_glitch 1
+						mp_lf_stacks 1
 						mp_relic02 1
 						mp_wargames 1
 						mp_rise 1
@@ -640,5 +684,101 @@ playlists
 				}
 			}
 		}
+		chamber
+		{
+			inherit defaults
+			vars
+			{
+				name #PL_chamber
+				lobbytitle #PL_chamber_lobby
+				description #PL_chamber_desc
+				abbreviation #PL_chamber_abbr
+				image ps
+				//mixtape_slot 7
+				mixtape_timeout 120
+				visible 0
+			}
+			gamemodes
+			{
+				chamber
+				{
+					maps
+					{
+						mp_forwardbase_kodai 1
+						mp_grave 1
+						mp_homestead 1
+						mp_thaw 1
+						mp_black_water_canal 1
+						mp_eden 1
+						mp_drydock 1
+						mp_crashsite3 1
+						mp_complex3 1
+						mp_angel_city 1
+						mp_colony02 1
+						mp_glitch 1
+						mp_lf_stacks 1
+						mp_lf_stacks 1
+						mp_lf_deck 1
+						mp_lf_meadow 1
+						mp_lf_traffic 1
+						mp_lf_township 1
+						mp_lf_uma 1
+						mp_relic02 1
+						mp_wargames 1
+						mp_rise 1
+						mp_coliseum 1
+						mp_coliseum_column 1
+					}
+				}
+			}
+		}
+		hidden
+		{
+			inherit defaults
+			vars
+			{
+				name #PL_hidden
+				lobbytitle #PL_hidden_lobby
+				description #PL_hidden_desc
+				abbreviation #PL_hidden_abbr
+				image ps
+				//mixtape_slot 7
+				mixtape_timeout 120
+				visible 0
+			}
+			gamemodes
+			{
+				hidden
+				{
+					maps
+					{
+						mp_forwardbase_kodai 1
+						mp_grave 1
+						mp_homestead 1
+						mp_thaw 1
+						mp_black_water_canal 1
+						mp_eden 1
+						mp_drydock 1
+						mp_crashsite3 1
+						mp_complex3 1
+						mp_angel_city 1
+						mp_colony02 1
+						mp_glitch 1
+						mp_lf_stacks 1
+						mp_lf_stacks 1
+						mp_lf_deck 1
+						mp_lf_meadow 1
+						mp_lf_traffic 1
+						mp_lf_township 1
+						mp_lf_uma 1
+						mp_relic02 1
+						mp_wargames 1
+						mp_rise 1
+						mp_coliseum 1
+						mp_coliseum_column 1
+					}
+				}
+			}
+		}
 	}
-}
\ No newline at end of file
+}
diff --git a/Northstar.Custom/keyvalues/scripts/weapons/mp_weapon_wingman.txt b/Northstar.Custom/keyvalues/scripts/weapons/mp_weapon_wingman.txt
new file mode 100644
index 000000000..8255df15b
--- /dev/null
+++ b/Northstar.Custom/keyvalues/scripts/weapons/mp_weapon_wingman.txt
@@ -0,0 +1,11 @@
+WeaponData

+{

+	Mods

+	{

+        	one_in_the_chamber

+		{

+            		damage_near_value "9999"

+            		damage_far_value "9999"

+		}

+	}

+}
\ No newline at end of file
diff --git a/Northstar.Custom/mod.json b/Northstar.Custom/mod.json
index e817df6d4..e687264c1 100644
--- a/Northstar.Custom/mod.json
+++ b/Northstar.Custom/mod.json
@@ -42,6 +42,45 @@
 		},
 		
 		{
+			"Path": "gamemodes/sh_gamemode_chamber.nut",
+			"RunOn": "( CLIENT || SERVER ) && MP",
+			"ClientCallback": {
+				"Before": "Sh_GamemodeChamber_Init"
+			},
+
+			"ServerCallback": {
+				"Before": "Sh_GamemodeChamber_Init"
+			}
+		},
+		{
+			"Path": "gamemodes/_gamemode_chamber.nut",
+			"RunOn": "SERVER && MP"
+		},
+		{
+			"Path": "gamemodes/cl_gamemode_chamber.nut",
+			"RunOn": "CLIENT && MP"
+		},
+		{
+			"Path": "gamemodes/sh_gamemode_hidden.nut",
+			"RunOn": "( CLIENT || SERVER ) && MP",
+			"ClientCallback": {
+				"Before": "Sh_GamemodeHidden_Init"
+			},
+
+			"ServerCallback": {
+				"Before": "Sh_GamemodeHidden_Init"
+			}
+		},
+		{
+			"Path": "gamemodes/_gamemode_hidden.nut",
+			"RunOn": "SERVER && MP"
+		},
+		{
+			"Path": "gamemodes/cl_gamemode_hidden.nut",
+			"RunOn": "CLIENT && MP"
+		},
+		
+		{
 			"Path": "gamemodes/sh_gamemode_fw_custom.nut",
 			"RunOn": "( CLIENT || SERVER ) && MP",
 			"ClientCallback": {
diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_chamber.nut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_chamber.nut
new file mode 100644
index 000000000..bbd669cd0
--- /dev/null
+++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_chamber.nut
@@ -0,0 +1,95 @@
+global function GamemodeChamber_Init

+

+void function GamemodeChamber_Init()

+{

+	SetSpawnpointGamemodeOverride( FFA )

+

+	SetShouldUseRoundWinningKillReplay( true )

+	SetLoadoutGracePeriodEnabled( false ) // prevent modifying loadouts with grace period

+	SetWeaponDropsEnabled( false )

+	Riff_ForceTitanAvailability( eTitanAvailability.Never )

+	Riff_ForceBoostAvailability( eBoostAvailability.Disabled )

+	ClassicMP_ForceDisableEpilogue( true )

+

+	AddCallback_OnClientConnected( ChamberInitPlayer )

+	AddCallback_OnPlayerKilled( ChamberOnPlayerKilled )

+	AddCallback_OnPlayerRespawned( UpdateLoadout )

+

+}

+

+void function ChamberInitPlayer( entity player )

+{

+	UpdateLoadout( player )

+}

+

+void function ChamberOnPlayerKilled( entity victim, entity attacker, var damageInfo )

+{

+	if ( !victim.IsPlayer() || GetGameState() != eGameState.Playing || attacker == victim)

+		return

+

+	if ( attacker.IsPlayer() )

+	{

+		attacker.SetPlayerGameStat( PGS_ASSAULT_SCORE, attacker.GetPlayerGameStat( PGS_ASSAULT_SCORE ) + 1 )

+		AddTeamScore( attacker.GetTeam(), 1 )

+		if ( DamageInfo_GetDamageSourceIdentifier( damageInfo ) == eDamageSourceId.human_execution )

+		{

+			string message = victim.GetPlayerName() + " got executed."

+			foreach ( entity player in GetPlayerArray() )

+				SendHudMessage( player, message, -1, 0.4, 255, 0, 0, 0, 0, 3, 0.15 )

+

+			foreach ( entity weapon in attacker.GetMainWeapons() )

+			{

+				weapon.SetWeaponPrimaryAmmoCount(0)

+				int clip = weapon.GetWeaponPrimaryClipCount() + 4

+				if (weapon.GetWeaponPrimaryClipCountMax() < clip)

+					weapon.SetWeaponPrimaryClipCount(weapon.GetWeaponPrimaryClipCountMax())

+				else

+					weapon.SetWeaponPrimaryClipCount(weapon.GetWeaponPrimaryClipCount() + 4)

+			}

+		} else

+		{

+			foreach ( entity weapon in attacker.GetMainWeapons() )

+       	 		{

+				weapon.SetWeaponPrimaryAmmoCount(0)

+				int clip = weapon.GetWeaponPrimaryClipCount() + 1

+				if (weapon.GetWeaponPrimaryClipCountMax() < clip)

+					weapon.SetWeaponPrimaryClipCount(weapon.GetWeaponPrimaryClipCountMax())

+				else

+					weapon.SetWeaponPrimaryClipCount(weapon.GetWeaponPrimaryClipCount() + 1)

+			}

+		}

+		SetRoundWinningKillReplayAttacker(attacker)

+	}

+}

+

+void function UpdateLoadout( entity player )

+{

+	if (IsAlive(player) && player != null)

+	{

+

+		// set loadout

+		foreach ( entity weapon in player.GetMainWeapons() )

+			player.TakeWeaponNow( weapon.GetWeaponClassName() )

+

+		foreach ( entity weapon in player.GetOffhandWeapons() )

+			player.TakeWeaponNow( weapon.GetWeaponClassName() )

+

+		array<string> mods = ["one_in_the_chamber"]

+		player.GiveWeapon( "mp_weapon_wingman", mods)

+		player.GiveOffhandWeapon( "melee_pilot_emptyhanded", OFFHAND_MELEE )

+

+		thread SetAmmo( player )

+	}

+}

+

+void function SetAmmo( entity player )

+{

+	foreach ( entity weapon in player.GetMainWeapons() )

+	{

+        	weapon.SetWeaponPrimaryAmmoCount(0)

+        	weapon.SetWeaponPrimaryClipCount(1)

+	}

+	WaitFrame()

+	if ( IsValid( player ) )

+		PlayerEarnMeter_SetMode( player, eEarnMeterMode.DISABLED )

+}

diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_hidden.nut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_hidden.nut
new file mode 100644
index 000000000..4d52835b3
--- /dev/null
+++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/_gamemode_hidden.nut
@@ -0,0 +1,195 @@
+global function GamemodeHidden_Init

+

+

+void function GamemodeHidden_Init()

+{

+	SetShouldUseRoundWinningKillReplay( true )

+	SetLoadoutGracePeriodEnabled( false ) // prevent modifying loadouts with grace period

+	SetWeaponDropsEnabled( false )

+	SetRespawnsEnabled( false )

+	Riff_ForceTitanAvailability( eTitanAvailability.Never )

+	Riff_ForceBoostAvailability( eBoostAvailability.Disabled )

+	Riff_ForceSetEliminationMode( eEliminationMode.Pilots )

+

+	ClassicMP_SetCustomIntro( ClassicMP_DefaultNoIntro_Setup, ClassicMP_DefaultNoIntro_GetLength() )

+	ClassicMP_ForceDisableEpilogue( true )

+

+	AddCallback_OnClientConnected( HiddenInitPlayer )

+	AddCallback_OnPlayerKilled( HiddenOnPlayerKilled )

+	AddCallback_GameStateEnter( eGameState.Playing, SelectFirstHidden )

+	AddCallback_GameStateEnter( eGameState.Postmatch, RemoveHidden )

+	SetTimeoutWinnerDecisionFunc( TimeoutCheckSurvivors )

+

+	thread PredatorMain()

+

+}

+

+void function HiddenInitPlayer( entity player )

+{

+	SetTeam( player, TEAM_MILITIA )

+}

+

+void function SelectFirstHidden()

+{

+	thread SelectFirstHiddenDelayed()

+}

+

+void function SelectFirstHiddenDelayed()

+{

+	wait 10.0 + RandomFloat( 5.0 )

+

+	array<entity> players = GetPlayerArray()

+	entity hidden = players[ RandomInt( players.len() ) ]

+

+	if (hidden != null || IsAlive(hidden))

+		MakePlayerHidden( hidden ) // randomly selected player becomes hidden

+

+	foreach ( entity otherPlayer in GetPlayerArray() )

+			if ( hidden != otherPlayer )

+				Remote_CallFunction_NonReplay( otherPlayer, "ServerCallback_AnnounceHidden", hidden.GetEncodedEHandle() )

+

+	PlayMusicToAll( eMusicPieceID.GAMEMODE_1 )

+

+	thread UpdateSurvivorsLoadout()

+}

+

+void function UpdateSurvivorsLoadout()

+{

+	foreach (entity player in GetPlayerArray())

+	{

+		if (player.GetTeam() != TEAM_MILITIA || !IsAlive(player) || player == null)

+			continue;

+

+		foreach ( entity weapon in player.GetOffhandWeapons() )

+			player.TakeWeaponNow( weapon.GetWeaponClassName() )

+

+		try {

+			player.GiveOffhandWeapon("mp_ability_cloak", OFFHAND_SPECIAL )

+			player.GiveOffhandWeapon("mp_weapon_grenade_emp", OFFHAND_ORDNANCE )

+			player.GiveOffhandWeapon( "melee_pilot_emptyhanded", OFFHAND_MELEE )

+		} catch (ex) {}

+	}

+}

+

+void function MakePlayerHidden(entity player)

+{

+	if (player == null)

+		return;

+

+	SetTeam( player, TEAM_IMC )

+	player.SetPlayerGameStat( PGS_ASSAULT_SCORE, 0 ) // reset kills

+	RespawnHidden( player )

+	Remote_CallFunction_NonReplay( player, "ServerCallback_YouAreHidden" )

+}

+

+void function RespawnHidden(entity player)

+{

+	if (player.GetTeam() != TEAM_IMC )

+		return

+

+	// scale health of the hidden, with 50 as base health

+	player.SetMaxHealth( 80 + ( (GetPlayerArrayOfTeam( TEAM_MILITIA ).len() + 1 ) * 20) )

+	player.SetHealth( 80 + ( (GetPlayerArrayOfTeam( TEAM_MILITIA ).len() + 1 ) * 20) )

+

+	if ( !player.IsMechanical() )

+		player.SetBodygroup( player.FindBodyGroup( "head" ), 1 )

+

+	// set loadout

+	foreach ( entity weapon in player.GetMainWeapons() )

+		player.TakeWeaponNow( weapon.GetWeaponClassName() )

+

+	foreach ( entity weapon in player.GetOffhandWeapons() )

+		player.TakeWeaponNow( weapon.GetWeaponClassName() )

+

+	player.GiveWeapon("mp_weapon_wingman_n")

+	player.GiveOffhandWeapon( "melee_pilot_emptyhanded", OFFHAND_MELEE )

+	player.GiveOffhandWeapon( "mp_weapon_grenade_sonar", OFFHAND_SPECIAL );

+	thread UpdateLoadout(player)

+	thread GiveArcGrenade(player)

+}

+

+void function GiveArcGrenade(entity player)

+{

+	wait 45.0

+	if (IsAlive(player) || player != null)

+		player.GiveOffhandWeapon( "mp_weapon_grenade_emp", OFFHAND_ORDNANCE );

+}

+

+void function HiddenOnPlayerKilled( entity victim, entity attacker, var damageInfo )

+{

+	if ( !victim.IsPlayer() || GetGameState() != eGameState.Playing )

+		return

+

+	if ( attacker.IsPlayer() )

+	{

+		// increase kills by 1

+		attacker.SetPlayerGameStat( PGS_ASSAULT_SCORE, attacker.GetPlayerGameStat( PGS_ASSAULT_SCORE ) + 1 )

+	}

+

+}

+

+void function UpdateLoadout( entity player )

+{

+	string p2016 = "mp_weapon_wingman_n"

+	foreach ( entity weapon in player.GetMainWeapons() )

+	{

+		if (weapon.GetWeaponClassName() == p2016)

+		{

+        	weapon.SetWeaponPrimaryAmmoCount(0)

+        	weapon.SetWeaponPrimaryClipCount(weapon.GetWeaponPrimaryClipCountMax())

+		}

+	}

+	WaitFrame()

+	if ( IsValid( player ) )

+		PlayerEarnMeter_SetMode( player, eEarnMeterMode.DISABLED )

+}

+

+void function RemoveHidden()

+{

+	foreach (entity player in GetPlayerArray())

+	{

+		if (player.GetTeam() == TEAM_IMC && player != null)

+			player.kv.VisibilityFlags = ENTITY_VISIBLE_TO_EVERYONE

+	}

+}

+

+void function PredatorMain()

+{

+	while (true) 

+	{

+		WaitFrame()

+		if(!IsLobby())

+		{

+			foreach (entity player in GetPlayerArray())

+			{

+				if (player == null || !IsValid(player) || !IsAlive(player) || player.GetTeam() != TEAM_IMC)

+					continue

+				vector playerVelV = player.GetVelocity()

+				float playerVel

+				playerVel = sqrt(playerVelV.x * playerVelV.x + playerVelV.y * playerVelV.y + playerVelV.z * playerVelV.z)

+				float playerVelNormal = playerVel * 0.068544

+				if (playerVel/300 < 1.3)

+				{

+					player.SetCloakFlicker(0, 0)

+					player.kv.VisibilityFlags = 0

+				}

+				else

+				{

+					player.SetCloakFlicker(0.2 , 1 )

+					player.kv.VisibilityFlags = 0

+					float waittime = RandomFloat(0.5)

+					wait waittime

+					player.kv.VisibilityFlags = ENTITY_VISIBLE_TO_EVERYONE

+				}

+			}

+		}

+	}

+}

+

+int function TimeoutCheckSurvivors()

+{

+	if ( GetPlayerArrayOfTeam( TEAM_MILITIA ).len() > 0 )

+		return TEAM_IMC

+

+	return TEAM_MILITIA

+}

diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/cl_gamemode_chamber.nut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/cl_gamemode_chamber.nut
new file mode 100644
index 000000000..37b0acd33
--- /dev/null
+++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/cl_gamemode_chamber.nut
@@ -0,0 +1,26 @@
+global function ClGamemodeChamber_Init

+

+void function ClGamemodeChamber_Init()

+{

+    // add ffa gamestate asset

+	ClGameState_RegisterGameStateAsset( $"ui/gamestate_info_ffa.rpak" )

+

+	// add music for mode, this is copied directly from the ffa/fra music registered in cl_music.gnut

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_INTRO, "music_mp_freeagents_intro", TEAM_IMC )

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_INTRO, "music_mp_freeagents_intro", TEAM_MILITIA )

+

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_WIN, "music_mp_freeagents_outro_win", TEAM_IMC )

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_WIN, "music_mp_freeagents_outro_win", TEAM_MILITIA )

+

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_DRAW, "music_mp_freeagents_outro_lose", TEAM_IMC )

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_DRAW, "music_mp_freeagents_outro_lose", TEAM_MILITIA )

+

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_LOSS, "music_mp_freeagents_outro_lose", TEAM_IMC )

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_LOSS, "music_mp_freeagents_outro_lose", TEAM_MILITIA )

+

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_THREE_MINUTE, "music_mp_freeagents_almostdone", TEAM_IMC )

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_THREE_MINUTE, "music_mp_freeagents_almostdone", TEAM_MILITIA )

+

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_LAST_MINUTE, "music_mp_freeagents_lastminute", TEAM_IMC )

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_LAST_MINUTE, "music_mp_freeagents_lastminute", TEAM_MILITIA )

+}
\ No newline at end of file
diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/cl_gamemode_hidden.nut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/cl_gamemode_hidden.nut
new file mode 100644
index 000000000..e0f2bfeba
--- /dev/null
+++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/cl_gamemode_hidden.nut
@@ -0,0 +1,60 @@
+global function ClGamemodeHidden_Init

+global function ServerCallback_YouAreHidden

+global function ServerCallback_AnnounceHidden

+

+void function ClGamemodeHidden_Init()

+{

+    // add ffa gamestate asset

+	// ClGameState_RegisterGameStateAsset( $"ui/gamestate_info_ffa.rpak" )

+

+	// add music for mode, this is copied directly from the ffa/fra music registered in cl_music.gnut

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_INTRO, "music_mp_freeagents_intro", TEAM_IMC )

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_INTRO, "music_mp_freeagents_intro", TEAM_MILITIA )

+

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_WIN, "music_mp_freeagents_outro_win", TEAM_IMC )

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_WIN, "music_mp_freeagents_outro_win", TEAM_MILITIA )

+

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_DRAW, "music_mp_freeagents_outro_lose", TEAM_IMC )

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_DRAW, "music_mp_freeagents_outro_lose", TEAM_MILITIA )

+

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_LOSS, "music_mp_freeagents_outro_lose", TEAM_IMC )

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_LOSS, "music_mp_freeagents_outro_lose", TEAM_MILITIA )

+

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_THREE_MINUTE, "music_mp_freeagents_almostdone", TEAM_IMC )

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_THREE_MINUTE, "music_mp_freeagents_almostdone", TEAM_MILITIA )

+

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_LAST_MINUTE, "music_mp_freeagents_lastminute", TEAM_IMC )

+	RegisterLevelMusicForTeam( eMusicPieceID.LEVEL_LAST_MINUTE, "music_mp_freeagents_lastminute", TEAM_MILITIA )

+}

+

+void function ServerCallback_YouAreHidden()

+{

+	// heavily based on mfd code

+	entity localPlayer = GetLocalViewPlayer()

+

+	StartParticleEffectOnEntity( localPlayer.GetCockpit(), GetParticleSystemIndex( $"P_MFD" ), FX_PATTACH_ABSORIGIN_FOLLOW, -1 )

+	EmitSoundOnEntity( localPlayer, "UI_InGame_MarkedForDeath_PlayerMarked"  )

+	HideEventNotification()

+	AnnouncementData announcement = Announcement_Create( "#HIDDEN_YOU_ARE_HIDDEN" )

+	Announcement_SetSubText( announcement, "#HIDDEN_KILL_SURVIVORS" )

+	Announcement_SetTitleColor( announcement, <1,0,0> )

+	Announcement_SetPurge( announcement, true )

+	Announcement_SetPriority( announcement, 200 ) //Be higher priority than Titanfall ready indicator etc

+	Announcement_SetSoundAlias( announcement, SFX_HUD_ANNOUNCE_QUICK )

+	Announcement_SetStyle( announcement, ANNOUNCEMENT_STYLE_QUICK )

+	AnnouncementFromClass( localPlayer, announcement )

+}

+

+void function ServerCallback_AnnounceHidden( int survivorEHandle )

+{

+	entity player = GetEntityFromEncodedEHandle( survivorEHandle )

+

+	AnnouncementData announcement = Announcement_Create( Localize( "#HIDDEN_FIRST_HIDDEN", player.GetPlayerName() ) )

+	//Announcement_SetSubText( announcement, "#INFECTION_KILL_LAST_SURVIVOR" )

+	Announcement_SetTitleColor( announcement, <1,0,0> )

+	Announcement_SetPurge( announcement, true )

+	Announcement_SetPriority( announcement, 200 ) //Be higher priority than Titanfall ready indicator etc

+	Announcement_SetSoundAlias( announcement, SFX_HUD_ANNOUNCE_QUICK )

+	Announcement_SetStyle( announcement, ANNOUNCEMENT_STYLE_QUICK )

+	AnnouncementFromClass( GetLocalViewPlayer(), announcement )

+}
\ No newline at end of file
diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_chamber.nut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_chamber.nut
new file mode 100644
index 000000000..e78a020b2
--- /dev/null
+++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_chamber.nut
@@ -0,0 +1,41 @@
+global function Sh_GamemodeChamber_Init

+

+global const string GAMEMODE_CHAMBER = "chamber"

+

+void function Sh_GamemodeChamber_Init()

+{

+	// create custom gamemode

+	AddCallback_OnCustomGamemodesInit( CreateGamemodeChamber )

+}

+

+void function CreateGamemodeChamber()

+{

+	GameMode_Create( GAMEMODE_CHAMBER )

+	GameMode_SetName( GAMEMODE_CHAMBER, "#GAMEMODE_CHAMBER" )

+	GameMode_SetDesc( GAMEMODE_CHAMBER, "#PL_chamber_desc" )

+	GameMode_SetGameModeAnnouncement( GAMEMODE_CHAMBER, "ffa_modeDesc" )

+	GameMode_SetDefaultTimeLimits( GAMEMODE_CHAMBER, 10, 0.0 )

+	GameMode_AddScoreboardColumnData( GAMEMODE_CHAMBER, "#SCOREBOARD_SCORE", PGS_ASSAULT_SCORE, 2 )

+	GameMode_AddScoreboardColumnData( GAMEMODE_CHAMBER, "#SCOREBOARD_PILOT_KILLS", PGS_PILOT_KILLS, 2 )

+	GameMode_SetColor( GAMEMODE_CHAMBER, [147, 204, 57, 255] )

+

+	AddPrivateMatchMode( GAMEMODE_CHAMBER ) // add to private lobby modes

+

+	// set this to 25 score limit default

+	GameMode_SetDefaultScoreLimits( GAMEMODE_CHAMBER, 25, 0 )

+

+	#if SERVER

+		GameMode_AddServerInit( GAMEMODE_CHAMBER, GamemodeChamber_Init )

+		GameMode_AddServerInit( GAMEMODE_CHAMBER, GamemodeFFAShared_Init )

+		GameMode_SetPilotSpawnpointsRatingFunc( GAMEMODE_CHAMBER, RateSpawnpoints_Generic )

+		GameMode_SetTitanSpawnpointsRatingFunc( GAMEMODE_CHAMBER, RateSpawnpoints_Generic )

+	#elseif CLIENT

+		GameMode_AddClientInit( GAMEMODE_CHAMBER, ClGamemodeChamber_Init )

+		GameMode_AddClientInit( GAMEMODE_CHAMBER, GamemodeFFAShared_Init )

+		GameMode_AddClientInit( GAMEMODE_CHAMBER, ClGamemodeFFA_Init )

+	#endif

+	#if !UI

+		GameMode_SetScoreCompareFunc( GAMEMODE_CHAMBER, CompareAssaultScore )

+		GameMode_AddSharedInit( GAMEMODE_CHAMBER, GamemodeFFA_Dialogue_Init )

+	#endif

+}

diff --git a/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_hidden.nut b/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_hidden.nut
new file mode 100644
index 000000000..78357d200
--- /dev/null
+++ b/Northstar.Custom/mod/scripts/vscripts/gamemodes/sh_gamemode_hidden.nut
@@ -0,0 +1,44 @@
+global function Sh_GamemodeHidden_Init

+

+global const string GAMEMODE_HIDDEN = "hidden"

+

+void function Sh_GamemodeHidden_Init()

+{

+	// create custom gamemode

+	AddCallback_OnCustomGamemodesInit( CreateGamemodeHidden )

+	AddCallback_OnRegisteringCustomNetworkVars( HiddenRegisterNetworkVars )

+}

+

+void function CreateGamemodeHidden()

+{

+	GameMode_Create( GAMEMODE_HIDDEN )

+	GameMode_SetName( GAMEMODE_HIDDEN, "#GAMEMODE_HIDDEN" )

+	GameMode_SetDesc( GAMEMODE_HIDDEN, "#PL_hidden_desc" )

+	GameMode_SetGameModeAnnouncement( GAMEMODE_HIDDEN, "ffa_modeDesc" )

+	GameMode_SetDefaultTimeLimits( GAMEMODE_HIDDEN, 5, 0.0 )

+	GameMode_AddScoreboardColumnData( GAMEMODE_HIDDEN, "#SCOREBOARD_SCORE", PGS_ASSAULT_SCORE, 2 )

+	GameMode_AddScoreboardColumnData( GAMEMODE_HIDDEN, "#SCOREBOARD_PILOT_KILLS", PGS_PILOT_KILLS, 2 )

+	GameMode_SetColor( GAMEMODE_HIDDEN, [147, 204, 57, 255] )

+

+	AddPrivateMatchMode( GAMEMODE_HIDDEN ) // add to private lobby modes

+

+	#if SERVER

+		GameMode_AddServerInit( GAMEMODE_HIDDEN, GamemodeHidden_Init )

+		GameMode_SetPilotSpawnpointsRatingFunc( GAMEMODE_HIDDEN, RateSpawnpoints_Generic )

+		GameMode_SetTitanSpawnpointsRatingFunc( GAMEMODE_HIDDEN, RateSpawnpoints_Generic )

+	#elseif CLIENT

+		GameMode_AddClientInit( GAMEMODE_HIDDEN, ClGamemodeHidden_Init )

+	#endif

+	#if !UI

+		GameMode_SetScoreCompareFunc( GAMEMODE_HIDDEN, CompareAssaultScore )

+	#endif

+}

+

+void function HiddenRegisterNetworkVars()

+{

+	if ( GAMETYPE != GAMEMODE_HIDDEN )

+		return

+

+	Remote_RegisterFunction( "ServerCallback_YouAreHidden" )

+	Remote_RegisterFunction( "ServerCallback_AnnounceHidden" )

+}