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

diff --git a/ctfscoring-ai.cfg b/ctfscoring-ai.cfg
index 2ba30450e21697d2377b2b6d9dfc469f134b98ae..284aff7c5b00ce286893dea912bffc3fcb718d28 100644 (file)
--- 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 8af8a23a108dfc7c52fd48b7246056fc3e0193a9..f361d189523a5a5a894b7f9080ed8794ac8fa545 100644 (file)
--- 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 78d5b52409aaea7d7d957f718a713971122f8010..7461dffc003347e7ba5da83b0e2273fbe8d8476a 100644 (file)
--- 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 2ba30450e21697d2377b2b6d9dfc469f134b98ae..9bc87c2c5ce987a09f0a7259fb84a36230bcb9cc 100644 (file)
--- 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 4477fe1f3763b30e151e89ec733ab6d9aa3bc32f..b5d3708432ff3607987239db3f95a1fbefb6723b 100644 (file)
--- 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 4d9167066d8a7c9e348b9c7788318f8276067d53..15e62c5b7e9f51a845859ecbd8d361ffa424116b 100644 (file)
--- 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