From ad097d919a380ee42737f876253b68340e9337bf Mon Sep 17 00:00:00 2001 From: FruitieX Date: Wed, 17 Nov 2010 12:13:31 +0200 Subject: [PATCH] fix starting up keepaway for Samual ;). Gamemode still borken, i see no ball --- defaultXonotic.cfg | 10 ++++++++++ qcsrc/common/mapinfo.qc | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 43280aba9..860930e0f 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -604,6 +604,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 // overtime seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit" @@ -1244,6 +1246,14 @@ set g_balance_keyhunt_damageforcescale 1 seta g_keyhunt_teams_override 0 set g_keyhunt_teams 0 +// keepaway +set g_keepaway 0 "Keepaway: w00t" +set g_keepawayball_respawntime 5 +set g_keepawayball_damageforcescale 1 +set g_keepawayball_trail_color "0.2 0.4 1" +seta g_keepaway_teams_override 0 +set g_keepaway_teams 0 + // so it can be stuffcmd-ed still set cl_gravity 800 "but ignored anyway" diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 863862c87..187bf63be 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -661,7 +661,7 @@ float MapInfo_Type_FromString(string t) else if(t == "rc") return MAPINFO_TYPE_RACE; else if(t == "nexball") return MAPINFO_TYPE_NEXBALL; else if(t == "cts") return MAPINFO_TYPE_CTS; - else if(t == "ka") return MAPINFO_TYPE_KEEPAWAY; + else if(t == "keepaway") return MAPINFO_TYPE_KEEPAWAY; else if(t == "all") return MAPINFO_TYPE_ALL; else return 0; } @@ -682,7 +682,7 @@ string MapInfo_Type_ToString(float t) else if(t == MAPINFO_TYPE_RACE) return "rc"; else if(t == MAPINFO_TYPE_NEXBALL) return "nexball"; else if(t == MAPINFO_TYPE_CTS) return "cts"; - else if(t == MAPINFO_TYPE_KEEPAWAY) return "ka"; + else if(t == MAPINFO_TYPE_KEEPAWAY) return "keepaway"; else if(t == MAPINFO_TYPE_ALL) return "all"; else return ""; } -- 2.39.2