Merge branch 'R2Northstar:main' into main

4 files changed, 147 insertions, 110 deletions

diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ps.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ps.nut
index 4e62e8c5..7eec7c89 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ps.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ps.nut
@@ -1,15 +1,27 @@
-global function GamemodePs_Init
-
-void function GamemodePs_Init()
-{
-	Riff_ForceTitanAvailability( eTitanAvailability.Never )
-
-	AddCallback_OnPlayerKilled( GiveScoreForPlayerKill )
-	ScoreEvent_SetupEarnMeterValuesForMixedModes()
-}
-
-void function GiveScoreForPlayerKill( entity victim, entity attacker, var damageInfo )
-{
-	if ( victim != attacker && victim.IsPlayer() && attacker.IsPlayer() )
-		AddTeamScore( attacker.GetTeam(), 1 )
+global function GamemodePs_Init

+

+void function GamemodePs_Init()

+{

+	Riff_ForceTitanAvailability( eTitanAvailability.Never )

+

+	AddCallback_OnPlayerKilled( GiveScoreForPlayerKill )

+	ScoreEvent_SetupEarnMeterValuesForMixedModes()

+	SetTimeoutWinnerDecisionFunc( CheckScoreForDraw )

+

+}

+

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

+{

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

+		AddTeamScore( attacker.GetTeam(), 1 )

+}

+

+int function CheckScoreForDraw()

+{

+	if (GameRules_GetTeamScore(TEAM_IMC) > GameRules_GetTeamScore(TEAM_MILITIA))

+		return TEAM_IMC

+	else if (GameRules_GetTeamScore(TEAM_MILITIA) > GameRules_GetTeamScore(TEAM_IMC))

+		return TEAM_MILITIA

+

+	return TEAM_UNASSIGNED

 }
\ No newline at end of file
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_speedball.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_speedball.nut
index cef0af6b..3bc11c3a 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_speedball.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_speedball.nut
@@ -25,6 +25,7 @@ void function GamemodeSpeedball_Init()
 	AddCallback_OnTouchHealthKit( "item_flag", OnFlagCollected )
 	AddCallback_OnPlayerKilled( OnPlayerKilled )
 	SetTimeoutWinnerDecisionFunc( TimeoutCheckFlagHolder )
+	AddCallback_OnRoundEndCleanup ( ResetFlag )
 
 	ClassicMP_SetCustomIntro( ClassicMP_DefaultNoIntro_Setup, ClassicMP_DefaultNoIntro_GetLength() )
 	ClassicMP_ForceDisableEpilogue( true )
@@ -103,7 +104,9 @@ void function DropFlag()
 	file.flag.ClearParent()
 	file.flag.SetAngles( < 0, 0, 0 > )
 	SetGlobalNetEnt( "flagCarrier", file.flag )
-	EmitSoundOnEntityOnlyToPlayer( file.flagCarrier, file.flagCarrier, "UI_CTF_1P_FlagDrop" )
+	
+	if ( IsValid( file.flagCarrier ) )
+		EmitSoundOnEntityOnlyToPlayer( file.flagCarrier, file.flagCarrier, "UI_CTF_1P_FlagDrop" )
 	
 	foreach ( entity player in GetPlayerArray() )
 		MessageToPlayer( player, eEventNotifications.SPEEDBALL_FlagDropped, file.flagCarrier )
@@ -127,4 +130,4 @@ int function TimeoutCheckFlagHolder()
 		return TEAM_UNASSIGNED
 		
 	return file.flagCarrier.GetTeam()
-}
\ No newline at end of file
+}
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_tdm.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_tdm.nut
index 5dd8a403..ba180790 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_tdm.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_tdm.nut
@@ -1,20 +1,31 @@
-global function GamemodeTdm_Init
-global function RateSpawnpoints_Directional
-
-void function GamemodeTdm_Init()
-{
-	AddCallback_OnPlayerKilled( GiveScoreForPlayerKill )
-	ScoreEvent_SetupEarnMeterValuesForMixedModes()
-}
-
-void function GiveScoreForPlayerKill( entity victim, entity attacker, var damageInfo )
-{
-	if ( victim != attacker && victim.IsPlayer() && attacker.IsPlayer() )
-		AddTeamScore( attacker.GetTeam(), 1 )
-}
-
-void function RateSpawnpoints_Directional( int checkclass, array<entity> spawnpoints, int team, entity player )
-{
-	// temp
-	RateSpawnpoints_Generic( checkclass, spawnpoints, team, player )
+global function GamemodeTdm_Init

+global function RateSpawnpoints_Directional

+

+void function GamemodeTdm_Init()

+{

+	AddCallback_OnPlayerKilled( GiveScoreForPlayerKill )

+	ScoreEvent_SetupEarnMeterValuesForMixedModes()

+	SetTimeoutWinnerDecisionFunc( CheckScoreForDraw )

+}

+

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

+{

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

+		AddTeamScore( attacker.GetTeam(), 1 )

+}

+

+void function RateSpawnpoints_Directional( int checkclass, array<entity> spawnpoints, int team, entity player )

+{

+	// temp

+	RateSpawnpoints_Generic( checkclass, spawnpoints, team, player )

+}

+

+int function CheckScoreForDraw()

+{

+	if (GameRules_GetTeamScore(TEAM_IMC) > GameRules_GetTeamScore(TEAM_MILITIA))

+		return TEAM_IMC

+	else if (GameRules_GetTeamScore(TEAM_MILITIA) > GameRules_GetTeamScore(TEAM_IMC))

+		return TEAM_MILITIA

+

+	return TEAM_UNASSIGNED

 }
\ No newline at end of file
diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ttdm.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ttdm.nut
index 9e5d95ba..c72fcb0d 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ttdm.nut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ttdm.nut
@@ -1,76 +1,87 @@
-global function GamemodeTTDM_Init
-
-const float TTDMIntroLength = 15.0
-
-void function GamemodeTTDM_Init()
-{
-	Riff_ForceSetSpawnAsTitan( eSpawnAsTitan.Always )
-	Riff_ForceTitanExitEnabled( eTitanExitEnabled.Never )
-	TrackTitanDamageInPlayerGameStat( PGS_ASSAULT_SCORE )
-	ScoreEvent_SetupEarnMeterValuesForMixedModes()
-	SetLoadoutGracePeriodEnabled( false )
-	
-	ClassicMP_SetCustomIntro( TTDMIntroSetup, TTDMIntroLength )
-	ClassicMP_ForceDisableEpilogue( true )
-	
-	AddCallback_OnPlayerKilled( AddTeamScoreForPlayerKilled ) // dont have to track autotitan kills since you cant leave your titan in this mode
-	
-	// probably needs scoreevent earnmeter values
-}
-
-void function TTDMIntroSetup()
-{
-	// this should show intermission cam for 15 sec in prematch, before spawning players as titans
-	AddCallback_GameStateEnter( eGameState.Prematch, TTDMIntroStart )
-	AddCallback_OnClientConnected( TTDMIntroShowIntermissionCam )
-}
-
-void function TTDMIntroStart()
-{
-	thread TTDMIntroStartThreaded()
-}
-
-void function TTDMIntroStartThreaded()
-{
-	ClassicMP_OnIntroStarted()
-
-	foreach ( entity player in GetPlayerArray() )
-		TTDMIntroShowIntermissionCam( player )
-		
-	wait TTDMIntroLength
-	
-	ClassicMP_OnIntroFinished()
-}
-
-void function TTDMIntroShowIntermissionCam( entity player )
-{
-	if ( GetGameState() != eGameState.Prematch )
-		return
-	
-	thread PlayerWatchesTTDMIntroIntermissionCam( player )
-}
-
-void function PlayerWatchesTTDMIntroIntermissionCam( entity player )
-{
-	ScreenFadeFromBlack( player )
-
-	entity intermissionCam = GetEntArrayByClass_Expensive( "info_intermission" )[ 0 ]
-	
-	// the angle set here seems sorta inconsistent as to whether it actually works or just stays at 0 for some reason
-	player.SetObserverModeStaticPosition( intermissionCam.GetOrigin() )
-	player.SetObserverModeStaticAngles( intermissionCam.GetAngles() )
-	player.StartObserverMode( OBS_MODE_STATIC_LOCKED )
-
-	wait TTDMIntroLength
-	
-	RespawnAsTitan( player, false )
-	TryGameModeAnnouncement( player )
-}
-
-void function AddTeamScoreForPlayerKilled( entity victim, entity attacker, var damageInfo )
-{
-	if ( victim == attacker || !victim.IsPlayer() || !attacker.IsPlayer() )
-		return
-		
-	AddTeamScore( GetOtherTeam( victim.GetTeam() ), 1 )
+global function GamemodeTTDM_Init

+

+const float TTDMIntroLength = 15.0

+

+void function GamemodeTTDM_Init()

+{

+	Riff_ForceSetSpawnAsTitan( eSpawnAsTitan.Always )

+	Riff_ForceTitanExitEnabled( eTitanExitEnabled.Never )

+	TrackTitanDamageInPlayerGameStat( PGS_ASSAULT_SCORE )

+	ScoreEvent_SetupEarnMeterValuesForMixedModes()

+	SetLoadoutGracePeriodEnabled( false )

+

+	ClassicMP_SetCustomIntro( TTDMIntroSetup, TTDMIntroLength )

+	ClassicMP_ForceDisableEpilogue( true )

+	SetTimeoutWinnerDecisionFunc( CheckScoreForDraw )

+

+	AddCallback_OnPlayerKilled( AddTeamScoreForPlayerKilled ) // dont have to track autotitan kills since you cant leave your titan in this mode

+

+	// probably needs scoreevent earnmeter values

+}

+

+void function TTDMIntroSetup()

+{

+	// this should show intermission cam for 15 sec in prematch, before spawning players as titans

+	AddCallback_GameStateEnter( eGameState.Prematch, TTDMIntroStart )

+	AddCallback_OnClientConnected( TTDMIntroShowIntermissionCam )

+}

+

+void function TTDMIntroStart()

+{

+	thread TTDMIntroStartThreaded()

+}

+

+void function TTDMIntroStartThreaded()

+{

+	ClassicMP_OnIntroStarted()

+

+	foreach ( entity player in GetPlayerArray() )

+		TTDMIntroShowIntermissionCam( player )

+

+	wait TTDMIntroLength

+

+	ClassicMP_OnIntroFinished()

+}

+

+void function TTDMIntroShowIntermissionCam( entity player )

+{

+	if ( GetGameState() != eGameState.Prematch )

+		return

+

+	thread PlayerWatchesTTDMIntroIntermissionCam( player )

+}

+

+void function PlayerWatchesTTDMIntroIntermissionCam( entity player )

+{

+	ScreenFadeFromBlack( player )

+

+	entity intermissionCam = GetEntArrayByClass_Expensive( "info_intermission" )[ 0 ]

+

+	// the angle set here seems sorta inconsistent as to whether it actually works or just stays at 0 for some reason

+	player.SetObserverModeStaticPosition( intermissionCam.GetOrigin() )

+	player.SetObserverModeStaticAngles( intermissionCam.GetAngles() )

+	player.StartObserverMode( OBS_MODE_STATIC_LOCKED )

+

+	wait TTDMIntroLength

+

+	RespawnAsTitan( player, false )

+	TryGameModeAnnouncement( player )

+}

+

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

+{

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

+		return

+

+	AddTeamScore( GetOtherTeam( victim.GetTeam() ), 1 )

+}

+

+int function CheckScoreForDraw()

+{

+	if (GameRules_GetTeamScore(TEAM_IMC) > GameRules_GetTeamScore(TEAM_MILITIA))

+		return TEAM_IMC

+	else if (GameRules_GetTeamScore(TEAM_MILITIA) > GameRules_GetTeamScore(TEAM_IMC))

+		return TEAM_MILITIA

+

+	return TEAM_UNASSIGNED

 }
\ No newline at end of file