diff --git a/config/menus.cfg b/config/menus.cfg index 517a605a..d8811fa0 100755 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -32,7 +32,7 @@ newmenu maps // Add maps to the below list to include them in the normal map menu (also for botmaps). // Don't add ac_depot_classic to the maps list. -defaultmaps = "ac_aqueous ac_arabian ac_arctic ac_arid ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_douze ac_edifice ac_elevation ac_gothic ac_iceroad ac_industrial ac_ingress ac_keller ac_mines ac_outpost ac_power ac_rattrap ac_scaffold ac_shine ac_snow ac_stellar ac_sunset ac_toxic ac_urban ac_werk" +defaultmaps = "ac_aqueous ac_arabian ac_arctic ac_arid ac_avenue ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_douze ac_edifice ac_elevation ac_gothic ac_iceroad ac_industrial ac_ingress ac_keller ac_mines ac_outpost ac_power ac_rattrap ac_scaffold ac_shine ac_snow ac_stellar ac_sunset ac_toxic ac_urban ac_werk" genmapitems $defaultmaps menuitem "" -1 // the following seems to be of the old-style thoughts of MP - flowtron: 2010may23 says: the different MPs should somehow list themselves though, yes. @@ -45,7 +45,7 @@ menudirlist "packages/maps" "cgz" "map $arg1" newmenu maps_flags // Add maps to the below list to include them in the CTF, KTF & TKTF map menu. Maps should contain flags here. -ctfmaps = "ac_aqueous ac_arabian ac_arid ac_depot ac_desert3 ac_douze ac_edifice ac_elevation ac_gothic ac_iceroad ac_industrial ac_ingress ac_keller ac_mines ac_outpost ac_power ac_shine ac_stellar ac_sunset ac_urban ac_werk" +ctfmaps = "ac_aqueous ac_arabian ac_arid ac_avenue ac_depot ac_desert3 ac_douze ac_edifice ac_elevation ac_gothic ac_iceroad ac_industrial ac_ingress ac_keller ac_mines ac_outpost ac_power ac_shine ac_stellar ac_sunset ac_urban ac_werk" genmapitems $ctfmaps menuitem "" -1 if (&& $mappack_version (listlen $mappack_flagmaps)) [menuitem (concatword "Map-pack (version " $mappack_version ") maps...") [showmenu "mappack flag maps"]]; diff --git a/config/menus_bot.cfg b/config/menus_bot.cfg index b280961a..fc59aeaf 100644 --- a/config/menus_bot.cfg +++ b/config/menus_bot.cfg @@ -110,7 +110,7 @@ survDifList = [ "6 1 60000 90000 20" "8 2 45000 60000 30" "10 3 30000 45000 40" survSetDif = [ if (checkrange $arg1 0 3) [ survDifficulty = $arg1; loop sdl 5 [ (at $survSetsList $sdl) = (at (at $survDifList $survDifficulty) $sdl) ] ] [ sleep 1000 [ echo (c 3)Error: (c 5)invalid difficulty, defaulting to (genSurvDifStr 0) ] 1; survSetDif 0 ]; nonSurvDefaults = 0 ] newmenu "Survival Mode" -menuitemslider "Map: " 0 28 "$survMap" 1 [ "ac_aqueous" "ac_arabian" "ac_arctic" "ac_arid" "ac_complex" "ac_depot" "ac_desert" "ac_desert2" "ac_desert3" "ac_douze" "ac_edifice" "ac_elevation" "ac_gothic" "ac_iceroad" "ac_industrial" "ac_ingress" "ac_keller" "ac_mines" "ac_outpost" "ac_power" "ac_rattrap" "ac_scaffold" "ac_shine" "ac_snow" "ac_stellar" "ac_sunset" "ac_toxic" "ac_urban" "ac_werk" ] [ survMap = $arg1 ] +menuitemslider "Map: " 0 (- (listlen $defaultmaps) 1) "$survMap" 1 [ "ac_aqueous" "ac_arabian" "ac_arctic" "ac_arid" "ac_avenue" "ac_complex" "ac_depot" "ac_desert" "ac_desert2" "ac_desert3" "ac_douze" "ac_edifice" "ac_elevation" "ac_gothic" "ac_iceroad" "ac_industrial" "ac_ingress" "ac_keller" "ac_mines" "ac_outpost" "ac_power" "ac_rattrap" "ac_scaffold" "ac_shine" "ac_snow" "ac_stellar" "ac_sunset" "ac_toxic" "ac_urban" "ac_werk" ] [ survMap = $arg1 ] menuitemslider "Difficulty: " 0 3 "$survDifficulty" 1 [ "easy" "intermediate" "hard" "impossible" ] [ survSetDif $arg1 ] menuitem [] -1 menuitem " Customize" [ showmenu "Survival Mode - Customize" ] diff --git a/config/scripts.cfg b/config/scripts.cfg index 2e08a09c..d5bc5764 100644 --- a/config/scripts.cfg +++ b/config/scripts.cfg @@ -103,7 +103,6 @@ const resetbinds [ run resetbinds; echo (c 3)All binds have been reset to defaul const changeteam [ if (< (curteam) 4) [ team (at "RVSF CLA RVSF-SPECT CLA-SPECT" (curteam)) ] ] - const WEAPONS "KNIFE PISTOL CARBINE SHOTGUN SMG SNIPER AR CPISTOL GRENADES AKIMBO" const NUM_WEAPONS (listlen $WEAPONS) const MODES "tdm coop dm surv ts ctf pf btdm bdm lss osok tosok bosok htf tktf ktf tpf tlss bpf blss bts btosok" diff --git a/config/securemaps.cfg b/config/securemaps.cfg index e246dd13..f904d216 100644 --- a/config/securemaps.cfg +++ b/config/securemaps.cfg @@ -3,6 +3,7 @@ securemap ac_aqueous securemap ac_arabian securemap ac_arctic securemap ac_arid +securemap ac_avenue securemap ac_complex securemap ac_depot securemap ac_depot_classic diff --git a/config/survival.cfg b/config/survival.cfg index c53f4cc1..cc2c6ef2 100644 --- a/config/survival.cfg +++ b/config/survival.cfg @@ -80,6 +80,7 @@ const survOfcZones [ ac_arabian 128 196 93 146 ac_arctic 81 120 137 176 ac_arid 135 155 97 138 + ac_avenue 190 246 33 116 ac_complex 105 150 129 181 ac_depot 137 166 205 262 ac_desert 89 102 129 174 diff --git a/source/src/main.cpp b/source/src/main.cpp index c78b1b2f..7277bfa4 100644 --- a/source/src/main.cpp +++ b/source/src/main.cpp @@ -883,12 +883,12 @@ const char *rndmapname() { // "ac_depot_classic", static const char * const mapnames[] = { - "ac_aqueous", "ac_arabian", "ac_arctic", "ac_arid", "ac_complex", - "ac_depot", "ac_desert", "ac_desert2", "ac_desert3", "ac_douze", - "ac_edifice", "ac_elevation", "ac_gothic", "ac_iceroad", "ac_industrial", - "ac_ingress", "ac_keller", "ac_mines", "ac_outpost", "ac_power", - "ac_rattrap", "ac_scaffold", "ac_shine", "ac_snow", "ac_stellar", - "ac_sunset", "ac_toxic", "ac_urban", "ac_werk", + "ac_aqueous", "ac_arabian", "ac_arctic", "ac_arid", "ac_avenue", + "ac_complex", "ac_depot", "ac_desert", "ac_desert2", "ac_desert3", + "ac_douze", "ac_edifice", "ac_elevation", "ac_gothic", "ac_iceroad", + "ac_industrial", "ac_ingress", "ac_keller", "ac_mines", "ac_outpost", + "ac_power", "ac_rattrap", "ac_scaffold", "ac_shine", "ac_snow", + "ac_stellar", "ac_sunset", "ac_toxic", "ac_urban", "ac_werk", }; int l = sizeof(mapnames)/sizeof(mapnames[0]); int n = rnd(l);