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

menu updates

Browse Source 
- separate settings menus for console and scoreboard
- some sorting
- "return" command removed

DOCREF return
This commit is contained in:
ac-stef
2017-05-29 00:00:26 +02:00
parent 5e20a2343b
commit 753474c401
14 changed files with 1911 additions and 1692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/favourites.cfg
+1 -1
View File
@@ -41,7 +41,7 @@
// arg1: mapname, arg2: gamemode number, arg3: ping, arg4: minutesremaining, arg5: number of players, arg6: maxclients, arg7: IP, arg8: port, arg9: pongflags
// pongflags is bit-coded: bit 0: passworded, bit 1: banned, bit 2: blacklisted, bit 6: mastermode
offmap = [ (+ 1 (findlist $defaultmaps $arg1)) ]
offmap = [ (+ 1 (findlist $__defaultmaps $arg1)) ]
// basic categories
config/menus.cfg
+89 -62
View File
@@ -1,18 +1,26 @@
// standard menu definitions
newmenu main
//// Main ////
newmenu main
menuitem Multiplayer [ showmenu multiplayer ]
menuitem Singleplayer [ showmenu singleplayer ]
menuitem Settings [ showmenu settings ]
menuitem Settings [ showmenu Settings ]
menuitem Demo [ showmenu [Play demo] ]
menuitem Editing [ showmenu editing ]
menuitem Help [ showmenu help ]
menuitem About [ showmenu about ]
menuitem Quit savequit
// Add maps to the below list to include them in the normal map menu (also for botmaps).
const __defaultmaps [ac_aqueous ac_arabian ac_arctic ac_arid ac_avenue ac_cavern 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_lainio ac_mines ac_outpost ac_power 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]
// Add maps to the below list to include them in the CTF, KTF & TKTF map menu. Maps should contain flags here.
const __ctfmaps [ac_aqueous ac_arabian ac_arid ac_avenue ac_cavern ac_depot ac_desert3 ac_edifice ac_elevation ac_gothic ac_iceroad ac_industrial ac_ingress ac_keller ac_lainio ac_mines ac_outpost ac_power ac_shine ac_stellar ac_sunset ac_swamp ac_terros ac_urban ac_venison ac_werk]
// Start maps.
const genmapitems [
const __genmapitems [
n = (listlen $arg1)
loop i $n [
__listmapname = (at $arg1 $i)
@@ -24,61 +32,101 @@ const genmapitems [
]
]
newmenu maps
// Add maps to the below list to include them in the normal map menu (also for botmaps).
const defaultmaps [ac_aqueous ac_arabian ac_arctic ac_arid ac_avenue ac_cavern 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_lainio ac_mines ac_outpost ac_power 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]
genmapitems $defaultmaps
menuitem [] -1
menuitem [Show all maps...] [ showmenu [all maps] ]
newmenu [all maps]
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.
const ctfmaps [ac_aqueous ac_arabian ac_arid ac_avenue ac_cavern ac_depot ac_desert3 ac_edifice ac_elevation ac_gothic ac_iceroad ac_industrial ac_ingress ac_keller ac_lainio ac_mines ac_outpost ac_power ac_shine ac_stellar ac_sunset ac_swamp ac_terros ac_urban ac_venison ac_werk]
genmapitems $ctfmaps
newmenu maps
__genmapitems $__defaultmaps
menuitem [] -1
menuitem [Show all maps..] [showmenu [all maps]]
menuitem "Show all maps\i\3" [ showmenu [all maps] ]
newmenu maps_flags
__genmapitems $__ctfmaps
menuitem [] -1
menuitem "Show all maps\i\3" [showmenu [all maps]]
//// Main > Play demo ////
newmenu [Play demo]
menudirlist demos dmo "demo $arg1"
newmenu rewind
menuitemtextinput "Go to [min]: " [ (if (checkalias tmp_setmr) [return $tmp_setmr]) ] [ tempalias tmp_setmr $arg1 ]
menuitem "\f2Confirm" [ if (checkalias tmp_setmr) [setmr $tmp_setmr; delalias tmp_setmr] ]
menuitem "" -1
menuitemtextinput "Rewind (negative value to forward) [s]: " [ (if (checkalias tmp_rewind) [return $tmp_rewind]) ] [ tempalias tmp_rewind $arg1 ]
menuitem "\f2Confirm" [ if (checkalias tmp_rewind) [rewind $tmp_rewind; delalias tmp_rewind] ]
menuitem "" -1
menuitem "Cancel" [ delalias tmp_setmr; delalias tmp_rewind ]
//// Watching demo //// (in-game menu that opens when pressing escape while watching a demo)
searchdemo = ""
newmenu [search specific demo]
menudirlist demos dmo "demo $arg1" 0 searchdemo
newmenu [search demo]
menuitemtextinput "Part of demo name or description: " "result $searchdemo" [ searchdemo = $arg1 ]
menuitem "\f2\t\t [ Search demo ]" [ showmenu [search specific demo] ]
// in-game menu that opens when pressing escape while watching a demo.
newmenu [Watching demo]
menuitem "Stop watching demo" stopdemo
menuitem "Restart demo" [ demo $curdemofile ]
menuitem "Rewind demo..." [ showmenu rewind ]
menuitem "Rewind demo\i\3" [ showmenu rewind ]
menuitemtextinput "Custom description: " [ getalias (concatword "demodesc_" $curdemofile) ] [ alias (concatword "demodesc_" $curdemofile) $arg1 ] [] 100
menuitem "" -1
menuitem "Watch other demo" [ stopdemo; closecurmenu; showmenu [Play demo] ]
menuitem "Search demo..." [ showmenu [search demo] ]
menuitem "Search demo\i\3" [ showmenu [search demo] ]
menuitem "" -1
menuitem "\f4Main menu..." [ closecurmenu; showmenu main ]
menuitem "\f4Main menu\i\3" [ closecurmenu; showmenu main ]
menuitem "\f3Quit AssaultCube" savequit
newmenu about
//// Watching demo > rewind ////
newmenu rewind
tempalias __setmr "" ; tempalias __rewind ""
menuitemtextinput "Go to [min]: " [ result $__setmr ] [ __setmr = $arg1 ]
menuitem "\f2Confirm" [ setmr $__setmr ]
menuitem "" -1
menuitemtextinput "Rewind (negative value to forward) [s]: " [ result $__rewind ] [ __rewind = $arg1 ]
menuitem "\f2Confirm" [ rewind $__rewind ]
menuitem "" -1
menuitem "Cancel" 0
//// Watching demo > search demo ////
newmenu [search demo]
alias __searchdemo ""
menuitemtextinput "Part of demo name or description: " "result $__searchdemo" [ __searchdemo = $arg1 ]
menuitem "\f2\t\t [ Search demo ]" [ showmenu [search specific demo] ]
//// Watching demo > search demo > search specific demo ////
newmenu [search specific demo]
menudirlist demos dmo "demo $arg1" 0 __searchdemo
//// Main > Help ////
newmenu help
menuitem "AssaultCube reference" [ showmenu reference ]
menuitem "Search the reference" [ showmenu [Reference search] ]
menuitem "Keyboard controls" [ showmenu Keyboard ]
menuitem "View the FAQ\t\t\t\t\t\t" [ load_faq ; showmenu faq ]
menuheader "" "...for further information/help see the README.\n\f4The readme can be found in the base AssaultCube directory."
//// Main > Help > Reference search ////
newmenu [Reference search]
tempalias __docsearchstring ""
menuitemtextinput "Search reference for: " "result $__docsearchstring" [ __docsearchstring = $arg1 ; showmenu [Reference search results] ]
//// Main > Help > Reference search > Reference search results ////
newmenu [Reference search results]
menuinit [
resetcurmenu
menusynctabstops 1
if (strlen $__docsearchstring) [
menuheader "" (concatword "search results for keyword \f2" $__docsearchstring)
looplist (docfind $__docsearchstring 1) [n l] [
menuitem (concatword "\fs\f1" $n "\fr \t" (getdoc $n 1)) (concatword "saycommand /" $n)
]
] closecurmenu
]
//// Main > Help > FAQ ////
// see opt/faq.cfg
//// Main > About ////
newmenu about
menuitem "AssaultCube Version 1.2" -1
menuitem "" -1
menuitem "AssaultCube is developed by various people around the" -1
@@ -93,39 +141,18 @@ menuitem "AssaultCube is a total-conversion of the CUBE engine" -1
menuitem "by Wouter 'Aardappel' van Oortmerssen, and others:" -1
menuitem "\t\f1http://www.cubeengine.com/" -1
newmenu help
//// Main > Quit ////
menuitem "AssaultCube reference" [ showmenu reference ]
menuitem "Search the reference" [ showmenu [Reference search] ]
menuitem "Keyboard controls" [ showmenu Keyboard ]
menuitem "View the FAQ\t\t\t\t\t\t" [ load_faq ; showmenu faq ]
menuheader "" "...for further information/help see the README.\n\f4The readme can be found in the base AssaultCube directory."
tempalias __docsearchstring ""
newmenu [Reference search]
menuitemtextinput "Search reference for: " "result $__docsearchstring" [ __docsearchstring = $arg1 ; showmenu [Reference search results] ]
newmenu [Reference search results]
menuinit [
resetcurmenu
menusynctabstops 1
if (strlen $__docsearchstring) [
menuheader "" (concatword "search results for keyword \f2" $__docsearchstring)
looplist (docfind $__docsearchstring 1) [n l] [
menuitem (concatword "\fs\f1" $n "\fr \t" (getdoc $n 1)) (concatword "saycommand /" $n)
]
] closecurmenu
]
// Show quit dialog if enabled
newmenu quit
menuitem "Yes, quit now" quit
menuitem "No" [ showmenu [] ]
menuitem "" -1
menuitemcheckbox "Don't ask next time: " [(= $askquit 0)] [askquit = (= $arg1 0)]
// Show quit dialog if enabled
const savequit [ if $askquit [ showmenu quit ] quit ]
// Create additional menus...
exec config/menus_bot.cfg
exec config/menus_edit.cfg
config/menus_bot.cfg
+3 -1
View File
@@ -7,7 +7,7 @@ const genbotmaps [
menuitemmapload $listmapname (concat "tmp_botmap =" $listmapname "; startbotmap")
]
]
genbotmaps $defaultmaps
genbotmaps $__defaultmaps
tempalias tmp_botskill good
tempalias tmp_numbots 1
@@ -67,6 +67,8 @@ const emptymap [
]
]
//// Main > Singleplayer ////
newmenu singleplayer
// teamplay not mature yet
config/menus_edit.cfg
+955 -855
View File
File diff suppressed because it is too large Load Diff
config/menus_licenses.cfg
+4
View File
@@ -100,6 +100,8 @@ tempalias __maplicense_menutext_custom [
tempalias __maplicense_list [cc-by-nc-nd-3.0 cc-by-nc-sa-3.0 public-domain ac-default custom]
//// Main > Editing > Map settings > Select map license ////
newmenu "Select map license"
menuinit [
tempalias __viewlicense $mapinfo_license
@@ -122,6 +124,8 @@ tempalias __rebuildmaplicensemenu [
menuselection (curmenu) (+ 3 (pop n))
]
//// Main > Editing > Map settings > Show map info ////
newmenu "Show map info"
menuinit [
resetcurmenu
config/menus_multiplayer.cfg
+178 -143
View File
@@ -15,20 +15,20 @@ const joinservermenu [
// Common parts of in-game menus
tempalias __ingamemenu_1 [
push t (player1 team)
menuitemtextinput [Nickname: ] "result $curname" [ name $arg1 ]
menuitem [Change weapon...] [ showmenu Weapons ] [ __ingamemenu_showmodel 0 ]
menuitem [Change player skin...] (concat showmenu (at [CLA RVSF] (&b $t 1))) [ __ingamemenu_showmodel 1 ]
menuitem [Change to the enemy team] changeteam [ __ingamemenu_showmodel 0 ]
menuitemtextinput "Nickname: " "result $curname" [ name $arg1 ]
menuitem "Change weapon\i\3" [ showmenu Weapons ] [ __ingamemenu_showmodel 0 ]
menuitem "Change player skin\i\3" (concat showmenu (at [CLA RVSF] (&b $t 1))) [ __ingamemenu_showmodel 1 ]
menuitem "Change to the enemy team" changeteam [ __ingamemenu_showmodel 0 ]
menuitem (concat Change to (at "spectate active" (> $t 1)) mode) spectate
pop t
]
tempalias __ingamemenu_2 [
menuitem [Get additional server information] [ showmenu serverinfo ]
menuitem [Download a demo...] [ listdemos; showmenu [Download demo] ]
menuitem [] -1
menuitem "\f4Main menu..." [ closecurmenu; showmenu main ]
menuitem "\f4Browse servers..." [ closecurmenu; joinservermenu ]
menuitem "Get additional server information" [ showmenu serverinfo ]
menuitem "Download a demo\i\3" [ listdemos; showmenu [Download demo] ]
menuitem "" -1
menuitem "\f4Main menu\i\3" [ closecurmenu; showmenu main ]
menuitem "\f4Browse servers\i\3" [ closecurmenu; joinservermenu ]
menuitem "\f3Disconnect from server" disconnect
menuitem "\f3Quit AssaultCube" savequit
]
@@ -41,93 +41,42 @@ const __ingamemenu_showmodel [
]
]
// Normal in-game menu that opens when pressing escape and connected to a game.
//// In-Game //// (Normal in-game menu that opens when pressing escape and connected to a game.)
newmenu [In-game]
menuinit [
resetcurmenu
__ingamemenu_1
menuitem [] -1
menuitem [Set mode/map...] [ showmenu Gamemode ]
// menuitem "Kick/ban player..." [ showmenu kick/ban ] // only noobish vote abusers use this, if you really want it, just uncomment
menuitem [Ignore/Unignore all...] [ if $ingall [ unignoreall ] [ ignoreall ] ]
menuitem [Adjust teams...] [ showmenu [Team adjustment] ]
menuitem "" -1
menuitem "Set mode/map\i\3" [ showmenu Gamemode ]
// menuitem "Kick/ban player\i\3" [ showmenu kick/ban ] // only noobish vote abusers use this, if you really want it, just uncomment
menuitem "Ignore/Unignore all\i\3" [ if $ingall [ unignoreall ] [ ignoreall ] ]
menuitem "Adjust teams\i\3" [ showmenu [Team adjustment] ]
__ingamemenu_2
]
menuinitselection 13
// In-game menu that opens if when you press escape if you're admin state and connected to a game.
//// In-Game admin //// (In-game menu that opens if when you press escape if you're admin state and connected to a game.)
newmenu [In-game admin]
menuinit [
resetcurmenu
menuitem [Set mode/map...] [ showmenu Gamemode ]
menuitem [Kick/ban player...] [ showmenu kick/ban ]
menuitem [Adjust teams...] [ showmenu [Team adjustment] ]
menuitem [Change mastermode...] [ showmenu Mastermode ]
menuitem [Change the server description...] [ saycommand "/serverdesc " ]
menuitem [Find a players IP address...] [ saycommand "/whois " ]
menuitem [Give admin...] [ showmenu [give admin] ]
menuitem [] -1
menuitem "Set mode/map\i\3" [ showmenu Gamemode ]
menuitem "Kick/ban player\i\3" [ showmenu kick/ban ]
menuitem "Adjust teams\i\3" [ showmenu [Team adjustment] ]
menuitem "Change mastermode\i\3" [ showmenu Mastermode ]
menuitem "Change the server description\i\3" [ saycommand "/serverdesc " ]
menuitem "Find a players IP address\i\3" [ saycommand "/whois " ]
menuitem "Give admin\i\3" [ showmenu [give admin] ]
menuitem "" -1
__ingamemenu_1
__ingamemenu_2
]
menuinitselection 17
// Multiplayer menu only opens through the main menu (when disconnected).
newmenu multiplayer
menuitem [Join a server] joinservermenu
menuitem [Join a LAN server] [ searchlan 2; showallservers 0; showonlyfavourites 0; showmenu server ]
menuitem [Custom connect] [ showmenu [Custom connect] ]
menuitem [Connect as Admin] [ showmenu [Admin connect] ]
menuitem [] -1
menuitem [Force serverlist update] [ updatefrommaster 1; joinservermenu ]
// Fancy custom connect menu.
newmenu [Custom connect]
menuinit [ tempalias cc1 []; tempalias cc2 []; tempalias cc3 [] ] // Resets the aliases
menuitemtextinput "Server IP/DNS: \t\t" [] [ cc1 = $arg1 ] [] 255
menuitemtextinput "Server port (optional): \t" [] [ cc2 = $arg1 ] [] 6
menuitemtextinput "Server password (optional): \t" [] [ cc3 = $arg1 ] [] 128 1
menuitem "" -1
menuitem "\f2\t\t [ Connect ]\t\t\t" [ connect $cc1 $cc2 $cc3 ]
// Connect to a menu as admin.
newmenu [Admin connect]
menuinit [ tempalias acc1 []; tempalias acc2 []; tempalias acc3 []; echo "\f3To use this menu to connect as administrator, you will need to know the admin password for the server." ] // Resets the aliases
menuitemtextinput "Server IP/DNS: \t\t" [] [ acc1 = $arg1 ] [] 255
menuitemtextinput "Server port (optional):\t" [] [ acc2 = $arg1 ] [] 6
menuitemtextinput "Server admin password: \t" [] [ acc3 = $arg1 ] [] 128 1
menuitem "" -1
menuitem "\f2\t\t [ Admin connect ]\t\t" [ connectadmin $acc1 $acc2 $acc3 ]
_kickbanaction = kick
newmenu reason
menuinit [ _kickbanreason = None; if (! (strcmp $_kickbanaction kick)) [ if (! (strcmp $_kickbanaction ban)) [ _kickbanaction = ban ] ] ]
menuitem [intentional TK] [ _kickbanreason = [intentional TK]; showmenu (concat $_kickbanaction player) ]
menuitem [abusive behaviour] [ _kickbanreason = [abusive behaviour]; showmenu (concat $_kickbanaction player) ]
menuitem [bad language] [ _kickbanreason = [bad language]; showmenu (concat $_kickbanaction player) ]
menuitemtextinput [Reason: ] [] [ _kickbanreason = $arg1 ] [] 255
menuitem $_kickbanaction [ showmenu (concat $_kickbanaction player) ]
menuinitselection 2
newmenu kick/ban
menuitem [Kick a player] [ _kickbanaction = kick; showmenu reason ]
menuitem [Ban a player] [ _kickbanaction = ban; showmenu reason ]
//menuitem "Kick a player" [ showmenu "kick player" ]
//menuitem "Ban a player" [ showmenu "ban player" ]
menuitem [Remove all bans] removebans
newmenu [Team adjustment]
menuitem [Initiate shuffleteams] shuffleteams
menuitem [Force a team change] [ showmenu [force team] ]
menuitem [Force yourself to enemy team] forceme
menuitem [Initiate autoteam] [ showmenu Auto-team ]
//// In-Game > Gamemode ////
newmenu Gamemode
menuitem [Team Deathmatch] [ mode 0; showmenu maps ]
menuitem [Deathmatch] [ mode 2; showmenu maps ]
menuitem [Team Survivor] [ mode 4; showmenu maps ]
@@ -143,53 +92,122 @@ menuitem [Last Swiss Standing] [ mode 9; showmenu maps ]
menuitem [One Shot, One Kill] [ mode 10; showmenu maps ]
menuitem [Team One Shot, One Kill] [ mode 11; showmenu maps ]
newmenu Mastermode
//// In-Game > kick/ban ////
newmenu kick/ban
menuitem "Kick a player\i\3" [ _kickbanaction = kick; showmenu reason ]
menuitem "Ban a player\i\3" [ _kickbanaction = ban; showmenu reason ]
//menuitem "Kick a player" [ showmenu "kick player" ]
//menuitem "Ban a player" [ showmenu "ban player" ]
menuitem "Remove all bans" removebans
//// In-Game > kick/ban > reason ////
newmenu reason
tempalias _kickbanaction kick
menuinit [ _kickbanreason = None; if (! (strcmp $_kickbanaction kick)) [ if (! (strcmp $_kickbanaction ban)) [ _kickbanaction = ban ] ] ]
menuitem [intentional TK] [ _kickbanreason = [intentional TK]; showmenu (concat $_kickbanaction player) ]
menuitem [abusive behaviour] [ _kickbanreason = [abusive behaviour]; showmenu (concat $_kickbanaction player) ]
menuitem [bad language] [ _kickbanreason = [bad language]; showmenu (concat $_kickbanaction player) ]
menuitemtextinput [Reason: ] [] [ _kickbanreason = $arg1 ] [] 255
menuitem $_kickbanaction [ showmenu (concat $_kickbanaction player) ]
menuinitselection 2
//// In-Game > kick/ban > reason > kick player ////
//// In-Game > kick/ban > reason > ban player ////
// hardcoded
//// In-Game > Team adjustment ////
newmenu [Team adjustment]
menuitem [Initiate shuffleteams] shuffleteams
menuitem [Force a team change] [ showmenu [force team] ]
menuitem [Force yourself to enemy team] forceme
menuitem [Initiate autoteam] [ showmenu Auto-team ]
//// In-Game > Team adjustment > force team ////
// hardcoded
//// In-Game > Team adjustment > Auto-team ////
newmenu Auto-team
menuitem [Turn auto-team on] [ autoteam 1 ]
menuitem [Turn auto-team off] [ autoteam 0 ]
//// In-Game admin > Mastermode ////
newmenu Mastermode
menuitem [Unlock the server (open)] [ mastermode 0 ]
menuitem [Lock the server (private)] [ mastermode 1 ]
menuitem [Lock the server (match mode)] [ mastermode 2 ]
newmenu Auto-team
//// In-Game admin > give admin ////
// hardcoded
menuitem [Turn auto-team on] [ autoteam 1 ]
menuitem [Turn auto-team off] [ autoteam 0 ]
//// Main > Multiplayer //// (Multiplayer menu only opens through the main menu (when disconnected).)
newmenu multiplayer
menuitem [Join a server] joinservermenu
menuitem [Join a LAN server] [ searchlan 2; showallservers 0; showonlyfavourites 0; showmenu server ]
menuitem [Custom connect] [ showmenu [Custom connect] ]
menuitem [Connect as Admin] [ showmenu [Admin connect] ]
menuitem [] -1
menuitem [Force serverlist update] [ updatefrommaster 1; joinservermenu ]
//// Main > Multiplayer > Custom connect ////
newmenu [Custom connect]
menuinit [ tempalias cc1 []; tempalias cc2 []; tempalias cc3 [] ] // Resets the aliases
menuitemtextinput "Server IP/DNS: \t\t" [] [ cc1 = $arg1 ] [] 255
menuitemtextinput "Server port (optional): \t" [] [ cc2 = $arg1 ] [] 6
menuitemtextinput "Server password (optional): \t" [] [ cc3 = $arg1 ] [] 128 1
menuitem "" -1
menuitem "\f2\t\t [ Connect ]\t\t\t" [ connect $cc1 $cc2 $cc3 ]
//// Main > Multiplayer > Admin connect ////
newmenu [Admin connect]
menuinit [ tempalias acc1 []; tempalias acc2 []; tempalias acc3 []; echo "\f3To use this menu to connect as administrator, you will need to know the admin password for the server." ] // Resets the aliases
menuitemtextinput "Server IP/DNS: \t\t" [] [ acc1 = $arg1 ] [] 255
menuitemtextinput "Server port (optional):\t" [] [ acc2 = $arg1 ] [] 6
menuitemtextinput "Server admin password: \t" [] [ acc3 = $arg1 ] [] 128 1
menuitem "" -1
menuitem "\f2\t\t [ Admin connect ]\t\t" [ connectadmin $acc1 $acc2 $acc3 ]
//// Main > Multiplayer > server ////
// hardcoded
//// Main > Multiplayer > server > serverbrowser help ////
newmenu [serverbrowser help]
menuitem [F1: Display this help menu] -1
menuitem [F3: Search for players by nickname...] [ showmenu [search player] ]
menuitem [Search for servers...] [ showmenu [search server] ]
menuitem [F4: Edit favourites...] [ showmenu [edit favourites] ]
menuitem [F5: Update the serverlist from the masterserver] [ updatefrommaster 1; closecurmenu ]
menuitem [F9: Get additional server information] [ showmenu serverinfo ]
menuitem [Edit alternative views in serverbrowser...] [ showmenu [serverbrowser alternative views] ]
menuitem [] -1
menuitem [Options:] -1
menuitemcheckbox [F6: Reverse the sort order:] "$serversortdir" [ serversortdir $arg1 ]
menuitemcheckbox [F7: Only show good servers:] "$showonlygoodservers" [ showonlygoodservers $arg1 ]
menuitemcheckbox [F8: Show minutes remaining:] "$showminremain" [ showminremain $arg1 ]
menuitemcheckbox [Sort official maps ontop:] "$serversortpreferofficial" [ serversortpreferofficial $arg1 ]
menuitemcheckbox [Use gamemode acronyms:] "$modeacronyms" [ modeacronyms $arg1 ]
menuitemcheckbox [Show number of all players on the servers:] "$showallplayersnumber" [ showallplayersnumber $arg1 ]
menuitem "F1: Display this help menu" -1
menuitem "F3: Search for players by nickname\i\3" [ showmenu [search player] ]
menuitem "Search for servers\i\3" [ showmenu [search server] ]
menuitem "F4: Edit favourites\i\3" [ showmenu [edit favourites] ]
menuitem "F5: Update the serverlist from the masterserver" [ updatefrommaster 1; closecurmenu ]
menuitem "F9: Get additional server information\i\3" [ showmenu serverinfo ]
menuitem "Edit alternative views in serverbrowser\i\3" [ showmenu [serverbrowser alternative views] ]
menuitem "" -1
menuitem "Options:" -1
menuitemcheckbox "F6: Reverse the sort order:" "$serversortdir" [ serversortdir $arg1 ]
menuitemcheckbox "F7: Only show good servers:" "$showonlygoodservers" [ showonlygoodservers $arg1 ]
menuitemcheckbox "F8: Show minutes remaining:" "$showminremain" [ showminremain $arg1 ]
menuitemcheckbox "Sort official maps ontop:" "$serversortpreferofficial" [ serversortpreferofficial $arg1 ]
menuitemcheckbox "Use gamemode acronyms:" "$modeacronyms" [ modeacronyms $arg1 ]
menuitemcheckbox "Show number of all players on the servers:" "$showallplayersnumber" [ showallplayersnumber $arg1 ]
menuitemslider "Favourites tag column:\t" 0 2 "$serverbrowserhidefavtag" 1 ["Show always" "Show when used" "Hide always"] [ serverbrowserhidefavtag $arg1 ]
menuitemslider "Server IP & port:\t\t" 0 2 "$serverbrowserhideip" 1 [Show "Show in grey" Hide] [ serverbrowserhideip $arg1 ]
menuitemslider "Sort servers by:\t\t" 0 7 "$serversort" 1 [Ping "Number of players" "Max players" "Minutes remaining" "Map name" Gamemode "IP address" "Server description"] [ serversort $arg1 ]
menuinitselection 1
// connecting from the serverbrowser to a password-protected server
// called by sbconnect
newmenu [password required]
menuinit [ sbpwd = [] ] // Resets the aliases
menuitemvar [result $sbmsg]
menuitem [You need a password to join it.] -1
menuitem [] -1
menuitemtextinput "Password: \t" [] [ sbpwd = $arg1 ] [] 128 1
menuitem [] -1
menuitem "\f2\t\t [ Connect ]\t\t" [ echo connecting to $sbdesc ; connect $sbdns $sbport $sbpwd ]
menuitem "\f2\t\t [ Connect without password ]\t\t" [ echo connecting to $sbdesc ; connect $sbdns $sbport ]
menuinitselection 3
tempalias addallfavcatmenus [
newmenu [serverbrowser help]
menuitem "" -1
menuitem "Keys to add/remove servers from categories:" -1
loop ii (listlen (listfavcats)) [ addfavcatmenu (at (listfavcats) $ii) ]
addallfavcatmenus = []
]
const addfavcatmenu [
tempalias i (+ 1 (findlist (listfavcats) $arg1))
newmenu [edit favourites]
@@ -202,50 +220,67 @@ const addfavcatmenu [
]
newmenu (concat favourites $i)
menuitemvar ( concatword "concat " "Category name: \f2" (at (listfavcats) (- $i 1)) )
menuitem [] -1
menuitemtextinput [Tag: ] (concatword "result $" sbfavourite_ $arg1 _tag) (concatword sbfavourite_ $arg1 _tag " = $arg1") [] 15
menuitemtextinput [Description: ] (concatword "result $" sbfavourite_ $arg1 _desc) (concatword sbfavourite_ $arg1 _desc " = $arg1") [] 45
menuitem [] -1
menuitemslider [Background red:\t] 0 100 (concatword "$" sbfavourite_ $arg1 _red) 10 [] (concatword sbfavourite_ $arg1 _red " = $arg1")
menuitemslider [Background green:\t] 0 100 (concatword "$" sbfavourite_ $arg1 _green) 10 [] (concatword sbfavourite_ $arg1 _green " = $arg1")
menuitemslider [Background blue:\t] 0 100 (concatword "$" sbfavourite_ $arg1 _blue) 10 [] (concatword sbfavourite_ $arg1 _blue " = $arg1")
menuitemslider [Background alpha:\t] 0 100 (concatword "$" sbfavourite_ $arg1 _alpha) 10 [] (concatword sbfavourite_ $arg1 _alpha " = $arg1")
menuitem [] -1
menuitemtextinput [Keyword list: ] (concatword "result $" sbfavourite_ $arg1 _keys) (concatword sbfavourite_ $arg1 _keys " = $arg1") [] 255
menuitem [] -1
menuitemtextinput [Weight: ] (concatword "result $" sbfavourite_ $arg1 _weight) (concatword sbfavourite_ $arg1 _weight " = $arg1") [] 10
menuitem [] -1
menuitemslider [] 0 1 (concatword "result $" sbfavourite_ $arg1 _ignore) 1 ["Enable this category" "Ignore this category"] (concatword sbfavourite_ $arg1 _ignore " = $arg1")
menuitem [] -1
menuitem [Show servers of this category] (concat showonlyfavourites $i ";showmenu server") [ showonlyfavourites 0 ]
menuitem "" -1
menuitemtextinput "Tag: " (concatword "result $" sbfavourite_ $arg1 _tag) (concatword sbfavourite_ $arg1 _tag " = $arg1") [] 15
menuitemtextinput "Description: " (concatword "result $" sbfavourite_ $arg1 _desc) (concatword sbfavourite_ $arg1 _desc " = $arg1") [] 45
menuitem "" -1
menuitemslider "Background red:\t" 0 100 (concatword "$" sbfavourite_ $arg1 _red) 10 [] (concatword sbfavourite_ $arg1 _red " = $arg1")
menuitemslider "Background green:\t" 0 100 (concatword "$" sbfavourite_ $arg1 _green) 10 [] (concatword sbfavourite_ $arg1 _green " = $arg1")
menuitemslider "Background blue:\t" 0 100 (concatword "$" sbfavourite_ $arg1 _blue) 10 [] (concatword sbfavourite_ $arg1 _blue " = $arg1")
menuitemslider "Background alpha:\t" 0 100 (concatword "$" sbfavourite_ $arg1 _alpha) 10 [] (concatword sbfavourite_ $arg1 _alpha " = $arg1")
menuitem "" -1
menuitemtextinput "Keyword list: " (concatword "result $" sbfavourite_ $arg1 _keys) (concatword sbfavourite_ $arg1 _keys " = $arg1") [] 255
menuitem "" -1
menuitemtextinput "Weight: " (concatword "result $" sbfavourite_ $arg1 _weight) (concatword sbfavourite_ $arg1 _weight " = $arg1") [] 10
menuitem "" -1
menuitemslider "" 0 1 (concatword "result $" sbfavourite_ $arg1 _ignore) 1 ["Enable this category" "Ignore this category"] (concatword sbfavourite_ $arg1 _ignore " = $arg1")
menuitem "" -1
menuitem "Show servers of this category\i\3" (concat showonlyfavourites $i ";showmenu server") [ showonlyfavourites 0 ]
]
const addallfavcatmenus [
newmenu [serverbrowser help]
menuitem [] -1
menuitem [Keys to add/remove servers from categories:] -1
loop ii (listlen (listfavcats)) [ addfavcatmenu (at (listfavcats) $ii) ]
]
//// Main > Multiplayer > server > serverbrowser help > search player ////
lastsearchname = []
newmenu [search player]
menuitemtextinput [Search servers for a player: ] "result $lastsearchname" [ lastsearchname = $arg1 ]
menuitem "\f2\t\t [ Search ]" [ closecurmenu; searchnickname $lastsearchname]
alias __lastsearchname ""
menuitemtextinput "Search servers for a player: " "result $__lastsearchname" [ __lastsearchname = $arg1 ]
menuitem "\f2\t\t [ Search ]" [ closecurmenu; searchnickname $__lastsearchname]
menuinitselection 1
//// Main > Multiplayer > server > serverbrowser help > search server ////
newmenu [search server]
menuitemtextinput [ Search for server: ] "result $sbfavourite_SEARCH_keys" [ sbfavourite_SEARCH_keys = $arg1 ]
menuitemtextinput " Search for server: " "result $sbfavourite_SEARCH_keys" [ sbfavourite_SEARCH_keys = $arg1 ]
menuitem "\f2\t\t[ Search ]" [ showonlyfavourites (addfavcategory SEARCH); showmenu server ] [ showonlyfavourites 0 ]
menuinitselection 1
//// Main > Multiplayer > server > serverbrowser help > edit favourites ////
//// Main > Multiplayer > server > serverbrowser help > serverinfo ////
// hardcoded
//// Main > Multiplayer > server > serverbrowser help > serverbrowser alternative views ////
newmenu [serverbrowser alternative views]
menuitem [Alt + Mouse wheel (Alt + Up/Down) toggles views in serverbrowser.] -1
menuitem [] -1
menuitemtextinput [Categories of favourites in alternative views: ] [getalias serverbrowseraltviews] [alias serverbrowseraltviews $arg1] [] 255
menuitem [(type just names of categories, and not tags).] -1
menuitem "Alt + Mouse wheel (Alt + Up/Down) toggles views in serverbrowser." -1
menuitem "" -1
menuitemtextinput "Categories of favourites in alternative views: " [getalias serverbrowseraltviews] [alias serverbrowseraltviews $arg1] [] 255
menuitem "(type just names of categories, and not tags)." -1
menuinitselection 2
// connecting from the serverbrowser to a password-protected server
// called by sbconnect
newmenu [password required]
menuinit [ sbpwd = [] ] // Resets the aliases
menuitemvar [result $sbmsg]
menuitem [You need a password to join it.] -1
menuitem [] -1
menuitemtextinput "Password: \t" [] [ sbpwd = $arg1 ] [] 128 1
menuitem [] -1
menuitem "\f2\t\t [ Connect ]\t\t" [ echo connecting to $sbdesc ; connect $sbdns $sbport $sbpwd ]
menuitem "\f2\t\t [ Connect without password ]\t\t" [ echo connecting to $sbdesc ; connect $sbdns $sbport ]
menuinitselection 3
newmenu getmap
menuitem [ This server is using a different version of this map...] -1
menuitem [] -1
config/menus_settings.cfg
+663 -613
View File
File diff suppressed because it is too large Load Diff
config/opt/autosave.cfg
+1 -1
View File
@@ -23,7 +23,7 @@ const execAutoSave [
const doAutoSave [
if $autosavemap [
if (&& (! (strstr $defaultmaps (curmap))) (strlen (curmap))) [
if (&& (! (strstr $__defaultmaps (curmap))) (strlen (curmap))) [
if $editing execAutoSave [
if (= $gamemode (modenum coop)) execAutoSave
]
config/opt/faq.cfg
+2 -1
View File
@@ -85,8 +85,9 @@ faqAnswer_8 = [
"http://assault.cubers.net/docs/license.html - AssaultCube Licensing Information"
]
newmenu faq
//// Main > Help > FAQ ////
newmenu faq
loop i (listlen $faqQuestions) [
menuitem (concatword (at ["\f2" "\fD"] (&b $i 1)) (format [#%1: ] (+ $i 1)) (at $faqQuestions $i)) -1
config/opt/parsestring.cfg
+3 -3
View File
@@ -52,8 +52,8 @@ const trimAllUnnecessaryWhitespace [
]
] 1
if (&& (&& (!= $charsbegin -1) (!= $charsend -1)) (!= $charsbegin $charsend)) [
return (substr $strtotrim $charsbegin (- (+ $charsend 1) $charsbegin))
] [ return $strtotrim ]
result (substr $strtotrim $charsbegin (- (+ $charsend 1) $charsbegin))
] [ result $strtotrim ]
]
// trimAllWhitespace - Returns a modified string after removing any whitespace characters from the original.
const trimAllWhitespace [
@@ -64,6 +64,6 @@ const trimAllWhitespace [
trimmedstr = (concatword $trimmedstr $twh)
]
]
return $trimmedstr
result $trimmedstr
]
config/opt/survival.cfg
+3 -3
View File
@@ -23,7 +23,7 @@ looplist [
timeBetChkPts 60000
timeUntilTele 90000
] [ a v ] [ alias $a $v ]
alias survMap (rnd (listlen $defaultmaps))
alias survMap (rnd (listlen $__defaultmaps))
// reset working variables
const survResetAliases [gotCheckPoint lastCheckPoint survIsFinished startedSurvival startedOBCount startPreSurvMillis startSurvMillis survKills survTeleported survTotalDmg survOrigSets backInZone changingspeed changinggamma]
@@ -37,11 +37,11 @@ const survDifList ["6 1 60000 90000 20" "8 2 45000 60000 30" "10 3 30000 45000 4
const survSetDif [if (checkrange $arg1 0 3) [ survDifficulty = $arg1; loop sdl 5 [ (at $survSetsList $sdl) = (at (at $survDifList $survDifficulty) $sdl) ] ] [ sleep 1000 [ echo "\f3Error: \f5invalid difficulty, defaulting to" (genSurvDifStr 0) ] 1; survSetDif 0 ]; nonSurvDefaults = 0 ]
newmenu [Survival Mode]
menuitemslider "Map: " 0 (- (listlen $defaultmaps) 1) "$survMap" 1 [ac_aqueous ac_arabian ac_arctic ac_arid ac_avenue ac_cavern 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_lainio ac_mines ac_outpost ac_power 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] [ survMap = $arg1 ]
menuitemslider "Map: " 0 (- (listlen $__defaultmaps) 1) "$survMap" 1 [ac_aqueous ac_arabian ac_arctic ac_arid ac_avenue ac_cavern 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_lainio ac_mines ac_outpost ac_power 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] [ survMap = $arg1 ]
menuitemslider "Difficulty: " 0 3 "$survDifficulty" 1 [easy intermediate hard impossible] [ survSetDif $arg1 ]
menuitem [] -1
menuitem "\t\t Customize..." [ showmenu [Survival Mode - Customize] ]
menuitem "\t\t\f2 [ Start! ]" [ survival (at $defaultmaps $survMap) ]
menuitem "\t\t\f2 [ Start! ]" [ survival (at $__defaultmaps $survMap) ]
newmenu [Survival Mode - Customize]
menuitemcheckbox "Enable survival damage effects (uses gamespeed/gamma)" "$survDamageEffects" [ survDamageEffects = $arg1 ]
config/resetbinds.cfg
+1 -1
View File
@@ -27,7 +27,7 @@ alias key_prevweapon [ weapon (prevweapon) ]
alias key_pause [ paused (! $paused) ]
alias editkey_editmeta2 [ editmeta2down = 1 ; onrelease [ editmeta2down = 0 ] ]
alias editkey_delete_entity [if $editmeta2down [showmenu "deleted entities" ; menuselection "deleted entities" (- (unlistdeletedentity) 1)] [if $editmetakeydown undelent delent]]
alias editkey_delete_entity [if $editmeta2down [showmenu "Deleted entities" ; menuselection "Deleted entities" (- (unlistdeletedentity) 1)] [if $editmetakeydown undelent delent]]
alias editkey_show_menu [ showmenu editing ]
alias editkey_show_menu_light [ showmenu Lighting ]
alias editkey_equalize_floor [ equalize 0 ]
config/scripts.cfg
+2 -2
View File
@@ -60,10 +60,10 @@ const fullscreentoggle [ fullscreen (! $fullscreen) ]
const editsvar [ inputcommand $$arg1 (concatword "push q (addpunct $cmdbuf) ; " $arg1 " (at $q 0) ; pop q") (concatword "edit " $arg1 :) ]
const editmapmsg [ editsvar mapmsg ]
const editalias [ if (checkalias $arg1) 0 [ alias $arg1 "" ] ; inputcommand $$arg1 (concatword "push q (addpunct $cmdbuf) ; " $arg1 " = (at $q 0) ; pop q") (concatword "edit " $arg1 :) ]
const return [ result $arg1 ]
const run [ push n (concatword "exec config/" $arg1 ".cfg ") ; loop i (- $numargs 1) [ n = (concat $n (getalias (concatword "arg" (+ $i 2)))) ] ; n ; pop n]
const closecurmenu [ closemenu (curmenu) ]
const resetcurmenu [ delmenu (curmenu) ; newmenu (curmenu) ]
const refreshcurmenu [ push __curmenu (curmenu); closecurmenu; showmenu (pop __curmenu) ]
const refreshcurmenudelayed [ push __curmenu (curmenu); closecurmenu; sleep 0 [ showmenu (pop __curmenu) ] ]
// Auto-completions
@@ -287,7 +287,7 @@ const join [ connect $arg1 $arg2 $arg3 ]
const reconnect [ if $numargs [ tempalias svpass $arg1 ] [ tempalias svpass [] ]; if $connected [ tempalias svdata (curserver); afterdisconnect [ connect (at $svdata 0) (at $svdata 1) $svpass ] ] ]
const dlmap [ getmap $arg1 [ sleep 2500 (concat map $arg1) ] ]
const rndmap [ result (at $defaultmaps (rnd (listlen $defaultmaps))) ]
const rndmap [ result (at $__defaultmaps (rnd (listlen $__defaultmaps))) ]
const rrnd [ + (rnd (- $arg2 $arg1)) $arg1 ]
const ++ [ if (checkalias $arg1) [ += $arg1 1 ] ]
source/src/client.cpp
+6 -6
View File
@@ -862,16 +862,18 @@ void shiftgametime(int newmillis)
}
}
void setminutesremaining(int *minutes)
void setminutesremaining(char *minutes)
{
shiftgametime(gametimemaximum - (*minutes)*60000);
if(*minutes) shiftgametime(gametimemaximum - ATOI(minutes) * 60000);
}
COMMANDN(setmr, setminutesremaining, "s");
void rewinddemo(int *seconds)
void rewinddemo(char *seconds)
{
int gamemillis = gametimecurrent+(lastmillis-lastgametimeupdate);
shiftgametime(gamemillis - (*seconds)*1000);
if(*seconds) shiftgametime(gamemillis - ATOI(seconds) * 1000);
}
COMMANDN(rewind, rewinddemo, "s");
COMMAND(sendmap, "s");
COMMAND(getmap, "ss");
@@ -880,6 +882,4 @@ COMMAND(resetsecuremaps, "");
COMMAND(securemap, "s");
COMMAND(getdemo, "is");
COMMAND(listdemos, "");
COMMANDN(setmr, setminutesremaining, "i");
COMMANDN(rewind, rewinddemo, "i");