Keep only one CTFscoring

diff --git a/data/ctfscoring-ai.cfg b/data/ctfscoring-ai.cfg
deleted file mode 100644 (file)
index a836e47..0000000
--- a/data/ctfscoring-ai.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-set g_ctf_flagscore_pickup_base                   1\r
-set g_ctf_flagscore_pickup_dropped_early          0\r
-set g_ctf_flagscore_pickup_dropped_late           1\r
-set g_ctf_flagscore_capture                      20\r
-set g_ctf_flagscore_kill                          2\r
-set g_ctf_flagpenalty_drop                        0\r
-set g_ctf_flagpenalty_suicidedrop                 1\r
-set g_ctf_flagpenalty_returned                    0\r
-set g_ctf_flagscore_return                        3\r
-set g_ctf_flagscore_return_rogue                  3\r
-set g_ctf_flagscore_return_by_killer              5\r
-set g_ctf_flagscore_return_rogue_by_killer        5\r
-\r
-// succeeded capture (pickup capture)            21 (0 for enemy)\r
-// failed capture (pickup kill drop return)       1 (8 for enemy)\r
-// failed (shot into void) (pickup kill drop)     1 (2 for enemy)\r
-// capture retry (kill drop pickup)               0..1 (2 for enemy)\r
-// suicide, then retake (suicidedrop pickup)     -1 (0 for enemy)\r
-\r
-set g_ctf_personalscore_pickup_base                   1\r
-set g_ctf_personalscore_pickup_dropped_early          0\r
-set g_ctf_personalscore_pickup_dropped_late           1\r
-set g_ctf_personalscore_capture                      20\r
-set g_ctf_personalscore_kill                          5\r
-set g_ctf_personalpenalty_drop                        0\r
-set g_ctf_personalpenalty_suicidedrop                 1\r
-set g_ctf_personalpenalty_returned                    1\r
-set g_ctf_personalscore_return                        5\r
-set g_ctf_personalscore_return_rogue                  3\r
-set g_ctf_personalscore_return_by_killer              5\r
-set g_ctf_personalscore_return_rogue_by_killer        5\r
-// AWIN = 21\r
-// AFAIL = 0\r
-// AFAILVOID = 1\r
-// DWIN = 10\r
-// ARETRY = -1..0\r
-// DRETRY = 5\r
-// ATAKE = 1\r

diff --git a/data/ctfscoring-alien.cfg b/data/ctfscoring-alien.cfg
deleted file mode 100644 (file)
index 3de92aa..0000000
--- a/data/ctfscoring-alien.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-set g_ctf_flagscore_pickup_base                   1\r
-set g_ctf_flagscore_pickup_dropped_early          1\r
-set g_ctf_flagscore_pickup_dropped_late           1\r
-set g_ctf_flagscore_capture                      30\r
-set g_ctf_flagscore_kill                          1\r
-set g_ctf_flagpenalty_drop                        2\r
-set g_ctf_flagpenalty_suicidedrop                 2\r
-set g_ctf_flagpenalty_returned                    0\r
-set g_ctf_flagscore_return                        5\r
-set g_ctf_flagscore_return_rogue                 10\r
-set g_ctf_flagscore_return_by_killer              6\r
-set g_ctf_flagscore_return_rogue_by_killer       11\r
-// succeeded capture (pickup capture)            31 (0 for enemy)\r
-// failed capture (pickup kill drop return)      -1 (6 or 7 for enemy)\r
-// failed (shot into void) (pickup kill drop)     1 (1 for enemy)\r
-// capture retry (kill drop pickup)              -1 (1 for enemy)\r
-// suicide, then retake (suicidedrop pickup)     -1 (0 for enemy)\r
-\r
-set g_ctf_personalscore_pickup_base                   1\r
-set g_ctf_personalscore_pickup_dropped_early          1\r
-set g_ctf_personalscore_pickup_dropped_late           1\r
-set g_ctf_personalscore_capture                      30\r
-set g_ctf_personalscore_kill                          1\r
-set g_ctf_personalpenalty_drop                        2\r
-set g_ctf_personalpenalty_suicidedrop                 2\r
-set g_ctf_personalpenalty_returned                    0\r
-set g_ctf_personalscore_return                        5\r
-set g_ctf_personalscore_return_rogue                 10\r
-set g_ctf_personalscore_return_by_killer              6\r
-set g_ctf_personalscore_return_rogue_by_killer       11\r
-// AWIN = 31\r
-// AFAIL = -1\r
-// AFAILVOID = 1\r
-// DWIN = 6..7\r
-// ARETRY = -1\r
-// DRETRY = 1\r
-// ATAKE = 1\r

diff --git a/data/ctfscoring-alpha.cfg b/data/ctfscoring-alpha.cfg
deleted file mode 100644 (file)
index 790fc97..0000000
--- a/data/ctfscoring-alpha.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-set g_ctf_flagscore_pickup_base                   0\r
-set g_ctf_flagscore_pickup_dropped_early          0\r
-set g_ctf_flagscore_pickup_dropped_late           0\r
-set g_ctf_flagscore_capture                      20\r
-set g_ctf_flagscore_kill                          0\r
-set g_ctf_flagpenalty_drop                        0\r
-set g_ctf_flagpenalty_suicidedrop                 0\r
-set g_ctf_flagpenalty_returned                    0\r
-set g_ctf_flagscore_return                        5\r
-set g_ctf_flagscore_return_rogue                 10\r
-set g_ctf_flagscore_return_by_killer              5\r
-set g_ctf_flagscore_return_rogue_by_killer       10\r
-// succeeded capture (pickup capture)            20 (0 for enemy)\r
-// failed capture (pickup kill drop return)       0 (5 for enemy)\r
-// failed (shot into void) (pickup kill drop)     0 (0 for enemy)\r
-// capture retry (kill drop pickup)               0 (0 for enemy)\r
-// suicide, then retake (suicidedrop pickup)      0 (0 for enemy)\r
-\r
-set g_ctf_personalscore_pickup_base                   0\r
-set g_ctf_personalscore_pickup_dropped_early          0\r
-set g_ctf_personalscore_pickup_dropped_late           0\r
-set g_ctf_personalscore_capture                      20\r
-set g_ctf_personalscore_kill                          0\r
-set g_ctf_personalpenalty_drop                        0\r
-set g_ctf_personalpenalty_suicidedrop                 0\r
-set g_ctf_personalpenalty_returned                    0\r
-set g_ctf_personalscore_return                        5\r
-set g_ctf_personalscore_return_rogue                 10\r
-set g_ctf_personalscore_return_by_killer              5\r
-set g_ctf_personalscore_return_rogue_by_killer       10\r
-// AWIN = 20\r
-// AFAIL = 0\r
-// AFAILVOID = 0\r
-// DWIN = 5\r
-// ARETRY = 0\r
-// DRETRY = 0\r
-// ATAKE = 0\r

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

diff --git a/data/ctfscoring-nex242.cfg b/data/ctfscoring-nex242.cfg
deleted file mode 100644 (file)
index 7d8007c..0000000
--- a/data/ctfscoring-nex242.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-set g_ctf_flagscore_pickup_base                   1\r
-set g_ctf_flagscore_pickup_dropped_early          1\r
-set g_ctf_flagscore_pickup_dropped_late           1\r
-set g_ctf_flagscore_capture                      20\r
-set g_ctf_flagscore_kill                          1\r
-set g_ctf_flagpenalty_drop                        0\r
-set g_ctf_flagpenalty_suicidedrop                 1\r
-set g_ctf_flagpenalty_returned                    0\r
-set g_ctf_flagscore_return                        5\r
-set g_ctf_flagscore_return_rogue                 10\r
-set g_ctf_flagscore_return_by_killer              5\r
-set g_ctf_flagscore_return_rogue_by_killer       10\r
-// succeeded capture (pickup capture)            21 (0 for enemy)\r
-// failed capture (pickup kill drop return)       1 (6 for enemy)\r
-// failed (shot into void) (pickup kill drop)     1 (1 for enemy)\r
-// capture retry (kill drop pickup)               1 (1 for enemy)\r
-// suicide, then retake (suicidedrop pickup)      0 (0 for enemy)\r
-\r
-set g_ctf_personalscore_pickup_base                   1\r
-set g_ctf_personalscore_pickup_dropped_early          1\r
-set g_ctf_personalscore_pickup_dropped_late           1\r
-set g_ctf_personalscore_capture                      20\r
-set g_ctf_personalscore_kill                          1\r
-set g_ctf_personalpenalty_drop                        0\r
-set g_ctf_personalpenalty_suicidedrop                 1\r
-set g_ctf_personalpenalty_returned                    0\r
-set g_ctf_personalscore_return                        5\r
-set g_ctf_personalscore_return_rogue                 10\r
-set g_ctf_personalscore_return_by_killer              5\r
-set g_ctf_personalscore_return_rogue_by_killer       10\r
-// AWIN = 21\r
-// AFAIL = 1\r
-// AFAILVOID = 1\r
-// DWIN = 6\r
-// ARETRY = 1\r
-// DRETRY = 1\r
-// ATAKE = 1\r

diff --git a/data/ctfscoring-z-lowdeposit.cfg b/data/ctfscoring-z-lowdeposit.cfg
deleted file mode 100644 (file)
index f1d33c7..0000000
--- a/data/ctfscoring-z-lowdeposit.cfg
+++ /dev/null
@@ -1,21 +0,0 @@
-exec ctfscoring-ai.cfg // fall back to ai's scoring for flag scores, if g_ctf_win_mode is 2, as this system is highly broken in that mode\r
-\r
-set g_ctf_personalscore_pickup_base                  -1\r
-set g_ctf_personalscore_pickup_dropped_early          5\r
-set g_ctf_personalscore_pickup_dropped_late           9\r
-set g_ctf_personalscore_capture                      26\r
-set g_ctf_personalscore_kill                          5\r
-set g_ctf_personalpenalty_drop                        9\r
-set g_ctf_personalpenalty_suicidedrop                 9\r
-set g_ctf_personalpenalty_returned                    0\r
-set g_ctf_personalscore_return                        3\r
-set g_ctf_personalscore_return_rogue                 10\r
-set g_ctf_personalscore_return_by_killer              3\r
-set g_ctf_personalscore_return_rogue_by_killer       10\r
-// AWIN = 25\r
-// AFAIL = -10\r
-// AFAILVOID = -10\r
-// DWIN = 8\r
-// ARETRY = -1..-4\r
-// DRETRY = 5\r
-// ATAKE = -1\r

diff --git a/data/ctfscoring-z.cfg b/data/ctfscoring-z.cfg
deleted file mode 100644 (file)
index e1585cf..0000000
--- a/data/ctfscoring-z.cfg
+++ /dev/null
@@ -1,21 +0,0 @@
-exec ctfscoring-ai.cfg // fall back to ai's scoring for flag scores, if g_ctf_win_mode is 2, as this system is highly broken in that mode\r
-\r
-set g_ctf_personalscore_pickup_base                  -5\r
-set g_ctf_personalscore_pickup_dropped_early          1\r
-set g_ctf_personalscore_pickup_dropped_late           5\r
-set g_ctf_personalscore_capture                      30\r
-set g_ctf_personalscore_kill                          5\r
-set g_ctf_personalpenalty_drop                        5\r
-set g_ctf_personalpenalty_suicidedrop                 5\r
-set g_ctf_personalpenalty_returned                    0\r
-set g_ctf_personalscore_return                        3\r
-set g_ctf_personalscore_return_rogue                 10\r
-set g_ctf_personalscore_return_by_killer              3\r
-set g_ctf_personalscore_return_rogue_by_killer       10\r
-// AWIN = 25\r
-// AFAIL = -10\r
-// AFAILVOID = -10\r
-// DWIN = 8\r
-// ARETRY = -1..-4\r
-// DRETRY = 5\r
-// ATAKE = -5\r

diff --git a/data/ctfscoring.cfg b/data/ctfscoring.cfg
new file mode 100644 (file)
index 0000000..a836e47
--- /dev/null
+++ b/data/ctfscoring.cfg
@@ -0,0 +1,38 @@
+set g_ctf_flagscore_pickup_base                   1\r
+set g_ctf_flagscore_pickup_dropped_early          0\r
+set g_ctf_flagscore_pickup_dropped_late           1\r
+set g_ctf_flagscore_capture                      20\r
+set g_ctf_flagscore_kill                          2\r
+set g_ctf_flagpenalty_drop                        0\r
+set g_ctf_flagpenalty_suicidedrop                 1\r
+set g_ctf_flagpenalty_returned                    0\r
+set g_ctf_flagscore_return                        3\r
+set g_ctf_flagscore_return_rogue                  3\r
+set g_ctf_flagscore_return_by_killer              5\r
+set g_ctf_flagscore_return_rogue_by_killer        5\r
+\r
+// succeeded capture (pickup capture)            21 (0 for enemy)\r
+// failed capture (pickup kill drop return)       1 (8 for enemy)\r
+// failed (shot into void) (pickup kill drop)     1 (2 for enemy)\r
+// capture retry (kill drop pickup)               0..1 (2 for enemy)\r
+// suicide, then retake (suicidedrop pickup)     -1 (0 for enemy)\r
+\r
+set g_ctf_personalscore_pickup_base                   1\r
+set g_ctf_personalscore_pickup_dropped_early          0\r
+set g_ctf_personalscore_pickup_dropped_late           1\r
+set g_ctf_personalscore_capture                      20\r
+set g_ctf_personalscore_kill                          5\r
+set g_ctf_personalpenalty_drop                        0\r
+set g_ctf_personalpenalty_suicidedrop                 1\r
+set g_ctf_personalpenalty_returned                    1\r
+set g_ctf_personalscore_return                        5\r
+set g_ctf_personalscore_return_rogue                  3\r
+set g_ctf_personalscore_return_by_killer              5\r
+set g_ctf_personalscore_return_rogue_by_killer        5\r
+// AWIN = 21\r
+// AFAIL = 0\r
+// AFAILVOID = 1\r
+// DWIN = 10\r
+// ARETRY = -1..0\r
+// DRETRY = 5\r
+// ATAKE = 1\r

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index e7527d46a337e65ce813e8d515cbc30e4f85216b..cb62710a252a9089e294af063db708ef60f079ff 100644 (file)
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -547,7 +547,7 @@ set g_ctf_flag_pickup_effects 1
 set g_ctf_flag_capture_effects 1\r
 set g_ctf_captimerecord_always 0 "if enabled, assisted CTF records (with other players on the server) are recorded too"\r
 \r
-exec ctfscoring-ai.cfg\r
+exec ctfscoring.cfg\r
 \r
 // domination\r
 seta g_domination                      0 "Domination: capture and hold control points to gain points"\r