From d579444d87117c9262142a3a6ef553a51d3a7735 Mon Sep 17 00:00:00 2001 From: x3Karma Date: Wed, 29 Dec 2021 12:35:57 +0800 Subject: Stop Pilots vs Pilots from scoring during the epilogue --- .../mod/scripts/vscripts/gamemodes/_gamemode_ps.nut | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Northstar.CustomServers/mod') diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ps.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ps.nut index 4e62e8c54..7e3e5ea2d 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ps.nut +++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ps.nut @@ -10,6 +10,6 @@ void function GamemodePs_Init() void function GiveScoreForPlayerKill( entity victim, entity attacker, var damageInfo ) { - if ( victim != attacker && victim.IsPlayer() && attacker.IsPlayer() ) + if ( victim != attacker && victim.IsPlayer() && attacker.IsPlayer() && GetGameState() != eGameState.Epilogue ) AddTeamScore( attacker.GetTeam(), 1 ) -} \ No newline at end of file +} -- cgit v1.2.3 From 425336bbb830a2699e3b9b4eb11d71690bb26aac Mon Sep 17 00:00:00 2001 From: x3Karma Date: Wed, 29 Dec 2021 12:37:06 +0800 Subject: Stop Skirmish from scoring during the epilogue --- .../mod/scripts/vscripts/gamemodes/_gamemode_tdm.nut | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Northstar.CustomServers/mod') diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_tdm.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_tdm.nut index 5dd8a403b..fd5cbb146 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_tdm.nut +++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_tdm.nut @@ -9,7 +9,7 @@ void function GamemodeTdm_Init() void function GiveScoreForPlayerKill( entity victim, entity attacker, var damageInfo ) { - if ( victim != attacker && victim.IsPlayer() && attacker.IsPlayer() ) + if ( victim != attacker && victim.IsPlayer() && attacker.IsPlayer() && GetGameState() != eGameState.Epilogue ) AddTeamScore( attacker.GetTeam(), 1 ) } @@ -17,4 +17,4 @@ void function RateSpawnpoints_Directional( int checkclass, array spawnpo { // temp RateSpawnpoints_Generic( checkclass, spawnpoints, team, player ) -} \ No newline at end of file +} -- cgit v1.2.3 From 4210b5684c11538db59df1cd4a77e99423df4f4d Mon Sep 17 00:00:00 2001 From: x3Karma Date: Wed, 29 Dec 2021 12:38:15 +0800 Subject: Stop Titan Brawl from scoring during the epilogue if tits turned on lol --- .../mod/scripts/vscripts/gamemodes/_gamemode_ttdm.nut | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Northstar.CustomServers/mod') diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ttdm.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ttdm.nut index 9e5d95bac..82b673d2a 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ttdm.nut +++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_ttdm.nut @@ -69,8 +69,8 @@ void function PlayerWatchesTTDMIntroIntermissionCam( entity player ) void function AddTeamScoreForPlayerKilled( entity victim, entity attacker, var damageInfo ) { - if ( victim == attacker || !victim.IsPlayer() || !attacker.IsPlayer() ) + if ( victim == attacker || !victim.IsPlayer() || !attacker.IsPlayer() || GetGameState() != eGameState.Playing ) return AddTeamScore( GetOtherTeam( victim.GetTeam() ), 1 ) -} \ No newline at end of file +} -- cgit v1.2.3 From 7ed259a9a76dc2e90cc1934f688c949cc7e9edcc Mon Sep 17 00:00:00 2001 From: x3Karma Date: Thu, 30 Dec 2021 02:06:19 +0800 Subject: reset flags properly --- .../mod/scripts/vscripts/gamemodes/_gamemode_speedball.nut | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Northstar.CustomServers/mod') diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_speedball.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_speedball.nut index cef0af6bd..bba703588 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 ) @@ -127,4 +128,4 @@ int function TimeoutCheckFlagHolder() return TEAM_UNASSIGNED return file.flagCarrier.GetTeam() -} \ No newline at end of file +} -- cgit v1.2.3