From da67ed9c30da0367806e46d48cf066f04096b156 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 6 Aug 2013 05:12:19 +1000 Subject: [PATCH] Hide useless stats from the scoreboard --- qcsrc/common/mapinfo.qh | 2 +- qcsrc/server/mutators/gamemode_invasion.qc | 17 +++++++++++------ qcsrc/server/mutators/gamemode_invasion.qh | 1 - 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh index 7eaaf29001..f59fd2c243 100644 --- a/qcsrc/common/mapinfo.qh +++ b/qcsrc/common/mapinfo.qh @@ -78,7 +78,7 @@ REGISTER_GAMETYPE(_("Freeze Tag"),ft,g_freezetag,FREEZETAG,"timelimit=20 pointli REGISTER_GAMETYPE(_("Keepaway"),ka,g_keepaway,KEEPAWAY,"timelimit=20 pointlimit=30") #define g_keepaway IS_GAMETYPE(KEEPAWAY) -REGISTER_GAMETYPE(_("Invasion"),invasion,g_invasion,INVASION,"timelimit=20 pointlimit=30") +REGISTER_GAMETYPE(_("Invasion"),invasion,g_invasion,INVASION,"pointlimit=5") #define g_invasion IS_GAMETYPE(INVASION) float MAPINFO_FEATURE_WEAPONS = 1; // not defined for minstagib-only maps diff --git a/qcsrc/server/mutators/gamemode_invasion.qc b/qcsrc/server/mutators/gamemode_invasion.qc index ca0b201ae5..280454c281 100644 --- a/qcsrc/server/mutators/gamemode_invasion.qc +++ b/qcsrc/server/mutators/gamemode_invasion.qc @@ -107,7 +107,7 @@ float Invasion_CheckWinner() FOR_EACH_PLAYER(head) { - float cs = PlayerScore_Add(head, SP_INVASION_KILLS, 0); + float cs = PlayerScore_Add(head, SP_KILLS, 0); if(cs > winning_score) { winning_score = cs; @@ -151,7 +151,7 @@ void Invasion_RoundStart() else maxspawned = autocvar_g_invasion_monster_count; - monster_skill += 0.01 * numplayers; + monster_skill += 0.1 * numplayers; } MUTATOR_HOOKFUNCTION(invasion_MonsterDies) @@ -159,7 +159,7 @@ MUTATOR_HOOKFUNCTION(invasion_MonsterDies) numkilled += 1; if(IS_PLAYER(frag_attacker)) - PlayerScore_Add(frag_attacker, SP_INVASION_KILLS, +1); + PlayerScore_Add(frag_attacker, SP_KILLS, +1); return FALSE; } @@ -222,6 +222,7 @@ MUTATOR_HOOKFUNCTION(invasion_PlayerCommand) sprint(self, strcat("roundcnt = ", ftos(roundcnt), "\n")); sprint(self, strcat("monsters_total = ", ftos(monsters_total), "\n")); sprint(self, strcat("monsters_killed = ", ftos(monsters_killed), "\n")); + sprint(self, strcat("monster_skill = ", ftos(monster_skill), "\n")); return TRUE; } @@ -231,21 +232,25 @@ MUTATOR_HOOKFUNCTION(invasion_PlayerCommand) void invasion_ScoreRules() { - ScoreRules_basics(0, SFL_SORT_PRIO_SECONDARY, 0, FALSE); - ScoreInfo_SetLabel_PlayerScore(SP_INVASION_KILLS, "kills", SFL_SORT_PRIO_PRIMARY); + ScoreRules_basics(0, 0, 0, FALSE); + ScoreInfo_SetLabel_PlayerScore(SP_KILLS, "frags", SFL_SORT_PRIO_PRIMARY); ScoreRules_basics_end(); } void invasion_Initialize() { + independent_players = 1; // to disable extra useless scores + invasion_ScoreRules(); + + independent_players = 0; round_handler_Spawn(Invasion_CheckPlayers, Invasion_CheckWinner, Invasion_RoundStart); round_handler_Init(5, autocvar_g_invasion_warmup, autocvar_g_invasion_round_timelimit); allowed_to_spawn = TRUE; - monster_skill = 0; + monster_skill = 0.5; roundcnt = 0; } diff --git a/qcsrc/server/mutators/gamemode_invasion.qh b/qcsrc/server/mutators/gamemode_invasion.qh index 4a327ae87a..9c93439062 100644 --- a/qcsrc/server/mutators/gamemode_invasion.qh +++ b/qcsrc/server/mutators/gamemode_invasion.qh @@ -5,4 +5,3 @@ float maxrounds; float numkilled; float last_check; -#define SP_INVASION_KILLS 0 -- 2.39.2