X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=ctfscoring-div0.cfg;h=f361d189523a5a5a894b7f9080ed8794ac8fa545;hb=361b8d9cd6ba8dd0363b554a38dbed8b3333ee2a;hp=d36d0ad10fe98b24faee9ccbe43382860f4b8585;hpb=0e7ed909bffb4ff21f0c68d163edfc17487e380a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/ctfscoring-div0.cfg b/ctfscoring-div0.cfg
index d36d0ad10..f361d1895 100644
--- a/ctfscoring-div0.cfg
+++ b/ctfscoring-div0.cfg
@@ -1,38 +1,10 @@
-set g_ctf_flagscore_pickup_base                   0
-set g_ctf_flagscore_pickup_dropped_early          1
-set g_ctf_flagscore_pickup_dropped_late           1
-set g_ctf_flagscore_capture                      25
-set g_ctf_flagscore_kill                          3
-set g_ctf_flagpenalty_drop                        2
-set g_ctf_flagpenalty_suicidedrop                 2
-set g_ctf_flagpenalty_returned                    1
-set g_ctf_flagscore_return                        5 // not adjusted as this would suck for team game
-set g_ctf_flagscore_return_rogue                 10
-set g_ctf_flagscore_return_by_killer              5
-set g_ctf_flagscore_return_rogue_by_killer       10
-
-// succeeded capture (pickup capture)            25 (0 for enemy)
-// failed capture (pickup kill drop return)      -3 (8 for enemy)
-// failed (shot into void) (pickup kill drop)    -2 (3 for enemy)
-// capture retry (kill drop pickup)              -1 (3 for enemy)
-// suicide, then retake (suicidedrop pickup)     -1 (0 for enemy)
-
-set g_ctf_personalscore_pickup_base                   0
-set g_ctf_personalscore_pickup_dropped_early          1
-set g_ctf_personalscore_pickup_dropped_late           1
-set g_ctf_personalscore_capture                      25
-set g_ctf_personalscore_kill                          3
-set g_ctf_personalpenalty_drop                        2
-set g_ctf_personalpenalty_suicidedrop                 2
-set g_ctf_personalpenalty_returned                    1
-set g_ctf_personalscore_return                        2 // lowered so it's better if the killer does the return
-set g_ctf_personalscore_return_rogue                 10
-set g_ctf_personalscore_return_by_killer              5
-set g_ctf_personalscore_return_rogue_by_killer       10
-// AWIN = 25
-// AFAIL = -3
-// AFAILVOID = -2
-// DWIN = 8 (5 if someone else returned)
-// ARETRY = -1
-// DRETRY = 3
-// ATAKE = 0
+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_penalty_returned 1
+set g_ctf_score_pickup_base 0
+set g_ctf_score_pickup_dropped_early 1
+set g_ctf_score_pickup_dropped_late 1
+set g_ctf_score_return 2 // lowered so it's better if the killer does the return