diff options
| author | BobTheBob <32057864+BobTheBob9@users.noreply.github.com> | 2021-12-30 02:24:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-30 02:24:38 +0000 |
| commit | 3e5fb06337812e4a6b2aff3eea203ce2b76cc46d (patch) | |
| tree | 319f6265e47fc1eaf1601f78f12d85d58b171c26 /Northstar.CustomServers/mod | |
| parent | f4a44a7859e60843792580cced586e4f74448849 (diff) | |
| parent | 07ccd9d1ddfde5f6f06c4cf75e1b3690c34b1f3d (diff) | |
| download | NorthstarMods-3e5fb06337812e4a6b2aff3eea203ce2b76cc46d.tar.gz NorthstarMods-3e5fb06337812e4a6b2aff3eea203ce2b76cc46d.zip | |
Merge pull request #22 from x3Karma/main
General Gamemodes Improvement
Diffstat (limited to 'Northstar.CustomServers/mod')
4 files changed, 8 insertions, 7 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..7e3e5ea2 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 +} diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_speedball.nut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_gamemode_speedball.nut index 22c660d8..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 ) @@ -129,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..fd5cbb14 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<entity> spawnpo { // temp RateSpawnpoints_Generic( checkclass, spawnpoints, team, player ) -}
\ 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..82b673d2 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 +} |