From: MirceaKitsune Date: Mon, 6 Sep 2010 22:59:13 +0000 (+0300) Subject: Keep only one CTFscoring X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7b01e1271f1888a04510a33c04e6981ee093301e;p=voretournament%2Fvoretournament.git Keep only one CTFscoring --- diff --git a/data/ctfscoring-ai.cfg b/data/ctfscoring-ai.cfg deleted file mode 100644 index a836e473..00000000 --- a/data/ctfscoring-ai.cfg +++ /dev/null @@ -1,38 +0,0 @@ -set g_ctf_flagscore_pickup_base 1 -set g_ctf_flagscore_pickup_dropped_early 0 -set g_ctf_flagscore_pickup_dropped_late 1 -set g_ctf_flagscore_capture 20 -set g_ctf_flagscore_kill 2 -set g_ctf_flagpenalty_drop 0 -set g_ctf_flagpenalty_suicidedrop 1 -set g_ctf_flagpenalty_returned 0 -set g_ctf_flagscore_return 3 -set g_ctf_flagscore_return_rogue 3 -set g_ctf_flagscore_return_by_killer 5 -set g_ctf_flagscore_return_rogue_by_killer 5 - -// succeeded capture (pickup capture) 21 (0 for enemy) -// failed capture (pickup kill drop return) 1 (8 for enemy) -// failed (shot into void) (pickup kill drop) 1 (2 for enemy) -// capture retry (kill drop pickup) 0..1 (2 for enemy) -// suicide, then retake (suicidedrop pickup) -1 (0 for enemy) - -set g_ctf_personalscore_pickup_base 1 -set g_ctf_personalscore_pickup_dropped_early 0 -set g_ctf_personalscore_pickup_dropped_late 1 -set g_ctf_personalscore_capture 20 -set g_ctf_personalscore_kill 5 -set g_ctf_personalpenalty_drop 0 -set g_ctf_personalpenalty_suicidedrop 1 -set g_ctf_personalpenalty_returned 1 -set g_ctf_personalscore_return 5 -set g_ctf_personalscore_return_rogue 3 -set g_ctf_personalscore_return_by_killer 5 -set g_ctf_personalscore_return_rogue_by_killer 5 -// AWIN = 21 -// AFAIL = 0 -// AFAILVOID = 1 -// DWIN = 10 -// ARETRY = -1..0 -// DRETRY = 5 -// ATAKE = 1 diff --git a/data/ctfscoring-alien.cfg b/data/ctfscoring-alien.cfg deleted file mode 100644 index 3de92aa1..00000000 --- a/data/ctfscoring-alien.cfg +++ /dev/null @@ -1,37 +0,0 @@ -set g_ctf_flagscore_pickup_base 1 -set g_ctf_flagscore_pickup_dropped_early 1 -set g_ctf_flagscore_pickup_dropped_late 1 -set g_ctf_flagscore_capture 30 -set g_ctf_flagscore_kill 1 -set g_ctf_flagpenalty_drop 2 -set g_ctf_flagpenalty_suicidedrop 2 -set g_ctf_flagpenalty_returned 0 -set g_ctf_flagscore_return 5 -set g_ctf_flagscore_return_rogue 10 -set g_ctf_flagscore_return_by_killer 6 -set g_ctf_flagscore_return_rogue_by_killer 11 -// succeeded capture (pickup capture) 31 (0 for enemy) -// failed capture (pickup kill drop return) -1 (6 or 7 for enemy) -// failed (shot into void) (pickup kill drop) 1 (1 for enemy) -// capture retry (kill drop pickup) -1 (1 for enemy) -// suicide, then retake (suicidedrop pickup) -1 (0 for enemy) - -set g_ctf_personalscore_pickup_base 1 -set g_ctf_personalscore_pickup_dropped_early 1 -set g_ctf_personalscore_pickup_dropped_late 1 -set g_ctf_personalscore_capture 30 -set g_ctf_personalscore_kill 1 -set g_ctf_personalpenalty_drop 2 -set g_ctf_personalpenalty_suicidedrop 2 -set g_ctf_personalpenalty_returned 0 -set g_ctf_personalscore_return 5 -set g_ctf_personalscore_return_rogue 10 -set g_ctf_personalscore_return_by_killer 6 -set g_ctf_personalscore_return_rogue_by_killer 11 -// AWIN = 31 -// AFAIL = -1 -// AFAILVOID = 1 -// DWIN = 6..7 -// ARETRY = -1 -// DRETRY = 1 -// ATAKE = 1 diff --git a/data/ctfscoring-alpha.cfg b/data/ctfscoring-alpha.cfg deleted file mode 100644 index 790fc97a..00000000 --- a/data/ctfscoring-alpha.cfg +++ /dev/null @@ -1,37 +0,0 @@ -set g_ctf_flagscore_pickup_base 0 -set g_ctf_flagscore_pickup_dropped_early 0 -set g_ctf_flagscore_pickup_dropped_late 0 -set g_ctf_flagscore_capture 20 -set g_ctf_flagscore_kill 0 -set g_ctf_flagpenalty_drop 0 -set g_ctf_flagpenalty_suicidedrop 0 -set g_ctf_flagpenalty_returned 0 -set g_ctf_flagscore_return 5 -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) 20 (0 for enemy) -// failed capture (pickup kill drop return) 0 (5 for enemy) -// failed (shot into void) (pickup kill drop) 0 (0 for enemy) -// capture retry (kill drop pickup) 0 (0 for enemy) -// suicide, then retake (suicidedrop pickup) 0 (0 for enemy) - -set g_ctf_personalscore_pickup_base 0 -set g_ctf_personalscore_pickup_dropped_early 0 -set g_ctf_personalscore_pickup_dropped_late 0 -set g_ctf_personalscore_capture 20 -set g_ctf_personalscore_kill 0 -set g_ctf_personalpenalty_drop 0 -set g_ctf_personalpenalty_suicidedrop 0 -set g_ctf_personalpenalty_returned 0 -set g_ctf_personalscore_return 5 -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 = 20 -// AFAIL = 0 -// AFAILVOID = 0 -// DWIN = 5 -// ARETRY = 0 -// DRETRY = 0 -// ATAKE = 0 diff --git a/data/ctfscoring-div0.cfg b/data/ctfscoring-div0.cfg deleted file mode 100644 index c9fcd9b7..00000000 --- a/data/ctfscoring-div0.cfg +++ /dev/null @@ -1,38 +0,0 @@ -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 diff --git a/data/ctfscoring-nex242.cfg b/data/ctfscoring-nex242.cfg deleted file mode 100644 index 7d8007c1..00000000 --- a/data/ctfscoring-nex242.cfg +++ /dev/null @@ -1,37 +0,0 @@ -set g_ctf_flagscore_pickup_base 1 -set g_ctf_flagscore_pickup_dropped_early 1 -set g_ctf_flagscore_pickup_dropped_late 1 -set g_ctf_flagscore_capture 20 -set g_ctf_flagscore_kill 1 -set g_ctf_flagpenalty_drop 0 -set g_ctf_flagpenalty_suicidedrop 1 -set g_ctf_flagpenalty_returned 0 -set g_ctf_flagscore_return 5 -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) 21 (0 for enemy) -// failed capture (pickup kill drop return) 1 (6 for enemy) -// failed (shot into void) (pickup kill drop) 1 (1 for enemy) -// capture retry (kill drop pickup) 1 (1 for enemy) -// suicide, then retake (suicidedrop pickup) 0 (0 for enemy) - -set g_ctf_personalscore_pickup_base 1 -set g_ctf_personalscore_pickup_dropped_early 1 -set g_ctf_personalscore_pickup_dropped_late 1 -set g_ctf_personalscore_capture 20 -set g_ctf_personalscore_kill 1 -set g_ctf_personalpenalty_drop 0 -set g_ctf_personalpenalty_suicidedrop 1 -set g_ctf_personalpenalty_returned 0 -set g_ctf_personalscore_return 5 -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 = 21 -// AFAIL = 1 -// AFAILVOID = 1 -// DWIN = 6 -// ARETRY = 1 -// DRETRY = 1 -// ATAKE = 1 diff --git a/data/ctfscoring-z-lowdeposit.cfg b/data/ctfscoring-z-lowdeposit.cfg deleted file mode 100644 index f1d33c7b..00000000 --- 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 - -set g_ctf_personalscore_pickup_base -1 -set g_ctf_personalscore_pickup_dropped_early 5 -set g_ctf_personalscore_pickup_dropped_late 9 -set g_ctf_personalscore_capture 26 -set g_ctf_personalscore_kill 5 -set g_ctf_personalpenalty_drop 9 -set g_ctf_personalpenalty_suicidedrop 9 -set g_ctf_personalpenalty_returned 0 -set g_ctf_personalscore_return 3 -set g_ctf_personalscore_return_rogue 10 -set g_ctf_personalscore_return_by_killer 3 -set g_ctf_personalscore_return_rogue_by_killer 10 -// AWIN = 25 -// AFAIL = -10 -// AFAILVOID = -10 -// DWIN = 8 -// ARETRY = -1..-4 -// DRETRY = 5 -// ATAKE = -1 diff --git a/data/ctfscoring-z.cfg b/data/ctfscoring-z.cfg deleted file mode 100644 index e1585cf3..00000000 --- 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 - -set g_ctf_personalscore_pickup_base -5 -set g_ctf_personalscore_pickup_dropped_early 1 -set g_ctf_personalscore_pickup_dropped_late 5 -set g_ctf_personalscore_capture 30 -set g_ctf_personalscore_kill 5 -set g_ctf_personalpenalty_drop 5 -set g_ctf_personalpenalty_suicidedrop 5 -set g_ctf_personalpenalty_returned 0 -set g_ctf_personalscore_return 3 -set g_ctf_personalscore_return_rogue 10 -set g_ctf_personalscore_return_by_killer 3 -set g_ctf_personalscore_return_rogue_by_killer 10 -// AWIN = 25 -// AFAIL = -10 -// AFAILVOID = -10 -// DWIN = 8 -// ARETRY = -1..-4 -// DRETRY = 5 -// ATAKE = -5 diff --git a/data/ctfscoring.cfg b/data/ctfscoring.cfg new file mode 100644 index 00000000..a836e473 --- /dev/null +++ b/data/ctfscoring.cfg @@ -0,0 +1,38 @@ +set g_ctf_flagscore_pickup_base 1 +set g_ctf_flagscore_pickup_dropped_early 0 +set g_ctf_flagscore_pickup_dropped_late 1 +set g_ctf_flagscore_capture 20 +set g_ctf_flagscore_kill 2 +set g_ctf_flagpenalty_drop 0 +set g_ctf_flagpenalty_suicidedrop 1 +set g_ctf_flagpenalty_returned 0 +set g_ctf_flagscore_return 3 +set g_ctf_flagscore_return_rogue 3 +set g_ctf_flagscore_return_by_killer 5 +set g_ctf_flagscore_return_rogue_by_killer 5 + +// succeeded capture (pickup capture) 21 (0 for enemy) +// failed capture (pickup kill drop return) 1 (8 for enemy) +// failed (shot into void) (pickup kill drop) 1 (2 for enemy) +// capture retry (kill drop pickup) 0..1 (2 for enemy) +// suicide, then retake (suicidedrop pickup) -1 (0 for enemy) + +set g_ctf_personalscore_pickup_base 1 +set g_ctf_personalscore_pickup_dropped_early 0 +set g_ctf_personalscore_pickup_dropped_late 1 +set g_ctf_personalscore_capture 20 +set g_ctf_personalscore_kill 5 +set g_ctf_personalpenalty_drop 0 +set g_ctf_personalpenalty_suicidedrop 1 +set g_ctf_personalpenalty_returned 1 +set g_ctf_personalscore_return 5 +set g_ctf_personalscore_return_rogue 3 +set g_ctf_personalscore_return_by_killer 5 +set g_ctf_personalscore_return_rogue_by_killer 5 +// AWIN = 21 +// AFAIL = 0 +// AFAILVOID = 1 +// DWIN = 10 +// ARETRY = -1..0 +// DRETRY = 5 +// ATAKE = 1 diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg index e7527d46..cb62710a 100644 --- 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 set g_ctf_captimerecord_always 0 "if enabled, assisted CTF records (with other players on the server) are recorded too" -exec ctfscoring-ai.cfg +exec ctfscoring.cfg // domination seta g_domination 0 "Domination: capture and hold control points to gain points"