fixes from playtest

8 files changed, 136 insertions, 138 deletions

diff --git a/Northstar.CustomServers/mod.json b/Northstar.CustomServers/mod.json
index 9cd7ebb40..9f9b405b1 100644
--- a/Northstar.CustomServers/mod.json
+++ b/Northstar.CustomServers/mod.json
@@ -68,13 +68,6 @@
 				"Before": "GamemodeFRA_AddAdditionalInitCallback"
 			}
 		},
-		{
-			"Path": "gamemodes/_featured_mode_settings.gnut",
-			"RunOn": "SERVER && MP",
-			"ServerCallback": { 
-				"After": "FeaturedModeSettings_Init"
-			}
-		},
 		
 		{
 			"Path": "mp/_classic_mp_dropship_intro.gnut",
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut b/Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut
index d84ab8735..9a7e89e22 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/evac/_evac.gnut
@@ -94,9 +94,11 @@ void function EvacEpilogueSetup()
 
 void function EvacEpilogue()
 {
-	// make sure we don't run this on ffa modes if no epilogue was specified, since evac is default epilogue
-	if ( GetCurrentPlaylistVarInt( "max_teams", 2 ) == 2 )
-		thread Evac( GetOtherTeam( GetWinningTeam() ), EVAC_INITIAL_WAIT, EVAC_ARRIVAL_TIME, EVAC_WAIT_TIME, EvacEpiloguePlayerCanBoard, EvacEpilogueShouldLeaveEarly, EvacEpilogueCompleted )
+	int winner = GetWinningTeam()		
+
+	// make sure we don't run this on ffa modes if no epilogue was specified or it won't work for current gamestate, since evac is default epilogue
+	if ( GetCurrentPlaylistVarInt( "max_teams", 2 ) == 2 && ( winner == TEAM_MILITIA || winner == TEAM_IMC ) )
+		thread Evac( GetOtherTeam( winner ), EVAC_INITIAL_WAIT, EVAC_ARRIVAL_TIME, EVAC_WAIT_TIME, EvacEpiloguePlayerCanBoard, EvacEpilogueShouldLeaveEarly, EvacEpilogueCompleted )
 	else
 		thread EvacEpilogueCompleted( null ) // this is hacky but like, this also shouldn't really be hit in normal gameplay
 }
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_featured_mode_settings.gnut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_featured_mode_settings.gnut
deleted file mode 100644
index 62fd52c9c..000000000
--- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_featured_mode_settings.gnut
+++ /dev/null
@@ -1,122 +0,0 @@
-untyped
-global function FeaturedModeSettings_Init
-
-void function FeaturedModeSettings_Init()
-{
-	// if it's not super obvious at a glance this script is used for playlist vars with the prefix "featured_mode_"
-	// these often set loadouts and shit so they need a script
-	// note: for turbo_titans, the core multiplier is set in playlist
-
-	AddCallback_OnPlayerRespawned( FeaturedModeSettingsSetupPilotLoadouts )
-	AddCallback_OnPilotBecomesTitan( FeaturedModeSettingsSetupTitanLoadouts )
-}
-
-bool function IsFeaturedMode( string modeName )
-{
-	return GetCurrentPlaylistVar( "featured_mode_" + modeName ) == "1"
-}
-
-void function FeaturedModeSettingsSetupPilotLoadouts( entity player )
-{
-	bool shouldChangeLoadout = false
-
-	// create loadout struct
-	PilotLoadoutDef modifiedLoadout = clone GetActivePilotLoadout( player )
-
-	if ( IsFeaturedMode( "all_holopilot" ) )
-	{
-		shouldChangeLoadout = true 
-		
-		modifiedLoadout.special = "mp_ability_holopilot"
-	}
-		
-	if ( IsFeaturedMode( "all_grapple" ) ) 
-	{
-		shouldChangeLoadout = true 
-		
-		modifiedLoadout.special = "mp_ability_grapple"
-		modifiedLoadout.specialMods = [ "all_grapple" ]
-	}
-		
-	if ( IsFeaturedMode( "all_phase" ) ) 
-	{
-		shouldChangeLoadout = true 
-		
-		modifiedLoadout.special = "mp_ability_shifter"
-		modifiedLoadout.specialMods = [ "all_phase" ]
-	}
-		
-	if ( IsFeaturedMode( "all_ticks" ) ) 
-	{
-		shouldChangeLoadout = true 
-		
-		modifiedLoadout.ordnance = "mp_weapon_frag_drone"
-		modifiedLoadout.ordnanceMods = [ "all_ticks" ]
-	}
-	
-	if ( IsFeaturedMode( "rocket_arena" ) )
-	{	
-		// this crashes sometimes for some reason
-	
-		shouldChangeLoadout = true
-	
-		modifiedLoadout.primary = "mp_weapon_epg"
-		modifiedLoadout.primaryMods = [ "rocket_arena" ]
-		
-		// set secondary to whatever one is pistol
-		if ( GetWeaponInfoFileKeyField_Global( player.GetMainWeapons()[ 1 ].GetWeaponClassName(), "menu_category" ) == "at" )
-		{
-			modifiedLoadout.weapon3 = "mp_weapon_autopistol"
-			modifiedLoadout.weapon3Mods = [ "rocket_arena" ]
-		}
-		else
-		{
-			modifiedLoadout.secondary = "mp_weapon_autopistol"
-			modifiedLoadout.secondaryMods = [ "rocket_arena" ]
-		}
-		
-		player.GiveExtraWeaponMod( "rocket_arena" )
-	}
-	
-	if ( IsFeaturedMode( "shotguns_snipers" ) )
-	{
-	
-		shouldChangeLoadout = true 
-		
-		// this one was never released, assuming it just gives you a mastiff and a kraber with quick swap
-		modifiedLoadout.primary = "mp_weapon_sniper"
-		modifiedLoadout.primaryMods = [ "pas_fast_swap", "pas_fast_ads" ]
-		
-		// set secondary to whatever one is pistol
-		if ( GetWeaponInfoFileKeyField_Global( player.GetMainWeapons()[ 1 ].GetWeaponClassName(), "menu_category" ) == "at" )
-		{
-			modifiedLoadout.weapon3 = "mp_weapon_mastiff"
-			modifiedLoadout.weapon3Mods = [ "pas_fast_swap", "pas_run_and_gun" ]
-		}
-		else
-		{
-			modifiedLoadout.secondary = "mp_weapon_mastiff"
-			modifiedLoadout.secondaryMods = [ "pas_fast_swap", "pas_run_and_gun" ]
-		}
-	}
-	
-	// dont wanna give a new loadout if it's not necessary, could break other callbacks
-	if ( shouldChangeLoadout )
-		GivePilotLoadout( player, modifiedLoadout )
-	
-	if ( IsFeaturedMode( "tactikill" ) )
-		player.GiveExtraWeaponMod( "tactical_cdr_on_kill" )
-	
-	if ( IsFeaturedMode( "amped_tacticals" ) )
-		player.GiveExtraWeaponMod( "amped_tacticals" )
-}
-
-void function FeaturedModeSettingsSetupTitanLoadouts( entity player, entity titan )
-{
-	if ( IsFeaturedMode( "turbo_titans" ) )
-	{
-		array<string> settingsMods = player.GetPlayerSettingsMods()
-		settingsMods.append( "turbo_titan" )
-		player.SetPlayerSettingsWithMods( player.GetPlayerSettings(), settingsMods )
-	}
-}
\ No newline at end of file
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_hardpoints.gnut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_hardpoints.gnut
index 0a32f133c..8331a81a4 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_hardpoints.gnut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_hardpoints.gnut
@@ -11,7 +11,7 @@ global function CapturePoint_GetGoalProgress
 
 void function Hardpoints_Init()
 {
-	
+	RegisterSignal( "StopHardpointBehavior" )
 }
 
 float function CapturePoint_GetStartProgress( entity hardpoint )
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut
index 4263eb1ac..e3b252f78 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_gamestate_mp.nut
@@ -314,7 +314,7 @@ void function GameStateEnter_WinnerDetermined_Threaded()
 		if ( killcamsWereEnabled )
 			SetKillcamsEnabled( true )
 	}
-	else
+	else if ( IsRoundBased() || !ClassicMP_ShouldRunEpilogue() )
 	{
 		// these numbers are temp and should really be based on consts of some kind
 		foreach( entity player in GetPlayerArray() )
@@ -650,8 +650,11 @@ void function CleanUpEntitiesForRoundEnd()
 	}
 	
 	foreach ( entity npc in GetNPCArray() )
-		if ( IsAlive( npc ) )
-			npc.Die() // need this because getnpcarray includes the pettitans we just killed at this point
+		if ( IsValid( npc ) )
+			npc.Destroy() // need this because getnpcarray includes the pettitans we just killed at this point
+			
+	foreach ( entity weapon in GetEntArrayByClass_Expensive( "weaponx" ) )
+		weapon.Destroy()
 	
 	// allow other scripts to clean stuff up too
 	svGlobal.levelEnt.Signal( "CleanUpEntitiesForRoundEnd" ) 
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_playlist.gnut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_playlist.gnut
index dfceab412..0d610e37b 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_playlist.gnut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_playlist.gnut
@@ -1,6 +1,123 @@
+untyped
 global function Playlist_Init
 
 void function Playlist_Init()
 {
+	// featured mode settings
+	AddCallback_OnPlayerRespawned( FeaturedModeSettingsSetupPilotLoadouts )
+	AddCallback_OnPilotBecomesTitan( FeaturedModeSettingsSetupTitanLoadouts )
+	
+	// iron lts rules
+	if ( HasIronRules() ) 
+		Riff_ForceTitanExitEnabled( eTitanExitEnabled.Never )
+}
 
+bool function IsFeaturedMode( string modeName )
+{
+	return GetCurrentPlaylistVar( "featured_mode_" + modeName ) == "1"
+}
+
+void function FeaturedModeSettingsSetupPilotLoadouts( entity player )
+{
+	bool shouldChangeLoadout = false
+
+	// create loadout struct
+	PilotLoadoutDef modifiedLoadout = clone GetActivePilotLoadout( player )
+
+	if ( IsFeaturedMode( "all_holopilot" ) )
+	{
+		shouldChangeLoadout = true 
+		
+		modifiedLoadout.special = "mp_ability_holopilot"
+	}
+		
+	if ( IsFeaturedMode( "all_grapple" ) ) 
+	{
+		shouldChangeLoadout = true 
+		
+		modifiedLoadout.special = "mp_ability_grapple"
+		modifiedLoadout.specialMods = [ "all_grapple" ]
+	}
+		
+	if ( IsFeaturedMode( "all_phase" ) ) 
+	{
+		shouldChangeLoadout = true 
+		
+		modifiedLoadout.special = "mp_ability_shifter"
+		modifiedLoadout.specialMods = [ "all_phase" ]
+	}
+		
+	if ( IsFeaturedMode( "all_ticks" ) ) 
+	{
+		shouldChangeLoadout = true 
+		
+		modifiedLoadout.ordnance = "mp_weapon_frag_drone"
+		modifiedLoadout.ordnanceMods = [ "all_ticks" ]
+	}
+	
+	if ( IsFeaturedMode( "rocket_arena" ) )
+	{	
+		// this crashes sometimes for some reason
+	
+		shouldChangeLoadout = true
+	
+		modifiedLoadout.primary = "mp_weapon_epg"
+		modifiedLoadout.primaryMods = [ "rocket_arena" ]
+		
+		// set secondary to whatever one is pistol
+		if ( GetWeaponInfoFileKeyField_Global( player.GetMainWeapons()[ 1 ].GetWeaponClassName(), "menu_category" ) == "at" )
+		{
+			modifiedLoadout.weapon3 = "mp_weapon_autopistol"
+			modifiedLoadout.weapon3Mods = [ "rocket_arena" ]
+		}
+		else
+		{
+			modifiedLoadout.secondary = "mp_weapon_autopistol"
+			modifiedLoadout.secondaryMods = [ "rocket_arena" ]
+		}
+		
+		player.GiveExtraWeaponMod( "rocket_arena" )
+	}
+	
+	if ( IsFeaturedMode( "shotguns_snipers" ) )
+	{
+	
+		shouldChangeLoadout = true 
+		
+		// this one was never released, assuming it just gives you a mastiff and a kraber with quick swap
+		modifiedLoadout.primary = "mp_weapon_sniper"
+		modifiedLoadout.primaryMods = [ "pas_fast_swap", "pas_fast_ads" ]
+		
+		// set secondary to whatever one is pistol
+		if ( GetWeaponInfoFileKeyField_Global( player.GetMainWeapons()[ 1 ].GetWeaponClassName(), "menu_category" ) == "at" )
+		{
+			modifiedLoadout.weapon3 = "mp_weapon_mastiff"
+			modifiedLoadout.weapon3Mods = [ "pas_fast_swap", "pas_run_and_gun" ]
+		}
+		else
+		{
+			modifiedLoadout.secondary = "mp_weapon_mastiff"
+			modifiedLoadout.secondaryMods = [ "pas_fast_swap", "pas_run_and_gun" ]
+		}
+	}
+	
+	// dont wanna give a new loadout if it's not necessary, could break other callbacks
+	if ( shouldChangeLoadout )
+		GivePilotLoadout( player, modifiedLoadout )
+	
+	if ( IsFeaturedMode( "tactikill" ) )
+		player.GiveExtraWeaponMod( "tactical_cdr_on_kill" )
+	
+	if ( IsFeaturedMode( "amped_tacticals" ) )
+		player.GiveExtraWeaponMod( "amped_tacticals" )
+}
+
+void function FeaturedModeSettingsSetupTitanLoadouts( entity player, entity titan )
+{
+	if ( IsFeaturedMode( "turbo_titans" ) )
+	{
+		array<string> settingsMods = player.GetPlayerSettingsMods()
+		settingsMods.append( "turbo_titan" )
+		player.SetPlayerSettingsWithMods( player.GetPlayerSettings(), settingsMods )
+	}
 }
\ No newline at end of file
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut
index 3421419ca..399407694 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/_score.nut
@@ -188,7 +188,12 @@ void function ScoreEvent_TitanKilled( entity victim, entity attacker, var damage
 
 void function ScoreEvent_NPCKilled( entity victim, entity attacker, var damageInfo )
 {
-	AddPlayerScore( attacker, ScoreEventForNPCKilled( victim, damageInfo ), victim )
+	try
+	{		
+		// have to trycatch this because marvins will crash on kill if we dont
+		AddPlayerScore( attacker, ScoreEventForNPCKilled( victim, damageInfo ), victim )
+	}
+	catch ( ex ) {}
 }
 
 
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/mp/spawn.nut b/Northstar.CustomServers/mod/scripts/vscripts/mp/spawn.nut
index b72e660ed..1766a216d 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/mp/spawn.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/mp/spawn.nut
@@ -273,7 +273,7 @@ bool function IsSpawnpointValid( entity spawnpoint, int team )
 			continue
 		
 		// check distance, constant here is basically arbitrary
-		if ( Distance( enemyPlayer, spawnpoint ) > 1000.0 )
+		if ( Distance( enemyPlayer.GetOrigin(), spawnpoint.GetOrigin() ) > 1000.0 )
 			continue
 		
 		// check fov, constant here is stolen from every other place this is done