From: Samual <samual@xonotic.org>
Date: Thu, 6 Sep 2012 07:00:03 +0000 (-0400)
Subject: Fix balancing with drop penalties; add assist points for previous carriers
X-Git-Tag: xonotic-v0.7.0~240^2~42
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=3c51b1dd5355e80964ac215ab12afb14f671c45e;ds=sidebyside

Fix balancing with drop penalties; add assist points for previous carriers
---

diff --git a/ctfscoring-ai.cfg b/ctfscoring-ai.cfg
index 2ba30450e2..284aff7c5b 100644
--- a/ctfscoring-ai.cfg
+++ b/ctfscoring-ai.cfg
@@ -1,4 +1,5 @@
 set g_ctf_score_capture 20
+set g_ctf_score_capture_assist 0
 set g_ctf_score_kill 5
 set g_ctf_score_penalty_drop 0
 set g_ctf_score_penalty_suicidedrop 1
diff --git a/ctfscoring-div0.cfg b/ctfscoring-div0.cfg
index 8af8a23a10..f361d18952 100644
--- a/ctfscoring-div0.cfg
+++ b/ctfscoring-div0.cfg
@@ -1,4 +1,5 @@
 set g_ctf_score_capture 25
+set g_ctf_score_capture_assist 0
 set g_ctf_score_kill 3
 set g_ctf_score_penalty_drop 2
 set g_ctf_score_penalty_suicidedrop 2
diff --git a/ctfscoring-nex242.cfg b/ctfscoring-nex242.cfg
index 78d5b52409..7461dffc00 100644
--- a/ctfscoring-nex242.cfg
+++ b/ctfscoring-nex242.cfg
@@ -1,4 +1,5 @@
 set g_ctf_score_capture 20
+set g_ctf_score_capture_assist 0
 set g_ctf_score_kill 1
 set g_ctf_score_penalty_drop 0
 set g_ctf_score_penalty_suicidedrop 1
diff --git a/ctfscoring-samual.cfg b/ctfscoring-samual.cfg
index 2ba30450e2..9bc87c2c5c 100644
--- a/ctfscoring-samual.cfg
+++ b/ctfscoring-samual.cfg
@@ -1,9 +1,10 @@
 set g_ctf_score_capture 20
+set g_ctf_score_capture_assist 10
 set g_ctf_score_kill 5
-set g_ctf_score_penalty_drop 0
+set g_ctf_score_penalty_drop 1
 set g_ctf_score_penalty_suicidedrop 1
 set g_ctf_score_penalty_returned 1
 set g_ctf_score_pickup_base 1
-set g_ctf_score_pickup_dropped_early 0
+set g_ctf_score_pickup_dropped_early 1
 set g_ctf_score_pickup_dropped_late 1
-set g_ctf_score_return 5
+set g_ctf_score_return 10
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 4477fe1f37..b5d3708432 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -801,6 +801,7 @@ float autocvar_g_ctf_flagcarrier_waypointforenemy_spotting;
 float autocvar_g_ctf_fullbrightflags;
 float autocvar_g_ctf_ignore_frags;
 float autocvar_g_ctf_score_capture;
+float autocvar_g_ctf_score_capture_assist;
 float autocvar_g_ctf_score_kill;
 float autocvar_g_ctf_score_penalty_drop;
 float autocvar_g_ctf_score_penalty_suicidedrop;
diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 4d9167066d..15e62c5b7e 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -176,7 +176,7 @@ void ctf_Handle_Drop(entity flag, entity player, float droptype)
 	ctf_EventLog("dropped", player.team, player);
 
 	// scoring
-	PlayerTeamScore_AddScore(player, autocvar_g_ctf_score_penalty_drop);	
+	PlayerTeamScore_AddScore(player, -autocvar_g_ctf_score_penalty_drop);	
 	PlayerScore_Add(player, SP_CTF_DROPS, 1);
 	
 	// waypoints
@@ -380,6 +380,7 @@ void ctf_Handle_Capture(entity flag, entity toucher, float capturetype)
 	{
 		WaypointSprite_Kill(player.wps_flagcarrier);
 		if(flag.speedrunning) { ctf_FakeTimeLimit(player, -1); }
+		if(enemy_flag.ctf_dropper) { PlayerTeamScore_AddScore(enemy_flag.ctf_dropper, autocvar_g_ctf_score_capture_assist); }
 	}
 	
 	// reset the flag