Fix balancing with drop penalties; add assist points for previous carriers
authorSamual <samual@xonotic.org>
Thu, 6 Sep 2012 07:00:03 +0000 (03:00 -0400)
committerSamual <samual@xonotic.org>
Thu, 6 Sep 2012 07:00:03 +0000 (03:00 -0400)
ctfscoring-ai.cfg
ctfscoring-div0.cfg
ctfscoring-nex242.cfg
ctfscoring-samual.cfg
qcsrc/server/autocvars.qh
qcsrc/server/mutators/gamemode_ctf.qc

index 2ba3045..284aff7 100644 (file)
@@ -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
index 8af8a23..f361d18 100644 (file)
@@ -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
index 78d5b52..7461dff 100644 (file)
@@ -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
index 2ba3045..9bc87c2 100644 (file)
@@ -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
index 4477fe1..b5d3708 100644 (file)
@@ -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;
index 4d91670..15e62c5 100644 (file)
@@ -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