From: Mario <mario@smbclan.net>
Date: Fri, 3 Mar 2017 14:28:35 +0000 (+1000)
Subject: Add a field to control the number of captures a flag is worth (some nutty maps may... 
X-Git-Tag: xonotic-v0.8.2~154
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fc085ae494751c44e76760b3c65612830b9cb196;p=xonotic%2Fxonotic-data.pk3dir.git

Add a field to control the number of captures a flag is worth (some nutty maps may be coming)
---

diff --git a/qcsrc/server/mutators/mutator/gamemode_ctf.qc b/qcsrc/server/mutators/mutator/gamemode_ctf.qc
index d19f52567..5c8b78cd9 100644
--- a/qcsrc/server/mutators/mutator/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_ctf.qc
@@ -597,7 +597,7 @@ void ctf_Handle_Capture(entity flag, entity toucher, int capturetype)
 
 	// scoring
 	PlayerTeamScore_AddScore(player, ((enemy_flag.score_capture) ? enemy_flag.score_capture : autocvar_g_ctf_score_capture));
-	PlayerTeamScore_Add(player, SP_CTF_CAPS, ST_CTF_CAPS, 1);
+	PlayerTeamScore_Add(player, SP_CTF_CAPS, ST_CTF_CAPS, ((enemy_flag.score_team_capture) ? enemy_flag.score_team_capture : 1));
 
 	old_time = PlayerScore_Add(player, SP_CTF_CAPTIME, 0);
 	new_time = TIME_ENCODE(time - enemy_flag.ctf_pickuptime);
diff --git a/qcsrc/server/mutators/mutator/gamemode_ctf.qh b/qcsrc/server/mutators/mutator/gamemode_ctf.qh
index 098a0addd..6dd5110fd 100644
--- a/qcsrc/server/mutators/mutator/gamemode_ctf.qh
+++ b/qcsrc/server/mutators/mutator/gamemode_ctf.qh
@@ -54,6 +54,7 @@ const float VEHICLE_FLAG_SCALE = 1.0;
 .float score_drop; // note: negated
 .float score_pickup;
 .float score_return;
+.float score_team_capture; // shouldn't be too high
 
 // effects
 .string toucheffect;