Hide useless stats from the scoreboard

diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh
index 7eaaf2900121ee94ae53a588daa1622789e7329f..f59fd2c2431bd8d2dde012dcb998210337c8a4fb 100644 (file)
--- 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 ca0b201ae51cc3dd68cc905ebbf1a8dba2cca0e5..280454c28190c05ab40f106b56310b0b4929070f 100644 (file)
--- 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 4a327ae87a11b8a98b1d41dc0c7164ca72316429..9c934390625295825d232a536c2961eb78fede41 100644 (file)
--- 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