kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated map/mode menus (issue #387)

Browse Source
This commit is contained in:
flowtron
2021-08-15 17:59:12 +02:00
parent a2d46e4346
commit 782ae314d1
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/menus.cfg
+16 -7
View File
@@ -12,12 +12,15 @@ menuitem Help [ showmenu help ]
menuitem About [ showmenu about ] menuitem About [ showmenu about ]
menuitem "Quit AssaultCube" quit menuitem "Quit AssaultCube" quit
// curated maps per possible gamemodes
// TODO: the engine can determine possible modes on mapload - a clever method needs to include saving known/established lists to avoid reworking them on each client start.
// Add maps to the below list to include them in the normal map menu (also for botmaps). // Add maps to the below list to include them in the normal map menu (also for botmaps). Modes: DM LSS OSOK PF SURV
const __defaultmaps [ac_africa ac_aqueous ac_arabian ac_arctic ac_arctic2 ac_arid ac_avenue ac_coal ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_douze ac_dusk ac_edifice ac_elevation ac_gothic ac_industrial ac_ingress ac_kazemat ac_keller ac_lainio ac_mines ac_nocturne ac_origin ac_outpost ac_power ac_rampart ac_rattrap ac_scaffold ac_shine ac_snow ac_stellar ac_sunset ac_swamp ac_terros ac_toxic ac_urban ac_venison ac_wasteland ac_werk] const __maps_all [ac_africa ac_aqueous ac_arabian ac_arctic ac_arctic2 ac_arid ac_avenue ac_coal ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_douze ac_dusk ac_edifice ac_elevation ac_gothic ac_industrial ac_ingress ac_kazemat ac_keller ac_lainio ac_mines ac_nocturne ac_origin ac_outpost ac_power ac_rampart ac_rattrap ac_scaffold ac_shine ac_snow ac_stellar ac_sunset ac_swamp ac_terros ac_toxic ac_urban ac_venison ac_wasteland ac_werk]
// this list is like maps_all but without ac_douze the support TDM TLSS TOSOK TPF and TSURV
// Add maps to the below list to include them in the CTF, KTF & TKTF map menu. Maps should contain flags here. const __maps_most [ac_africa ac_aqueous ac_arabian ac_arctic ac_arctic2 ac_arid ac_avenue ac_coal ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_dusk ac_edifice ac_elevation ac_gothic ac_industrial ac_ingress ac_kazemat ac_keller ac_lainio ac_mines ac_nocturne ac_origin ac_outpost ac_power ac_rampart ac_rattrap ac_scaffold ac_shine ac_snow ac_stellar ac_sunset ac_swamp ac_terros ac_toxic ac_urban ac_venison ac_wasteland ac_werk]
const __ctfmaps [ac_africa ac_aqueous ac_arabian ac_arctic2 ac_arid ac_avenue ac_coal ac_depot ac_desert3 ac_dusk ac_edifice ac_elevation ac_gothic ac_industrial ac_ingress ac_kazemat ac_keller ac_lainio ac_mines ac_nocturne ac_origin ac_outpost ac_power ac_rampart ac_shine ac_stellar ac_sunset ac_swamp ac_terros ac_urban ac_venison ac_werk] // this list is for maps with flags that support CTF KTF and TKTF
const __maps_flags [ac_africa ac_aqueous ac_arabian ac_arctic2 ac_arid ac_avenue ac_coal ac_depot ac_desert3 ac_dusk ac_edifice ac_elevation ac_gothic ac_industrial ac_ingress ac_kazemat ac_keller ac_lainio ac_mines ac_nocturne ac_origin ac_outpost ac_power ac_rampart ac_shine ac_stellar ac_sunset ac_swamp ac_terros ac_urban ac_venison ac_werk]
// Start maps. // Start maps.
const __genmapitems [ const __genmapitems [
@@ -33,13 +36,19 @@ menurenderoffset -20 0
menudirlist "packages/maps" cgz [map $arg1] menudirlist "packages/maps" cgz [map $arg1]
newmenu maps newmenu maps
__genmapitems $__defaultmaps __genmapitems $__maps_all
menuitem [] -1
menuitem "Show all custom maps\i\3" [showmenu all_custom_maps]
newmenu maps_most
menutitle "maps"
__genmapitems $__maps_most
menuitem [] -1 menuitem [] -1
menuitem "Show all custom maps\i\3" [showmenu all_custom_maps] menuitem "Show all custom maps\i\3" [showmenu all_custom_maps]
newmenu maps_flags newmenu maps_flags
menutitle "maps with flags" menutitle "maps with flags"
__genmapitems $__ctfmaps __genmapitems $__maps_flags
menuitem [] -1 menuitem [] -1
menuitem "Show all custom maps\i\3" [showmenu all_custom_maps] menuitem "Show all custom maps\i\3" [showmenu all_custom_maps]
config/menus_multiplayer.cfg
+6 -6
View File
@@ -96,20 +96,20 @@ menuinitselection 17
//// In-Game > Gamemode //// //// In-Game > Gamemode ////
newmenu Gamemode newmenu Gamemode
menuitem [Team Deathmatch] [ mode 0; showmenu maps ] menuitem [Team Deathmatch] [ mode 0; showmenu maps_most ]
menuitem [Deathmatch] [ mode 2; showmenu maps ] menuitem [Deathmatch] [ mode 2; showmenu maps ]
menuitem [Team Survivor] [ mode 4; showmenu maps ] menuitem [Team Survivor] [ mode 4; showmenu maps_most ]
menuitem [Survivor] [ mode 3; showmenu maps ] menuitem [Survivor] [ mode 3; showmenu maps ]
menuitem [Capture the Flag] [ mode 5; showmenu maps_flags ] menuitem [Capture the Flag] [ mode 5; showmenu maps_flags ]
menuitem [Hunt the Flag] [ mode 13; showmenu maps ] menuitem [Hunt the Flag] [ mode 13; showmenu maps_most ]
menuitem [Keep the Flag] [ mode 15; showmenu maps_flags ] menuitem [Keep the Flag] [ mode 15; showmenu maps_flags ]
menuitem [Team Keep the Flag] [ mode 14; showmenu maps_flags ] menuitem [Team Keep the Flag] [ mode 14; showmenu maps_flags ]
menuitem [Team Pistol Frenzy] [ mode 16; showmenu maps ] menuitem [Team Pistol Frenzy] [ mode 16; showmenu maps_most ]
menuitem [Pistol Frenzy] [ mode 6; showmenu maps ] menuitem [Pistol Frenzy] [ mode 6; showmenu maps ]
menuitem [Team Last Swiss Standing] [ mode 17; showmenu maps ] menuitem [Team Last Swiss Standing] [ mode 17; showmenu maps_most ]
menuitem [Last Swiss Standing] [ mode 9; showmenu maps ] menuitem [Last Swiss Standing] [ mode 9; showmenu maps ]
menuitem [One Shot, One Kill] [ mode 10; showmenu maps ] menuitem [One Shot, One Kill] [ mode 10; showmenu maps ]
menuitem [Team One Shot, One Kill] [ mode 11; showmenu maps ] menuitem [Team One Shot, One Kill] [ mode 11; showmenu maps_most ]
menuitem [Cooperative Editing] [ mode 1; showmenu all_custom_maps ] menuitem [Cooperative Editing] [ mode 1; showmenu all_custom_maps ]
//// In-Game > kick/ban //// //// In-Game > kick/ban ////