Commit 3c51b1dd authored by Samual's avatar Samual

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

parent 5ebfb62f
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
......
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
......
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
......
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
......@@ -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;
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment