From 7693c027d0fe3d8d3194a6f8c270d49abcda1df8 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 19 Nov 2010 23:57:01 -0500 Subject: [PATCH] Almost fully functioning now! Just a couple more things to do and then testing. --- defaultXonotic.cfg | 6 +- models/sprites/ka-ball.tga | Bin 0 -> 131090 bytes models/sprites/ka-ballcarrier.tga | Bin 0 -> 131090 bytes models/sprites/make-sprites.sh | 2 + qcsrc/client/scoreboard.qc | 4 +- qcsrc/server/mutators/gamemode_keepaway.qc | 167 +++++++-------------- qcsrc/server/scores_rules.qc | 11 +- 7 files changed, 69 insertions(+), 121 deletions(-) create mode 100644 models/sprites/ka-ball.tga create mode 100644 models/sprites/ka-ballcarrier.tga diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index d2a47a09ec..41f8adb423 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -606,8 +606,8 @@ set g_cts_respawn_waves 0 set g_cts_respawn_delay 0.25 set g_cts_selfdamage 1 "0 = disable all selfdamage and falldamage in cts" set g_cts_finish_kill_delay 10 "prevent cheating by running back to the start line, and starting out with more speed than otherwise possible" -set g_keepaway_respawn_delay 0 -set g_keepaway_respawn_waves 0 +set g_ka_respawn_delay 0 +set g_ka_respawn_waves 0 // overtime seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit" @@ -1784,6 +1784,7 @@ alias cl_hook_gamestart_as alias cl_hook_gamestart_rc alias cl_hook_gamestart_nexball alias cl_hook_gamestart_cts +alias cl_hook_gamestart_ka alias cl_hook_gameend alias cl_hook_activeweapon @@ -1804,6 +1805,7 @@ alias sv_hook_gamestart_as alias sv_hook_gamestart_rc alias sv_hook_gamestart_nexball alias sv_hook_gamestart_cts +alias sv_hook_gamestart_ka alias sv_hook_gamerestart alias sv_hook_gameend diff --git a/models/sprites/ka-ball.tga b/models/sprites/ka-ball.tga new file mode 100644 index 0000000000000000000000000000000000000000..17b1e6edc16cbbdf77c332ebb86bdf087382dc3d GIT binary patch literal 131090 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