From: Samual Date: Sat, 12 Feb 2011 18:32:07 +0000 (-0500) Subject: Remove drops from keepaway - they're redundant with pickups X-Git-Tag: xonotic-v0.5.0~311^2~21^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=df087e3fdb0858fcf7596c027a62389f8e38feae;p=xonotic%2Fxonotic-data.pk3dir.git Remove drops from keepaway - they're redundant with pickups --- diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc index 7fbea0e6b..4edaddc9a 100644 --- a/qcsrc/client/scoreboard.qc +++ b/qcsrc/client/scoreboard.qc @@ -294,7 +294,7 @@ string HUD_DefaultColumnLayout() "+lms/lives +lms/rank ", "+kh/caps +kh/pushes +kh/destroyed ", "?+race/laps ?+race/time ?+race/fastest ", - "+as/objectives +nexball/faults +nexball/goals +ka/drops +ka/pickups +ka/bckills +ka/bctime +freezetag/revivals ", + "+as/objectives +nexball/faults +nexball/goals +ka/pickups +ka/bckills +ka/bctime +freezetag/revivals ", "-lms,race,nexball/score"); } diff --git a/qcsrc/server/mutators/gamemode_keepaway.qc b/qcsrc/server/mutators/gamemode_keepaway.qc index d9eabf0b9..60c39d434 100644 --- a/qcsrc/server/mutators/gamemode_keepaway.qc +++ b/qcsrc/server/mutators/gamemode_keepaway.qc @@ -172,7 +172,7 @@ void ka_DropEvent(entity plyr) // runs any time that a player is supposed to los sound(other, CHAN_AUTO, "keepaway/dropped.wav", VOL_BASE, ATTN_NONE); // ATTN_NONE (it's a sound intended to be heard anywhere) // scoring - PlayerScore_Add(plyr, SP_KEEPAWAY_DROPS, 1); + // PlayerScore_Add(plyr, SP_KEEPAWAY_DROPS, 1); Not anymore, this is 100% the same as pickups and is useless. // waypoints WaypointSprite_Spawn("ka-ball", 0, 0, ball, '0 0 64', world, ball.team, ball, waypointsprite_attachedforcarrier, FALSE); diff --git a/qcsrc/server/scores_rules.qc b/qcsrc/server/scores_rules.qc index aaaed20c4..2e75fefb9 100644 --- a/qcsrc/server/scores_rules.qc +++ b/qcsrc/server/scores_rules.qc @@ -190,14 +190,12 @@ void ScoreRules_nexball(float teams) // Keep Away stuff #define SP_KEEPAWAY_PICKUPS 4 #define SP_KEEPAWAY_CARRIERKILLS 5 -#define SP_KEEPAWAY_DROPS 6 -#define SP_KEEPAWAY_BCTIME 7 +#define SP_KEEPAWAY_BCTIME 6 void ScoreRules_keepaway() { ScoreRules_basics(0, SFL_SORT_PRIO_PRIMARY, 0, TRUE); // SFL_SORT_PRIO_PRIMARY ScoreInfo_SetLabel_PlayerScore(SP_KEEPAWAY_PICKUPS, "pickups", 0); ScoreInfo_SetLabel_PlayerScore(SP_KEEPAWAY_CARRIERKILLS, "bckills", 0); - ScoreInfo_SetLabel_PlayerScore(SP_KEEPAWAY_DROPS, "drops", SFL_LOWER_IS_BETTER); ScoreInfo_SetLabel_PlayerScore(SP_KEEPAWAY_BCTIME, "bctime", SFL_SORT_PRIO_SECONDARY); ScoreRules_basics_end(); }