From b2a77186ccc1e4714a8eebf9024df0d2b732cd1c Mon Sep 17 00:00:00 2001 From: Bukz Date: Mon, 4 Feb 2013 03:30:50 +0000 Subject: [PATCH] cleanup/quotes to brackets where feasible Note: This commit effects a lot of configs, be on the look out for little cubescript errors/broken menuitems/etc. and report them ASAP. git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7146 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/autosave.cfg | 2 +- config/compatibility.cfg | 4 +- config/defaults.cfg | 2 +- config/dyngamma.cfg | 4 +- config/faq.cfg | 14 +- config/firstrun.cfg | 2 +- config/mdarray.cfg | 24 +- config/menus.cfg | 110 +++--- config/menus_bot.cfg | 132 +++---- config/menus_edit.cfg | 659 ++++++++++++++++++----------------- config/menus_multiplayer.cfg | 277 ++++++++------- config/menus_settings.cfg | 637 +++++++++++++++++---------------- config/menus_voicecom.cfg | 70 ++-- config/on_quit.cfg | 2 +- config/resetbinds.cfg | 286 +++++++-------- config/scripts.cfg | 2 +- config/survival.cfg | 26 +- 17 files changed, 1124 insertions(+), 1129 deletions(-) diff --git a/config/autosave.cfg b/config/autosave.cfg index 692a00dc..78249fa6 100644 --- a/config/autosave.cfg +++ b/config/autosave.cfg @@ -27,5 +27,5 @@ const doAutoSave [ autoSaveCheck ] -addListOnQuit "autoSaveCheck execAutoSave doAutoSave numAutoSaves oldmapbackups" +addListOnQuit [autoSaveCheck execAutoSave doAutoSave numAutoSaves oldmapbackups] persistidents 1 \ No newline at end of file diff --git a/config/compatibility.cfg b/config/compatibility.cfg index 34dd8f31..da6e3ec1 100644 --- a/config/compatibility.cfg +++ b/config/compatibility.cfg @@ -5,13 +5,13 @@ const currole [ if (&& $numargs (isclient $arg1)) [ result (player $arg1 r const curmode [ result $gamemode ] const getclientmode [ result $gamemode ] const curteam [ if (&& $numargs (isclient $arg1)) [ result (player $arg1 team) ] [ result (player1 team) ] ] -const findpn [ if (isclient $arg1) [ result (player $arg1 name) ] [ result "" ] ] +const findpn [ if (isclient $arg1) [ result (player $arg1 name) ] [ result [] ] ] const isSpect [ if (&& $numargs (isclient $arg1)) [ result (player $arg1 spect) ] [ result (player1 spect) ] ] const pstat_score [ if (isclient $arg1) [ result (concat (player $arg1 flags) (player $arg1 frags) (player $arg1 deaths) (player $arg1 points) (player $arg1 team) (player $arg1 tks) (player $arg1 name)) - ] [ result (concat "0 0 0 0 -1 0" (addpunct)) ] + ] [ result (concat [0 0 0 0 -1 0] (addpunct)) ] ] const orderscorecolumns [ diff --git a/config/defaults.cfg b/config/defaults.cfg index e2b2b3fc..1dfb1294 100644 --- a/config/defaults.cfg +++ b/config/defaults.cfg @@ -17,7 +17,7 @@ setfont default // Choose your font // bind lshift [ grenades ] // bind lalt [ melee ] -ofc_gamma_list = "" +ofc_gamma_list = [] loop ogl (listlen $defaultmaps) [ add2list ofc_gamma_list $gamma ] askquit = 1 diff --git a/config/dyngamma.cfg b/config/dyngamma.cfg index 6ae23512..b5ec933e 100644 --- a/config/dyngamma.cfg +++ b/config/dyngamma.cfg @@ -1,7 +1,7 @@ persistidents 0 // Initialize the list (if it doesn't already exist) using the current gamma as initial values. if (! (checkalias ofc_gamma_list)) [ - ofc_gamma_list = "" + ofc_gamma_list = [] loop ogl (listlen $defaultmaps) [ add2list ofc_gamma_list $gamma ] @@ -13,7 +13,7 @@ const setgamma [ if (&& (<= $arg1 300) (>= $arg1 30)) [ if (strstr $defaultmaps (curmap 1)) [ tmp_gamma_list = $ofc_gamma_list - ofc_gamma_list = "" + ofc_gamma_list = [] cmapp = (findlist $defaultmaps (curmap 1)) // Find the position in the list of the current map loop sgl (listlen $defaultmaps) [ if (= $sgl $cmapp) [ // Add the new gamma at the correct position in the list diff --git a/config/faq.cfg b/config/faq.cfg index 8b187ca2..aea7bd20 100644 --- a/config/faq.cfg +++ b/config/faq.cfg @@ -98,25 +98,25 @@ faqAnswer_9 = [ genFaq = [ loop i (listlen $faqQuestions) [ if (= (mod $i 2) 0) [ - menuitem (concatword (yellow) (format "#%1: " (+ $i 1)) (at $faqQuestions $i)) -1 + menuitem (concatword (yellow) (format [#%1: ] (+ $i 1)) (at $faqQuestions $i)) -1 ] [ - menuitem (concatword (c D) (format "#%1: " (+ $i 1)) (at $faqQuestions $i)) -1 + menuitem (concatword (c D) (format [#%1: ] (+ $i 1)) (at $faqQuestions $i)) -1 ] tmpMenuAlias = (getalias (format faqAnswer_%1 (+ $i 1))) loop o (listlen $tmpMenuAlias) [ if (strstr (at $tmpMenuAlias $o) "http://") [ - menuitem (concatword " " (blue) (at $tmpMenuAlias $o)) -1 + menuitem (concatword [ ] (blue) (at $tmpMenuAlias $o)) -1 ] [ - menuitem (concatword " " (white) (at $tmpMenuAlias $o)) -1 + menuitem (concatword [ ] (white) (at $tmpMenuAlias $o)) -1 ] ] menuitem "" -1 ] ] -newmenu "faq" +newmenu faq genFaq -menuitem "" -1 -menuitem " Close" [ closemenu faq ] +menuitem [] -1 +menuitem [ Close] [ closemenu faq ] persistidents 1 diff --git a/config/firstrun.cfg b/config/firstrun.cfg index 33e31585..b2eb3fc2 100644 --- a/config/firstrun.cfg +++ b/config/firstrun.cfg @@ -10,7 +10,7 @@ delayed_firstrun = [ echo Use the below menu to change some necessary settings... echo "" echo Further help & information can be found in your (concatword (red) README (white) ,) which is inside your AssaultCube directory. - showmenu "QUICK setup" + showmenu [QUICK setup] ] sleep 1000 [ delayed_firstrun ] \ No newline at end of file diff --git a/config/mdarray.cfg b/config/mdarray.cfg index 2ef306b1..c59bd483 100644 --- a/config/mdarray.cfg +++ b/config/mdarray.cfg @@ -31,7 +31,7 @@ getQuotePosition = [ reverseString = [ oldstr = $arg1 - newstr = "" + newstr = [] loop i (strlen $oldstr) [ newstr = (concatword $newstr (substr $oldstr (* (+ $i 1) -1) 1)) ] @@ -40,7 +40,7 @@ reverseString = [ // returns the subarray name of a open bracket position in an existing mdarray extractSubarrayName = [ open_bracket_pos = $arg2 - subarray_name = "" + subarray_name = [] loop d (strlen $arg1) [ tmpchar = (substr $arg1 (- $open_bracket_pos (+ $d 2)) 1) @@ -57,9 +57,9 @@ MDArray_New_Subarray = [ if (= (findlist (getalias $arg1) $arg2) -1) [ add2list $arg1 $arg2 if (islists $arg3) [ - add2list $arg1 (addpunct (concatword " " $arg3 " ") 1) + add2list $arg1 (addpunct (concatword [ ] $arg3 [ ]) 1) ] [ - add2list $arg1 (addpunct (concatword " " (addpunct $arg3) " ") 1) + add2list $arg1 (addpunct (concatword [ ] (addpunct $arg3) [ ]) 1) ] ] ] @@ -102,7 +102,7 @@ MDArray_Get = [ ] // returns a list of all opening bracket "[" positions in an existing mdarray MDArray_Get_All_Opening_Bracket_Positions = [ - o_positions = "" + o_positions = [] loop i (strlen $arg1) [ if (strcmp (substr $arg1 $i 1) "[") [ add2list o_positions $i @@ -119,7 +119,7 @@ MDArray_Get_Subarray_Count = [ // returns a list of all subarray names in an existing mdarray MDArray_Get_All_Subarray_Names = [ opening_brackets = (MDArray_Get_All_Opening_Bracket_Positions (getalias $arg1)) - subarray_names = "" + subarray_names = [] loop r (listlen $opening_brackets) [ add2list subarray_names (extractSubarrayName (getalias $arg1) (at $opening_brackets $r)) @@ -132,7 +132,7 @@ MDArray_Search = [ mdarray = (getalias $arg1) token = $arg2 subarrays = (MDArray_Get_All_Subarray_Names $arg1) - search_results = "" + search_results = [] loop u (listlen $subarrays) [ curarray = (MDArray_Get $arg1 (at $subarrays $u) -1) @@ -150,7 +150,7 @@ MDArray_Delete_Subarray = [ target_subarray = $arg2 target_pos = (strpos $orig_array $target_subarray) gotclose = -1 - delstr = "" + delstr = [] if (!= $target_pos -1) [ loop h (strlen $orig_array) [ @@ -159,7 +159,7 @@ MDArray_Delete_Subarray = [ ] ] delstr = (substr $orig_array $target_pos (- (+ $gotclose 1) $target_pos)) - $arg1 = (strreplace $orig_array $delstr "") + $arg1 = (strreplace $orig_array $delstr []) result (getalias $arg1) ] ] @@ -168,7 +168,7 @@ MDArray_Modify_Subarray = [ original_subarray = (MDArray_Get $arg1 $arg2 -1) target_elem = $arg3 new_elem = $arg4 - new_subarray = "" + new_subarray = [] if (<= (countQuotes $original_subarray) 2) [ original_subarray = (addpunct $original_subarray) @@ -197,9 +197,9 @@ MDArray_Add_To_Subarray = [ if (<= (countQuotes $subarray) 2) [ subarray = (addpunct $subarray) ] if (<= (countQuotes $to_add) 2) [ to_add = (addpunct $to_add) ] MDArray_Delete_Subarray $arg1 $arg2 - MDArray_New_Subarray $arg1 $arg2 (format "%1 %2" $subarray $to_add) + MDArray_New_Subarray $arg1 $arg2 (format [%1 %2] $subarray $to_add) ] ] // some of these aliases can cause issues if they get stored in saved.cfg (missing bracket errors/etc.) -addListOnQuit "bool MDArray_New_Subarray MDArray_Get_Bracket_Positions MDArray_Get reverseString MDArray_Get_All_Opening_Bracket_Positions MDArray_Get_Subarray_Count MDArray_Get_All_Subarray_Names extractSubarrayName MDArray_Search MDArray_Delete_Subarray MDArray_Modify_Subarray original_subarray target_elem new_elem new_subarray j next_elem islists hasQuotePair got_open_quote got_close_quote r i d mdarray subarray firstchar lastchar oldstr newstr subarray_names subarray_name tmpchar token subarrays search_results curarray orig_array target_subarray target_pos gotclose delstr h next_char" +addListOnQuit [bool MDArray_New_Subarray MDArray_Get_Bracket_Positions MDArray_Get reverseString MDArray_Get_All_Opening_Bracket_Positions MDArray_Get_Subarray_Count MDArray_Get_All_Subarray_Names extractSubarrayName MDArray_Search MDArray_Delete_Subarray MDArray_Modify_Subarray original_subarray target_elem new_elem new_subarray j next_elem islists hasQuotePair got_open_quote got_close_quote r i d mdarray subarray firstchar lastchar oldstr newstr subarray_names subarray_name tmpchar token subarrays search_results curarray orig_array target_subarray target_pos gotclose delstr h next_char] diff --git a/config/menus.cfg b/config/menus.cfg index c2880218..07004fcd 100755 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -1,19 +1,19 @@ // check for an installed mappack -mappack_version = 0; mappack_maps = ""; mappack_flagmaps = "" +mappack_version = 0; mappack_maps = []; mappack_flagmaps = [] exec config/menus_mappack.cfg // standard menu definitions newmenu main -menuitem (_ "Multiplayer") [ showmenu multiplayer ] -menuitem (_ "Singleplayer") [ showmenu singleplayer ] -menuitem (_ "Settings") [ showmenu settings ] -menuitem (_ "Demo") [ showmenu "Play demo" ] -menuitem (_ "Editing") [ showmenu editing ] -menuitem (_ "Help") [ showmenu help ] -menuitem (_ "About") [ showmenu about ] -menuitem (_ "Quit") [ savequit ] +menuitem (_ Multiplayer) [ showmenu multiplayer ] +menuitem (_ Singleplayer) [ showmenu singleplayer ] +menuitem (_ Settings) [ showmenu settings ] +menuitem (_ Demo) [ showmenu [Play demo] ] +menuitem (_ Editing) [ showmenu editing ] +menuitem (_ Help) [ showmenu help ] +menuitem (_ About) [ showmenu about ] +menuitem (_ Quit) savequit // Start maps. genmapitems = [ @@ -32,98 +32,98 @@ 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_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_swamp 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_swamp ac_toxic ac_urban ac_werk] genmapitems $defaultmaps -menuitem "" -1 +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. // possibly a not defined internal script-file or we just generate from the know listing, which is well defined, the CGZ files and show them by code. -if (&& $mappack_version (listlen $mappack_maps)) [menuitem (concatword "Map-pack (version " $mappack_version ") maps...") [showmenu "mappack maps"]]; -menuitem "Show all maps..." [ showmenu "all maps" ] +if (&& $mappack_version (listlen $mappack_maps)) [menuitem (concatword "Map-pack (version " $mappack_version ") maps...") [showmenu [mappack maps]]]; +menuitem [Show all maps...] [ showmenu [all maps] ] -newmenu "all maps" -menudirlist "packages/maps" "cgz" "map $arg1" +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. -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_swamp 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_swamp 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"]]; -menuitem "Show all maps.." [showmenu "all maps"] +menuitem [] -1 +if (&& $mappack_version (listlen $mappack_flagmaps)) [menuitem (concatword "Map-pack (version " $mappack_version ") maps...") [showmenu [mappack flag maps]]]; +menuitem [Show all maps..] [showmenu [all maps]] if $mappack_version [ - newmenu "mappack maps" + newmenu [mappack maps] genmapitems $mappack_maps - newmenu "mappack flag maps" + newmenu [mappack flag maps] genmapitems $mappack_flagmaps ] newmenu Demo // If in-game (playing demos isn't needed) -menuitem "Start recording a demo" "recorddemo" -menuitem "Stop recording a demo" "stopdemo" -menuitem "Download demos from the server" [ listdemos; showmenu "Download demo" ] // Lists the demos, then asks which would like to be downloaded. +menuitem [Start recording a demo] recorddemo +menuitem [Stop recording a demo] stopdemo +menuitem [Download demos from the server] [ listdemos; showmenu [Download demo] ] // Lists the demos, then asks which would like to be downloaded. -newmenu "Download demo" +newmenu [Download demo] menuinit [ echo (gray)Choose the demo number you wish to download, as shown below in the console. ] -menuitem " 9 Download the latest demo..." [ getdemo "" ] +menuitem " 9 Download the latest demo..." [ getdemo [] ] menuitem [] -1 -menuitemtextinput "Demo number: " "" [ dldemo = $arg1 ] +menuitemtextinput [Demo number: ] [] [ dldemo = $arg1 ] menuitem " 2 [ Download ] " [ getdemo $dldemo ] -newmenu "Play demo" // If not in-game (recording/downloading demos isn't needed) +newmenu [Play demo] // If not in-game (recording/downloading demos isn't needed) menuinit [ echo To stop demo playback, type: (red)/stopdemo ] -menudirlist "demos" "dmo" "demo $arg1" +menudirlist demos dmo "demo $arg1" // 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 "Watch other demo" [ stopdemo; closemenu "Watching demo"; showmenu "Play demo" ] -menuitem "" -1 -menuitem " 4Main menu..." [ closemenu "Watching demo"; showmenu main ] -menuitem " 3Quit AssaultCube" [ savequit ] +newmenu [Watching demo] +menuitem [Stop watching demo] stopdemo +menuitem [Restart demo] [ demo $curdemofile ] +menuitem [Watch other demo] [ stopdemo; closemenu [Watching demo]; showmenu [Play demo] ] +menuitem [] -1 +menuitem " 4Main menu..." [ closemenu [Watching demo]; showmenu main ] +menuitem " 3Quit AssaultCube" savequit newmenu about menuitem "AssaultCube Version 1.2" -1 -menuitem "" -1 +menuitem [] -1 menuitem "AssaultCube is developed by various people around the" -1 menuitem "world. People that enjoy making this game together." -1 -menuitem "" -1 +menuitem [] -1 menuitem "Thank you to everyone participating to help us make" -1 menuitem "AssaultCube what it is today. To find out the team" -1 menuitem "(Rabid Viper Productions) behind the game, read here:" -1 menuitem " 1http://assault.cubers.net/docs/team.html" -1 -if $mappack_version [ menuitem "" -1 ] -if $mappack_version [ menuitem " ... about your map-pack:" [ showmenu "about mappack" ]]; -menuitem "" -1 +if $mappack_version [ menuitem [] -1 ] +if $mappack_version [ menuitem " ... about your map-pack:" [ showmenu [about mappack] ]]; +menuitem [] -1 menuitem "AssaultCube is a total-conversion of the CUBE engine" -1 menuitem "by Wouter 'Aardappel' van Oortmerssen, and others:" -1 menuitem " 1http://www.cubeengine.com/" -1 newmenu help -menuitem "AssaultCube reference" [ showmenu reference ] -menuitem "Search the reference" [ showmenu "Reference search" ] -menuitem "Keyboard controls" [ showmenu controls ] -menuitem "View the FAQ" [ showmenu faq ] -menuitem "" -1 -menuitem "...for further information/help see the README" [ echo (yellow)The readme can be found in the base AssaultCube directory. ] +menuitem [AssaultCube reference] [ showmenu reference ] +menuitem [Search the reference] [ showmenu [Reference search] ] +menuitem [Keyboard controls] [ showmenu controls ] +menuitem [View the FAQ] [ showmenu faq ] +menuitem [] -1 +menuitem [...for further information/help see the README] [ echo (yellow)The readme can be found in the base AssaultCube directory. ] -newmenu "Reference search" -menuinit [ docsearchstring = "" ] -menuitemtextinput "Search reference for: " "" [ docsearchstring = $arg1 ] +newmenu [Reference search] +menuinit [ docsearchstring = [] ] +menuitemtextinput [Search reference for: ] [] [ docsearchstring = $arg1 ] menuitem " 2 [ Search ] " [ docfind $docsearchstring ] // 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)" +menuitem [Yes, quit now] quit +menuitem [No] [ showmenu [] ] +menuitem [] -1 +menuitemcheckbox [Don't ask next time: ] [(= $askquit 0)] [askquit = (= $arg1 0)] -savequit = [ if $askquit [ showmenu quit ] [ quit ] ] +savequit = [ if $askquit [ showmenu quit ] quit ] // Create additional menus... exec config/menus_bot.cfg diff --git a/config/menus_bot.cfg b/config/menus_bot.cfg index 60712f13..566e4a53 100644 --- a/config/menus_bot.cfg +++ b/config/menus_bot.cfg @@ -6,7 +6,7 @@ genbotmaps = [ loop i (listlen $arg1) [ listmapname = (at $arg1 $i) menutext = $listmapname (concat map $listmapname) - menuitemmapload $listmapname (concat tmp_botmap "=" $listmapname ";" startbotmap) + menuitemmapload $listmapname (concat "tmp_botmap =" $listmapname "; startbotmap") ] ] genbotmaps $defaultmaps @@ -53,7 +53,7 @@ afterdisconnect = [ ] // register events and change map -startbotmap = [ afterdisconnect [preparebotmatch] ] +startbotmap = [ afterdisconnect preparebotmatch ] emptymap = [ afterdisconnect [ @@ -65,25 +65,25 @@ emptymap = [ newmenu singleplayer // teamplay not mature yet -menuitem "Bot Team Deathmatch" [ tmp_mode = 7; showmenu botskill ] -menuitem "Bot Deathmatch" [ tmp_mode = 8; showmenu botskill ] -menuitem "Bot One Shot, One Kill" [ tmp_mode = 12; showmenu botskill ] -menuitem "Bot Pistol Frenzy" [ tmp_mode = 18; showmenu botskill ] -menuitem "Bot Last Swiss Standing" [ tmp_mode = 19; showmenu botskill ] -menuitem "Bot Team Survivor" [ tmp_mode = 20; showmenu botskill ] -menuitem "Bot Team One Shot, One Kill" [ tmp_mode = 21; showmenu botskill ] -menuitem "Bot Survival" [ showmenu "Survival Mode" ] +menuitem [Bot Team Deathmatch] [ tmp_mode = 7; showmenu botskill ] +menuitem [Bot Deathmatch] [ tmp_mode = 8; showmenu botskill ] +menuitem [Bot One Shot, One Kill] [ tmp_mode = 12; showmenu botskill ] +menuitem [Bot Pistol Frenzy] [ tmp_mode = 18; showmenu botskill ] +menuitem [Bot Last Swiss Standing] [ tmp_mode = 19; showmenu botskill ] +menuitem [Bot Team Survivor] [ tmp_mode = 20; showmenu botskill ] +menuitem [Bot Team One Shot, One Kill] [ tmp_mode = 21; showmenu botskill ] +menuitem [Bot Survival] [ showmenu [Survival Mode] ] menuitem [] -1 -menuitem "Empty Map" emptymap +menuitem [Empty Map] emptymap newmenu botskill -showmenu_enemies = [ if (|| (= $tmp_mode 7) (|| (= $tmp_mode 20) (= $tmp_mode 21))) [ showmenu "team enemies" ] [ showmenu enemies ] ] -menuitem "Best" [ tmp_botskill = best; showmenu_enemies ] +showmenu_enemies = [ if (|| (= $tmp_mode 7) (|| (= $tmp_mode 20) (= $tmp_mode 21))) [ showmenu [team enemies] ] [ showmenu enemies ] ] +menuitem [Best] [ tmp_botskill = best; showmenu_enemies ] menuitem "Good (default)" [ tmp_botskill = good; showmenu_enemies ] -menuitem "Medium" [ tmp_botskill = medium; showmenu_enemies ] -menuitem "Worse" [ tmp_botskill = worse; showmenu_enemies ] -menuitem "Bad" [ tmp_botskill = bad; showmenu_enemies ] +menuitem [Medium] [ tmp_botskill = medium; showmenu_enemies ] +menuitem [Worse] [ tmp_botskill = worse; showmenu_enemies ] +menuitem [Bad] [ tmp_botskill = bad; showmenu_enemies ] genenemyitems = [ loop i (listlen $arg1) [ @@ -95,77 +95,77 @@ genenemyitems = [ teamsize = (div $numplayers 2) menutext = (concatword $teamsize vs $teamsize) ] - menuitem $menutext (concat "tmp_numbots =" $numplayers "; showmenu botmaps") + menuitem $menutext (concat [tmp_numbots =] $numplayers [; showmenu botmaps]) ] ] newmenu enemies -genenemyitems "2 4 8 12 16 24 32" 0 +genenemyitems [2 4 8 12 16 24 32] 0 -newmenu "team enemies" -genenemyitems "4 8 12 16 24 32" 1 +newmenu [team enemies] +genenemyitems [4 8 12 16 24 32] 1 -survSetsList = "survNumBots survBotsToAdd timeBetChkPts timeUntilTele survMaxBots" +survSetsList = [survNumBots survBotsToAdd timeBetChkPts timeUntilTele survMaxBots] survDifList = [ "6 1 60000 90000 20" "8 2 45000 60000 30" "10 3 30000 45000 40" "12 5 10000 20000 50" ] 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 (- (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_swamp" "ac_toxic" "ac_urban" "ac_werk" ] [ survMap = $arg1 ] -menuitemslider "Difficulty: " 0 3 "$survDifficulty" 1 [ "easy" "intermediate" "hard" "impossible" ] [ survSetDif $arg1 ] +newmenu [Survival Mode] +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_swamp 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" ] -menuitem " Start!" [ survival (at $defaultmaps $survMap) ] +menuitem [ Customize] [ showmenu [Survival Mode - Customize] ] +menuitem [ Start!] [ survival (at $defaultmaps $survMap) ] -newmenu "Survival Mode - Customize" -menuitemcheckbox "Enable survival damage effects (uses gamespeed/gamma)" "$survDamageEffects" [ survDamageEffects = $arg1 ] -menuitemslider "# of bots to spawn on start: " 6 20 "$survNumBots" 1 [] [ survNumBots = $arg1; nonSurvDefaults = 1 ] -menuitemslider "# of bots to spawn at checkpoints: " 1 5 "$survBotsToAdd" 1 [] [ survBotsToAdd = $arg1; nonSurvDefaults = 1 ] -menuitemslider "# of milliseconds between checkpoints: " 10000 120000 "$timeBetChkPts" 10000 [] [ timeBetChkPts = $arg1; nonSurvDefaults = 1 ] -menuitemslider "# of milliseconds before teleporting: " 10000 180000 "$timeUntilTele" 10000 [] [ timeUntilTele = $arg1; nonSurvDefaults = 1 ] -menuitemslider "Maximum # of bots in survival mode: " 10 50 "$survMaxBots" 2 [] [ survMaxBots = $arg1; nonSurvDefaults = 1 ] -menuitemslider "Spam survival mode messages: " 0 1 "$spamSurvMsgs" 1 [ "no" "yes" ] [ spamSurvMsgs = $arg1 ] +newmenu [Survival Mode - Customize] +menuitemcheckbox [Enable survival damage effects (uses gamespeed/gamma)] "$survDamageEffects" [ survDamageEffects = $arg1 ] +menuitemslider [# of bots to spawn on start: ] 6 20 "$survNumBots" 1 [] [ survNumBots = $arg1; nonSurvDefaults = 1 ] +menuitemslider [# of bots to spawn at checkpoints: ] 1 5 "$survBotsToAdd" 1 [] [ survBotsToAdd = $arg1; nonSurvDefaults = 1 ] +menuitemslider [# of milliseconds between checkpoints: ] 10000 120000 "$timeBetChkPts" 10000 [] [ timeBetChkPts = $arg1; nonSurvDefaults = 1 ] +menuitemslider [# of milliseconds before teleporting: ] 10000 180000 "$timeUntilTele" 10000 [] [ timeUntilTele = $arg1; nonSurvDefaults = 1 ] +menuitemslider [Maximum # of bots in survival mode: ] 10 50 "$survMaxBots" 2 [] [ survMaxBots = $arg1; nonSurvDefaults = 1 ] +menuitemslider [Spam survival mode messages: ] 0 1 "$spamSurvMsgs" 1 [ no yes ] [ spamSurvMsgs = $arg1 ] menuitem [] -1 -menuitem " Back" [ closemenu "Survival Mode - Customize" ] +menuitem [ Back] [ closemenu [Survival Mode - Customize] ] -newmenu "Creating bot waypoints" +newmenu [Creating bot waypoints] -menuitem "Waypoints..." [ showmenu "Waypoints" ] -menuitem "Paths..." [ showmenu "Paths" ] -menuitem "Other operations..." [ showmenu "Other bot operations" ] -menuitem "" -1 -menuitem "Flood map with waypoints" [ wpflood ] -menuitem "Save bot waypoints" [ wpsave ] +menuitem [Waypoints...] [ showmenu Waypoints ] +menuitem [Paths...] [ showmenu Paths ] +menuitem [Other operations...] [ showmenu [Other bot operations] ] +menuitem [] -1 +menuitem [Flood map with waypoints] wpflood +menuitem [Save bot waypoints] wpsave newmenu Waypoints -menuitem "Add a waypoint" [ addwp 0 ] -menuitem "Add auto-connecting waypoint" [ addwp 1 ] -menuitem "" -1 -menuitem "Delete nearest waypoint" [ delwp ] -menuitem "Delete all waypoints" [ showmenu "Delete all waypoints" ] +menuitem [Add a waypoint] [ addwp 0 ] +menuitem [Add auto-connecting waypoint] [ addwp 1 ] +menuitem [] -1 +menuitem [Delete nearest waypoint] delwp +menuitem [Delete all waypoints] [ showmenu [Delete all waypoints] ] newmenu Paths -menuitem "Create Start of 2-way path" [ addpath2way1 ] -menuitem "Create End of 2-way path" [ addpath2way2 ] -menuitem "Delete Start of 2-way path" [ delpath2way1 ] -menuitem "Delete End of 2-way path" [ delpath2way2 ] -menuitem "" -1 -menuitem "Create Start of 1-way path" [ addpath1way1 ] -menuitem "Create End of 1-way path" [ addpath1way2 ] -menuitem "Delete Start of 1-way path" [ delpath1way1 ] -menuitem "Delete End of 1-way path" [ delpath1way2 ] +menuitem [Create Start of 2-way path] addpath2way1 +menuitem [Create End of 2-way path] addpath2way2 +menuitem [Delete Start of 2-way path] delpath2way1 +menuitem [Delete End of 2-way path] delpath2way2 +menuitem [] -1 +menuitem [Create Start of 1-way path] addpath1way1 +menuitem [Create End of 1-way path] addpath1way2 +menuitem [Delete Start of 1-way path] delpath1way1 +menuitem [Delete End of 1-way path] delpath1way2 -newmenu "Other bot operations" +newmenu [Other bot operations] -menuitem "Set waypoint as jumpable" "setjumpwp" -menuitem "Unset waypoint as jumpable" "unsetjumpwp" -menuitem "Set waypoint direction (yaw)" "setwpyaw" -menuitem "" -1 -menuitemslider "Waypoint visibility: " 0 1 " " 1 ["Hide waypoints" "Show waypoints"] "wpvisible $arg1" -menuitemslider "Select/place waypoints by: " 0 1 "($xhairwpsel)" 1 ["Your current location" "Clicking a point on the grid"] "xhairwpsel $arg1" +menuitem [Set waypoint as jumpable] setjumpwp +menuitem [Unset waypoint as jumpable] unsetjumpwp +menuitem "Set waypoint direction (yaw)" setwpyaw +menuitem [] -1 +menuitemslider [Waypoint visibility: ] 0 1 [ ] 1 ["Hide waypoints" "Show waypoints"] [ wpvisible $arg1 ] +menuitemslider [Select/place waypoints by: ] 0 1 "($xhairwpsel)" 1 ["Your current location" "Clicking a point on the grid"] [ xhairwpsel $arg1 ] -newmenu "Delete all waypoints" +newmenu [Delete all waypoints] menuinit [ delallwps = 0 ] // Ensures this menu works correctly. -menuitemcheckbox "Yes, delete all waypoints: " "delallwps = 1" "delallwps = $arg1" -menuitem " 2 [ Apply! ]" [ if $delallwps [ wpclear ] [ showmenu "" ] ] +menuitemcheckbox [Yes, delete all waypoints: ] [delallwps = 1] [delallwps = $arg1] +menuitem " 2 [ Apply! ]" [ if $delallwps wpclear [ showmenu [] ] ] diff --git a/config/menus_edit.cfg b/config/menus_edit.cfg index 1d81c37f..e4fe0b2c 100644 --- a/config/menus_edit.cfg +++ b/config/menus_edit.cfg @@ -1,435 +1,436 @@ newmenu editing -menuitem "Mapmodels..." [ showmenu Mapmodels ] -menuitem "Lighting..." [ showmenu Lighting ] -menuitem "Entities..." [ showmenu Entities ] -menuitem "Pickups..." [ showmenu Pickups ] -menuitem "Test a skymap..." [ showmenu skymaps ] -menuitem "Ambient sounds..." [ showmenu "Ambient sounds" ] -menuitem "Arches and slopes..." [ showmenu Arches ] -menuitem "Map operations..." [ showmenu "Map operations" ] -menuitem "Bots..." [ showmenu "Creating bot waypoints" ] -menuitem "Settings..." [ showmenu "Editing settings" ] -menuitem "Help?" [ echo (yellow)Please read the AssaultCube README which has a detailed guide on mapediting... ] +menuitem [Mapmodels...] [ showmenu Mapmodels ] +menuitem [Lighting...] [ showmenu Lighting ] +menuitem [Entities...] [ showmenu Entities ] +menuitem [Pickups...] [ showmenu Pickups ] +menuitem [Test a skymap...] [ showmenu skymaps ] +menuitem [Ambient sounds...] [ showmenu [Ambient sounds] ] +menuitem [Arches and slopes...] [ showmenu Arches ] +menuitem [Map operations...] [ showmenu [Map operations] ] +menuitem [Bots...] [ showmenu [Creating bot waypoints] ] +menuitem [Settings...] [ showmenu [Editing settings] ] +menuitem [Help?] [ echo (yellow)Please read the AssaultCube README which has a detailed guide on mapediting... ] tmp_cradius = 12 //Lighting menu. -newmenu "Lighting" +newmenu Lighting -menuitem "Add white lights " [ showmenu "White light" ] -menuitem "Add coloured lights " [ showmenu "Coloured light" ] -menuitem "" -1 -menuitemcheckbox "Enable fullbright: " "$fullbright" [ fullbright $arg1 ] -menuitem "" -1 -menuitem "Random coloured light: " -1 -menuitemtextinput "Radius: " [ result $tmp_cradius ] [ if (&& (! (> $arg1 32)) (! (< $arg1 1))) [ tmp_cradius = $arg1 ] [ echo (red)Error: (yellow) $arg1 (white)is not a valid radius for a light entity. ] ] -menuitem "Place random light..." [ gencl $tmp_cradius ] -menuitem "Update random light..." [ gencl ] +menuitem [Add white lights ] [ showmenu [White light] ] +menuitem [Add coloured lights ] [ showmenu [Coloured light] ] +menuitem [] -1 +menuitemcheckbox [Enable fullbright: ] "$fullbright" [ fullbright $arg1 ] +menuitem [] -1 +menuitem [Random coloured light: ] -1 +menuitemtextinput [Radius: ] [ result $tmp_cradius ] [ if (&& (! (> $arg1 32)) (! (< $arg1 1))) [ tmp_cradius = $arg1 ] [ echo (red)Error: (yellow) $arg1 (white)is not a valid radius for a light entity. ] ] +menuitem [Place random light...] [ gencl $tmp_cradius ] +menuitem [Update random light...] gencl wlight = 1; wlight1 = 1 -newmenu "White light" +newmenu [White light] -menuitemslider "Light radius: " 1 32 "$wlight" 1 "" [ wlight = $arg1 ] -menuitemslider "Brightness: " 1 255 "$wlight1" 5 "" [ wlight1 = $arg1 ] -menuitem "" -1 +menuitemslider [Light radius: ] 1 32 "$wlight" 1 [] [ wlight = $arg1 ] +menuitemslider [Brightness: ] 1 255 "$wlight1" 5 [] [ wlight1 = $arg1 ] +menuitem [] -1 menuitem " 2 [ OK ] " [ newent light $wlight $wlight1 ] clight = 1; clight1 = 1; clight2 = 1; clight3 = 1 -newmenu "Coloured light" +newmenu [Coloured light] -menuitemslider "Light radius: " 1 32 "$clight" 1 "" [ clight = $arg1 ] -menuitem "" -1 -menuitemslider "Red light: " 1 255 "$clight1" 5 "" [ clight1 = $arg1 ] -menuitemslider "Green light: " 1 255 "$clight2" 5 "" [ clight2 = $arg1 ] -menuitemslider "Blue light: " 1 255 "$clight3" 5 "" [ clight3 = $arg1 ] -menuitem "" -1 +menuitemslider [Light radius: ] 1 32 "$clight" 1 [] [ clight = $arg1 ] +menuitem [] -1 +menuitemslider [Red light: ] 1 255 "$clight1" 5 [] [ clight1 = $arg1 ] +menuitemslider [Green light: ] 1 255 "$clight2" 5 [] [ clight2 = $arg1 ] +menuitemslider [Blue light: ] 1 255 "$clight3" 5 [] [ clight3 = $arg1 ] +menuitem [] -1 menuitem " 2 [ OK ]" [ newent light $clight $clight1 $clight2 $clight3 ] //Entities menu newmenu Entities -menuitem "RVSF Spawn point" [ newent playerstart 1 ] -menuitem "CLA Spawn point" [ newent playerstart 0 ] -menuitem "FFA Spawn point" [ newent playerstart 100 ] -menuitem "" -1 -menuitem "RVSF CTF Flag" [ newent ctf-flag 1 ] -menuitem "CLA CTF Flag" [ newent ctf-flag 0 ] -menuitem "" -1 -menuitem "Ladder entity" "saycommand /newent ladder " [ echo "Ensure that you have placed the ladder mapmodel first (found in the mapmodels menu)..." ] -menuitem "Clip entity" "showmenu Clips" [ echo Clips can be used to block off areas that players shouldn't be able to access... ] +menuitem [RVSF Spawn point] [ newent playerstart 1 ] +menuitem [CLA Spawn point] [ newent playerstart 0 ] +menuitem [FFA Spawn point] [ newent playerstart 100 ] +menuitem [] -1 +menuitem [RVSF CTF Flag] [ newent ctf-flag 1 ] +menuitem [CLA CTF Flag] [ newent ctf-flag 0 ] +menuitem [] -1 +menuitem [Ladder entity] "saycommand /newent ladder " [ echo "Ensure that you have placed the ladder mapmodel first (found in the mapmodels menu)..." ] +menuitem [Clip entity] [ showmenu Clips ] [ echo Clips can be used to block off areas that players shouldn't be able to access... ] _clip00 = clip; _clip00status = 0; _clip01 = 0; _clip02 = 1; _clip03 = 1; _clip04 = 1 // Give aliases an initial value. -newmenu "Clips" +newmenu Clips -menuitemslider "Clip type: " 0 1 "$_clip00status" 1 [ Clip "Player Clip" ] [ _clip00 = (at [clip plclip] $arg1); _clip00status = $arg1 ] -menuitemslider "Elevation from ground: " 0 50 "$_clip01" 1 "" [ _clip01 = $arg1 ] -menuitemslider "Length of clip (X): " 0 50 "$_clip02" 1 "" [ _clip02 = $arg1 ] -menuitemslider "Width of clip (Y): " 0 50 "$_clip03" 1 "" [ _clip03 = $arg1 ] -menuitemslider "Height of clip (Z): " 0 50 "$_clip04" 1 "" [ _clip04 = $arg1 ] -menuitem "" -1 +menuitemslider [Clip type: ] 0 1 "$_clip00status" 1 [ Clip [Player Clip] ] [ _clip00 = (at [clip plclip] $arg1); _clip00status = $arg1 ] +menuitemslider [Elevation from ground: ] 0 50 "$_clip01" 1 [] [ _clip01 = $arg1 ] +menuitemslider [Length of clip (X): ] 0 50 "$_clip02" 1 [] [ _clip02 = $arg1 ] +menuitemslider [Width of clip (Y): ] 0 50 "$_clip03" 1 [] [ _clip03 = $arg1 ] +menuitemslider [Height of clip (Z): ] 0 50 "$_clip04" 1 [] [ _clip04 = $arg1 ] +menuitem [] -1 menuitem " 2 [ OK ]" [ newent $_clip00 $_clip01 $_clip02 $_clip03 $_clip04 ] //Pickups menu newmenu Pickups -menuitem "Health" [ newent health ] -menuitem "Pistol Magazine" [ newent pistol ] -menuitem "Box of Ammo" [ newent ammobox ] -menuitem "Kevlar Vest" [ newent armour ] -menuitem "Helmet" [ newent helmet ] -menuitem "Akimbo" [ newent akimbo ] -menuitem "Grenades" [ newent grenades ] +menuitem [Health] [ newent health ] +menuitem [Pistol Magazine] [ newent pistol ] +menuitem [Box of Ammo] [ newent ammobox ] +menuitem [Kevlar Vest] [ newent armour ] +menuitem [Helmet] [ newent helmet ] +menuitem [Akimbo] [ newent akimbo ] +menuitem [Grenades] [ newent grenades ] //Arch and slope menu newmenu Arches -menuitem "Arch with no sideways curves" "heightfield 2; arch 0" -menuitem "Arch with sideways curves (delta 1)" "heightfield 2; arch 1" -menuitem "Arch with sideways curves (delta 2)" "heightfield 2; arch 2" -menuitem "Arch with sideways curves (delta 3)" "heightfield 2; arch 3" -menuitem "Arch with sideways curves (delta 4)" "heightfield 2; arch 4" -menuitem "" -1 -menuitem "Slope increase 2 left-right" "heightfield 0; slope 2 0" -menuitem "Slope decrease 2 left-right" "heightfield 0; slope -2 0" -menuitem "Slope increase 2 top-bottom" "heightfield 0; slope 0 2" -menuitem "Slope decrease 2 top-bottom" "heightfield 0; slope 0 -2" -menuitem "Slope increase 1 left-right" "heightfield 0; slope 1 0" -menuitem "Slope decrease 1 left-right" "heightfield 0; slope -1 0" -menuitem "Slope increase 1 top-bottom" "heightfield 0; slope 0 1" -menuitem "Slope decrease 1 top-bottom" "heightfield 0; slope 0 -1" -menuitem "" -1 -menuitem "Fix heightfielding" "solid 0; slope 0 0" +menuitem [Arch with no sideways curves] [ heightfield 2; arch 0 ] +menuitem [Arch with sideways curves (delta 1)] [ heightfield 2; arch 1 ] +menuitem [Arch with sideways curves (delta 2)] [ heightfield 2; arch 2 ] +menuitem [Arch with sideways curves (delta 3)] [ heightfield 2; arch 3 ] +menuitem [Arch with sideways curves (delta 4)] [ heightfield 2; arch 4 ] +menuitem [] -1 +menuitem [Slope increase 2 left-right] [ heightfield 0; slope 2 0 ] +menuitem [Slope decrease 2 left-right] [ heightfield 0; slope -2 0 ] +menuitem [Slope increase 2 top-bottom] [ heightfield 0; slope 0 2 ] +menuitem [Slope decrease 2 top-bottom] [ heightfield 0; slope 0 -2 ] +menuitem [Slope increase 1 left-right] [ heightfield 0; slope 1 0 ] +menuitem [Slope decrease 1 left-right] [ heightfield 0; slope -1 0 ] +menuitem [Slope increase 1 top-bottom] [ heightfield 0; slope 0 1 ] +menuitem [Slope decrease 1 top-bottom] [ heightfield 0; slope 0 -1 ] +menuitem [] -1 +menuitem [Fix heightfielding] [ solid 0; slope 0 0 ] newmenu skymaps + menuinit [ echo Please read: (red)/docs/mapediting5.html to find out how to PERMANENTLY add a custom skymap to your map... ] -menuitem "Steini2 skymap" [ loadsky "textures/skymaps/steini/steini2" ] -menuitem "Steini3 skymap" [ loadsky "textures/skymaps/steini/steini3" ] -menuitem "Steini4 skymap" [ loadsky "textures/skymaps/steini/steini4" ] -menuitem "Rocky skymap" [ loadsky "textures/skymaps/makke/rocky" ] -menuitem "Mountain skymap" [ loadsky "textures/skymaps/makke/mountain" ] -menuitem "Iceflow skymap" [ loadsky "textures/skymaps/iceflow/iceflow" ] -menuitem "Inhcanyons1 skymap" [ loadsky "textures/skymaps/ladynighthawk/inhcanyons1" ] -menuitem "Nightball skymap" [ loadsky "textures/skymaps/socksky/nightball" ] -menuitem "Grave skymap" [ loadsky "textures/skymaps/socksky/grave" ] -menuitem "At sea skymap" [ loadsky "textures/skymaps/kothic/atsea" ] +menuitem [Steini2 skymap] [ loadsky "textures/skymaps/steini/steini2" ] +menuitem [Steini3 skymap] [ loadsky "textures/skymaps/steini/steini3" ] +menuitem [Steini4 skymap] [ loadsky "textures/skymaps/steini/steini4" ] +menuitem [Rocky skymap] [ loadsky "textures/skymaps/makke/rocky" ] +menuitem [Mountain skymap] [ loadsky "textures/skymaps/makke/mountain" ] +menuitem [Iceflow skymap] [ loadsky "textures/skymaps/iceflow/iceflow" ] +menuitem [Inhcanyons1 skymap] [ loadsky "textures/skymaps/ladynighthawk/inhcanyons1" ] +menuitem [Nightball skymap] [ loadsky "textures/skymaps/socksky/nightball" ] +menuitem [Grave skymap] [ loadsky "textures/skymaps/socksky/grave" ] +menuitem [At sea skymap] [ loadsky "textures/skymaps/kothic/atsea" ] _closestenttypestatus = 0 //Map operations -newmenu "Map operations" +newmenu [Map operations] -menuitem "Newmap (128x128 cubes - recommended)" [ newmap 7 ] -menuitem "Newmap (256x256 cubes)" [ newmap 8 ] -menuitem "Increase mapsize (2x)" [ mapenlarge; echo The map size has been increased by 2. However, the new space is solid. To utilize it, you will need to turn it into non-solid space, by selecting it and pressing G. ] -menuitem "Create/edit a map message" [ menumapmsg ] -menuitem "Change waterlevel" [ saycommand "/waterlevel " ] -menuitem "Change watercolour" [ showmenu "Water colour" ] -menuitem "Generate a random watercolour" [ genwc ] -menuitem "Generate a random fogcolour" [ fogcolour (genhex) ] -menuitem "Print entity stats" [ entstats ] -menuitem "Select the next closest entity" [ nextclosestent ] -menuitem "Copy the current closest entity" [ copyent ] -menuitem "Paste a previously copied entity" [ pasteent ] -menuitemcheckbox "Show mapmodel clippings: " "$showmodelclipping" [ showmodelclipping $arg1 ] -menuitemslider "Select only these entities: " 0 15 "$_closestenttypestatus" 1 "All Light Playerstart Pistol Ammobox Grenades Health Armour Akimbo Mapmodel Ladder CTF-flag Sound Clip Helmet PlayerClip" [ _closestentslider $arg1 ] +menuitem [Newmap (128x128 cubes - recommended)] [ newmap 7 ] +menuitem [Newmap (256x256 cubes)] [ newmap 8 ] +menuitem [Increase mapsize (2x)] [ mapenlarge; echo The map size has been increased by 2. However, the new space is solid. To utilize it, you will need to turn it into non-solid space, by selecting it and pressing G. ] +menuitem [Create/edit a map message] menumapmsg +menuitem [Change waterlevel] [ saycommand [/waterlevel ] ] +menuitem [Change watercolour] [ showmenu [Water colour] ] +menuitem [Generate a random watercolour] genwc +menuitem [Generate a random fogcolour] [ fogcolour (genhex) ] +menuitem [Print entity stats] entstats +menuitem [Select the next closest entity] nextclosestent +menuitem [Copy the current closest entity] copyent +menuitem [Paste a previously copied entity] pasteent +menuitemcheckbox [Show mapmodel clippings: ] "$showmodelclipping" [ showmodelclipping $arg1 ] +menuitemslider [Select only these entities: ] 0 15 "$_closestenttypestatus" 1 [All Light Playerstart Pistol Ammobox Grenades Health Armour Akimbo Mapmodel Ladder CTF-flag Sound Clip Helmet PlayerClip] [ _closestentslider $arg1 ] // "closestenttype" slider... _closestentslider = [ closestenttype (at ["" light playerstart pistol ammobox grenades health armour akimbo mapmodel ladder ctf-flag sound clip helmet plclip] $arg1); _closestenttypestatus = $arg1 ] // Map-message edit/creation menu -menumapmsg = [ if (= (strcmp (getmapmsg) "Untitled Map by Unknown") 1) [ showmenu "Create a map message" ] [ showmenu "Edit a map message" ] ] +menumapmsg = [ if (= (strcmp (getmapmsg) [Untitled Map by Unknown]) 1) [ showmenu [Create a map message] ] [ showmenu [Edit a map message] ] ] -newmenu "Create a map message" -menuinit [ menumapmsgtext = "" ] -menuitemtextinput "Enter your map message: " "" [ menumapmsgtext = $arg1 ] "" 256 +newmenu [Create a map message] +menuinit [ menumapmsgtext = [] ] +menuitemtextinput [Enter your map message: ] [] [ menumapmsgtext = $arg1 ] [] 256 menuitem " 2 [ OK ]" [ mapmsg $menumapmsgtext ] -newmenu "Edit a map message" -menuinit [ menumapmsgtext = "" ] -menuitemtextinput "Edit your map message: " "getmapmsg" [ menumapmsgtext = $arg1 ] "" 256 +newmenu [Edit a map message] +menuinit [ menumapmsgtext = [] ] +menuitemtextinput [Edit your map message: ] getmapmsg [ menumapmsgtext = $arg1 ] [] 256 menuitem " 2 [ OK ]" [ mapmsg $menumapmsgtext ] redw = 1; greenw = 1; bluew = 1 -newmenu "Water colour" +newmenu [Water colour] -menuitemslider "Red pigment: " 1 255 "$redw" 5 "" [ redw = $arg1 ] -menuitemslider "Green pigment: " 1 255 "$greenw" 5 "" [ greenw = $arg1 ] -menuitemslider "Blue pigment: " 1 255 "$bluew" 5 "" [ bluew = $arg1 ] -menuitem "" -1 +menuitemslider [Red pigment: ] 1 255 "$redw" 5 [] [ redw = $arg1 ] +menuitemslider [Green pigment: ] 1 255 "$greenw" 5 [] [ greenw = $arg1 ] +menuitemslider [Blue pigment: ] 1 255 "$bluew" 5 [] [ bluew = $arg1 ] +menuitem [] -1 menuitem " 2 [ OK ]" [ watercolour $redw $greenw $bluew ] //Mapmodels newmenu Mapmodels -menuitem "Platforms" [ showmenu Platforms ] -menuitem "Ladders/Stairs" [ showmenu Ladders/Stairs ] -menuitem "Fencing" [ showmenu Fencing ] -menuitem "Plants" [ showmenu Plants ] -menuitem "Lights" [ showmenu Lights ] -menuitem "Street" [ showmenu Street ] -menuitem "Office" [ showmenu Office ] -menuitem "Computers" [ showmenu Computers ] -menuitem "Home" [ showmenu Home ] -menuitem "Industrial" [ showmenu Industrial ] -menuitem "Military" [ showmenu Military ] -menuitem "Signs" [ showmenu Signs ] -menuitem "Other" [ showmenu Other ] +menuitem [Platforms] [ showmenu Platforms ] +menuitem [Ladders/Stairs] [ showmenu Ladders/Stairs ] +menuitem [Fencing] [ showmenu Fencing ] +menuitem [Plants] [ showmenu Plants ] +menuitem [Lights] [ showmenu Lights ] +menuitem [Street] [ showmenu Street ] +menuitem [Office] [ showmenu Office ] +menuitem [Computers] [ showmenu Computers ] +menuitem [Home] [ showmenu Home ] +menuitem [Industrial] [ showmenu Industrial ] +menuitem [Military] [ showmenu Military ] +menuitem [Signs] [ showmenu Signs ] +menuitem [Other] [ showmenu Other ] -newmenu "Platforms" +newmenu Platforms -menuitem "Bridge (8x8)" [ saycommand "/newent mapmodel 1 " ] -menuitem "Platform (8x8)" [ saycommand "/newent mapmodel 57 " ] -menuitem "Wire platform (8x8)" [ saycommand "/newent mapmodel 73 " ] +menuitem [Bridge (8x8)] [ saycommand "/newent mapmodel 1 " ] +menuitem [Platform (8x8)] [ saycommand "/newent mapmodel 57 " ] +menuitem [Wire platform (8x8)] [ saycommand "/newent mapmodel 73 " ] -newmenu "Ladders/Stairs" +newmenu Ladders/Stairs -menuitem "Single ladder rung (1)" [ saycommand "/newent mapmodel 58 " ] -menuitem "Ladder(7)" [ newent mapmodel 2 ] -menuitem "Ladder(8)" [ newent mapmodel 3 ] -menuitem "Ladder(10)" [ newent mapmodel 4 ] -menuitem "Ladder(11)" [ newent mapmodel 5 ] -menuitem "Ladder(15)" [ newent mapmodel 6 ] -menuitem "" -1 -menuitem "Hangable Ladder (2)" [ saycommand "/newent mapmodel 136 " ] -menuitem "Hangable Ladder (6)" [ saycommand "/newent mapmodel 137 " ] -menuitem "Hangable Ladder (Top, Over)" [ saycommand "/newent mapmodel 138 " ] -menuitem "Hangable Ladder (Top, Side)" [ saycommand "/newent mapmodel 139 " ] -menuitem "Hangable Ladder (Bottom)" [ saycommand "/newent mapmodel 140 " ] -menuitem "" -1 -menuitem "Wire stairs (Top)" [ saycommand "/newent mapmodel 79 " ] -menuitem "Wire stairs (Bottom)" [ saycommand "/newent mapmodel 80 " ] +menuitem [Single ladder rung (1)] [ saycommand "/newent mapmodel 58 " ] +menuitem [Ladder(7)] [ newent mapmodel 2 ] +menuitem [Ladder(8)] [ newent mapmodel 3 ] +menuitem [Ladder(10)] [ newent mapmodel 4 ] +menuitem [Ladder(11)] [ newent mapmodel 5 ] +menuitem [Ladder(15)] [ newent mapmodel 6 ] +menuitem [] -1 +menuitem [Hangable Ladder (2)] [ saycommand "/newent mapmodel 136 " ] +menuitem [Hangable Ladder (6)] [ saycommand "/newent mapmodel 137 " ] +menuitem [Hangable Ladder (Top, Over)] [ saycommand "/newent mapmodel 138 " ] +menuitem [Hangable Ladder (Top, Side)] [ saycommand "/newent mapmodel 139 " ] +menuitem [Hangable Ladder (Bottom)] [ saycommand "/newent mapmodel 140 " ] +menuitem [] -1 +menuitem [Wire stairs (Top)] [ saycommand "/newent mapmodel 79 " ] +menuitem [Wire stairs (Bottom)] [ saycommand "/newent mapmodel 80 " ] newmenu Home -menuitem "Picture frame" [ saycommand "/newent mapmodel 29 " ] -menuitem "Milk" [ newent mapmodel 69 ] -menuitem "CRT TV" [ newent mapmodel 86 ] -menuitem "CRT TV in stand" [ saycommand "/newent mapmodel 70 " ] -menuitem "Plasma TV" [ newent mapmodel 72 ] -menuitem "Power meter" [ newent mapmodel 74 ] -menuitem "Rack" [ newent mapmodel 75 ] -menuitem "Utility table" [ newent mapmodel 87 ] -menuitem "Ceiling fan" [ saycommand "/newent mapmodel 113 " ] +menuitem [Picture frame] [ saycommand "/newent mapmodel 29 " ] +menuitem [Milk] [ newent mapmodel 69 ] +menuitem [CRT TV] [ newent mapmodel 86 ] +menuitem [CRT TV in stand] [ saycommand "/newent mapmodel 70 " ] +menuitem [Plasma TV] [ newent mapmodel 72 ] +menuitem [Power meter] [ newent mapmodel 74 ] +menuitem [Rack] [ newent mapmodel 75 ] +menuitem [Utility table] [ newent mapmodel 87 ] +menuitem [Ceiling fan] [ saycommand "/newent mapmodel 113 " ] // The ceiling fan model is repeated in the "office" menu so it's easy to find, as it could be either office or home. -menuitem "Window" [ newent mapmodel 126 ] -menuitem "Shelf" [ newent mapmodel 128 ] +menuitem [Window] [ newent mapmodel 126 ] +menuitem [Shelf] [ newent mapmodel 128 ] newmenu Military -menuitem "Bullet" [ newent mapmodel 61 ] -menuitem "Shotgun shell" [ newent mapmodel 78 ] -menuitem "Target" [ newent mapmodel 100 ] -menuitem "Radar console" [ newent mapmodel 76 ] -menuitem "Razor wire" [ newent mapmodel 116 ] -menuitem "Guard tower" [ newent mapmodel 129 ] [ echo (c 3)This mapmodel will need to be properly clipped! ] +menuitem [Bullet] [ newent mapmodel 61 ] +menuitem [Shotgun shell] [ newent mapmodel 78 ] +menuitem [Target] [ newent mapmodel 100 ] +menuitem [Radar console] [ newent mapmodel 76 ] +menuitem [Razor wire] [ newent mapmodel 116 ] +menuitem [Guard tower] [ newent mapmodel 129 ] [ echo (c 3)This mapmodel will need to be properly clipped! ] newmenu Computers -menuitem "Laptop" [ newent mapmodel 28 ] -menuitem "PC" [ newent mapmodel 101 ] -menuitem "Computer interfaces" [ newent mapmodel 65 ] -menuitem "Communications rack" [ newent mapmodel 63 ] -menuitem "Communications rack 2" [ newent mapmodel 64 ] -menuitem "Server rack" [ newent mapmodel 119 ] -menuitem "Server cluster 1" [ saycommand "/newent mapmodel 120" ] -menuitem "Server cluster 2" [ saycommand "/newent mapmodel 121" ] -menuitem "Server cluster 3" [ saycommand "/newent mapmodel 122" ] -menuitem "Server cluster 4" [ saycommand "/newent mapmodel 123" ] -menuitem "Server cluster 5" [ saycommand "/newent mapmodel 124" ] -menuitem "Server cluster 6" [ saycommand "/newent mapmodel 125" ] +menuitem [Laptop] [ newent mapmodel 28 ] +menuitem [PC] [ newent mapmodel 101 ] +menuitem [Computer interfaces] [ newent mapmodel 65 ] +menuitem [Communications rack] [ newent mapmodel 63 ] +menuitem [Communications rack 2] [ newent mapmodel 64 ] +menuitem [Server rack] [ newent mapmodel 119 ] +menuitem [Server cluster 1] [ saycommand "/newent mapmodel 120" ] +menuitem [Server cluster 2] [ saycommand "/newent mapmodel 121" ] +menuitem [Server cluster 3] [ saycommand "/newent mapmodel 122" ] +menuitem [Server cluster 4] [ saycommand "/newent mapmodel 123" ] +menuitem [Server cluster 5] [ saycommand "/newent mapmodel 124" ] +menuitem [Server cluster 6] [ saycommand "/newent mapmodel 125" ] newmenu Street -menuitem "Park Bench" [ newent mapmodel 9 ] -menuitem "Dumpster" [ newent mapmodel 10 ] -menuitem "Trashbag" [ newent mapmodel 84 ] -menuitem "Trashcan" [ newent mapmodel 85 ] -menuitem "Roadblock/Barrier" [ newent mapmodel 11 ] -menuitem "Roadblock/Barrier 2" [ newent mapmodel 12 ] -menuitem "Drainpipe" [ newent mapmodel 59 ] -menuitem "Wheel: Vertical" [ newent mapmodel 88 ] -menuitem "Tyre: Horizontal" [ newent mapmodel 83 ] -menuitem "Gray milk crate" [ newent mapmodel 112 ] -menuitem "Red milk crate" [ newent mapmodel 134 ] -menuitem "Blue milk crate" [ newent mapmodel 135 ] +menuitem [Park Bench] [ newent mapmodel 9 ] +menuitem [Dumpster] [ newent mapmodel 10 ] +menuitem [Trashbag] [ newent mapmodel 84 ] +menuitem [Trashcan] [ newent mapmodel 85 ] +menuitem [Roadblock/Barrier] [ newent mapmodel 11 ] +menuitem [Roadblock/Barrier 2] [ newent mapmodel 12 ] +menuitem [Drainpipe] [ newent mapmodel 59 ] +menuitem [Wheel: Vertical] [ newent mapmodel 88 ] +menuitem [Tyre: Horizontal] [ newent mapmodel 83 ] +menuitem [Gray milk crate] [ newent mapmodel 112 ] +menuitem [Red milk crate] [ newent mapmodel 134 ] +menuitem [Blue milk crate] [ newent mapmodel 135 ] -tree_warning = "Trees are expensive mapmodels. Please only use a maximum of 1 or 2 in a map." +const tree_warning (concatword (c 3) [Trees are expensive mapmodels. Please only use a maximum of 1 or 2 in a map.]) newmenu Plants -menuitem "Grass 1" [ newent mapmodel 17 ] -menuitem "Grass 1 (Dry)" [ newent mapmodel 18 ] -menuitem "Grass 1 (Snow)" [ newent mapmodel 19 ] -menuitem "Grass 2" [ newent mapmodel 20 ] -menuitem "Grass 2 (Dry)" [ newent mapmodel 21 ] -menuitem "Grass 2 (Snow)" [ newent mapmodel 22 ] -menuitem "Plant 1" [ newent mapmodel 23 ] -menuitem "Plant 1 (Dry)" [ newent mapmodel 24 ] -menuitem "Plant 1 (Snow)" [ newent mapmodel 25 ] -menuitem "Tree trunk" [ newent mapmodel 130 ] -menuitem "Tree 1" "newent mapmodel 114" [ echo (c 3) $tree_warning ] -menuitem "Tree 2" "newent mapmodel 117" [ echo (c 3) $tree_warning ] -menuitem "Pine tree" "newent mapmodel 118" [ echo (c 3) $tree_warning ] -menuitem "Palm tree" "newent mapmodel 115" [ echo (c 3) $tree_warning ] +menuitem [Grass 1] [ newent mapmodel 17 ] +menuitem [Grass 1 (Dry)] [ newent mapmodel 18 ] +menuitem [Grass 1 (Snow)] [ newent mapmodel 19 ] +menuitem [Grass 2] [ newent mapmodel 20 ] +menuitem [Grass 2 (Dry)] [ newent mapmodel 21 ] +menuitem [Grass 2 (Snow)] [ newent mapmodel 22 ] +menuitem [Plant 1] [ newent mapmodel 23 ] +menuitem [Plant 1 (Dry)] [ newent mapmodel 24 ] +menuitem [Plant 1 (Snow)] [ newent mapmodel 25 ] +menuitem [Tree trunk] [ newent mapmodel 130 ] +menuitem [Tree 1] [ newent mapmodel 114 ] [ echo $tree_warning ] +menuitem [Tree 2] [ newent mapmodel 117 ] [ echo $tree_warning ] +menuitem [Pine tree] [ newent mapmodel 118 ] [ echo $tree_warning ] +menuitem [Palm tree] [ newent mapmodel 115 ] [ echo $tree_warning ] newmenu Office -menuitem "Office chair" [ newent mapmodel 27 ] -menuitem "Locker" [ newent mapmodel 30 ] -menuitem "Air Conditioner (Outer)" [ newent mapmodel 60 ] -menuitem "Air Conditioner (Inner)" [ newent mapmodel 107 ] -menuitem "Office desk" [ newent mapmodel 71 ] -menuitem "Ceiling fan" [ saycommand "/newent mapmodel 113 " ] +menuitem [Office chair] [ newent mapmodel 27 ] +menuitem [Locker] [ newent mapmodel 30 ] +menuitem [Air Conditioner (Outer)] [ newent mapmodel 60 ] +menuitem [Air Conditioner (Inner)] [ newent mapmodel 107 ] +menuitem [Office desk] [ newent mapmodel 71 ] +menuitem [Ceiling fan] [ saycommand "/newent mapmodel 113 " ] newmenu Lights -menuitem "Strahler" [ saycommand /newent mapmodel 31 ] -menuitem "Fluorescent lamp" [ saycommand "/newent mapmodel 32 " ] -menuitem "LightBulb" [ saycommand "/newent mapmodel 33 " ] -menuitem "Hanging lamp" [ saycommand "/newent mapmodel 132 " ] -menuitem "Alarm lamp" [ saycommand "/newent mapmodel 141 " ] -menuitem "Plate lamp" [ saycommand "/newent mapmodel 142 " ] -menuitem "Street light" [ newent mapmodel 7 ] -menuitem "Street light (2)" [ newent mapmodel 143 ] +menuitem [Strahler] [ saycommand /newent mapmodel 31 ] +menuitem [Fluorescent lamp] [ saycommand "/newent mapmodel 32 " ] +menuitem [LightBulb] [ saycommand "/newent mapmodel 33 " ] +menuitem [Hanging lamp] [ saycommand "/newent mapmodel 132 " ] +menuitem [Alarm lamp] [ saycommand "/newent mapmodel 141 " ] +menuitem [Plate lamp] [ saycommand "/newent mapmodel 142 " ] +menuitem [Street light] [ newent mapmodel 7 ] +menuitem [Street light (2)] [ newent mapmodel 143 ] newmenu Industrial -menuitem "Barrel" [ newent mapmodel 34 ] -menuitem "Knocked-over barrel" [ newent mapmodel 35 ] -menuitem "Electric meter" [ newent mapmodel 36 ] -menuitem "Pallette" [ newent mapmodel 37 ] -menuitem "Gastank" [ newent mapmodel 38 ] -menuitem "Grate (horizontal)" [ newent mapmodel 39 ] -menuitem "Grate (vertical)" [ newent mapmodel 40 ] -menuitem "Wrench" [ newent mapmodel 41 ] -menuitem "Bolt" [ newent mapmodel 42 ] -menuitem "Hook" [ newent mapmodel 52 ] -menuitem "Cinderblock" [ newent mapmodel 62 ] -menuitem "Radioactive drum" [ newent mapmodel 81 ] -menuitem "Knocked-over radioactive drum" [ newent mapmodel 82 ] -menuitem "Swiveling security camera" [ saycommand "/newent mapmodel 77 " ] -menuitem "Camera mount (Vertical)" [ saycommand "/newent mapmodel 104 " ] -menuitem "Camera mount (Wall)" [ saycommand "/newent mapmodel 105 " ] -menuitem "Large concrete pipe" [ newent mapmodel 108 ] -menuitem "Medium metal pipe" [ newent mapmodel 109 ] -menuitem "Small metal pipe" [ newent mapmodel 110 ] -menuitem "Vent flap" [ newent mapmodel 133 ] +menuitem [Barrel] [ newent mapmodel 34 ] +menuitem [Knocked-over barrel] [ newent mapmodel 35 ] +menuitem [Electric meter] [ newent mapmodel 36 ] +menuitem [Pallette] [ newent mapmodel 37 ] +menuitem [Gastank] [ newent mapmodel 38 ] +menuitem [Grate (horizontal)] [ newent mapmodel 39 ] +menuitem [Grate (vertical)] [ newent mapmodel 40 ] +menuitem [Wrench] [ newent mapmodel 41 ] +menuitem [Bolt] [ newent mapmodel 42 ] +menuitem [Hook] [ newent mapmodel 52 ] +menuitem [Cinderblock] [ newent mapmodel 62 ] +menuitem [Radioactive drum] [ newent mapmodel 81 ] +menuitem [Knocked-over radioactive drum] [ newent mapmodel 82 ] +menuitem [Swiveling security camera] [ saycommand "/newent mapmodel 77 " ] +menuitem [Camera mount (Vertical)] [ saycommand "/newent mapmodel 104 " ] +menuitem [Camera mount (Wall)] [ saycommand "/newent mapmodel 105 " ] +menuitem [Large concrete pipe] [ newent mapmodel 108 ] +menuitem [Medium metal pipe] [ newent mapmodel 109 ] +menuitem [Small metal pipe] [ newent mapmodel 110 ] +menuitem [Vent flap] [ newent mapmodel 133 ] newmenu Fencing -menuitem "Wire fence" [ newent mapmodel 13 ] -menuitem "Wire fencepost" [ newent mapmodel 14 ] -menuitem "Open wire fence-gate" [ newent mapmodel 15 ] -menuitem "Closed wire fence-gate" [ newent mapmodel 16 ] -menuitem "Barbwire fence-top" [ newent mapmodel 127 ] -menuitem "" -1 -menuitem "Corrugated fence" [ newent mapmodel 102 ] -menuitem "Corrugated fence 2" [ newent mapmodel 103 ] -menuitem "Corrugated fence post" [ newent mapmodel 66 ] -menuitem "" -1 -menuitem "Guard rail" [ newent mapmodel 67 ] -menuitem "Guard rail 2" [ newent mapmodel 68 ] -menuitem "Guard rail pole" [ newent mapmodel 106 ] +menuitem [Wire fence] [ newent mapmodel 13 ] +menuitem [Wire fencepost] [ newent mapmodel 14 ] +menuitem [Open wire fence-gate] [ newent mapmodel 15 ] +menuitem [Closed wire fence-gate] [ newent mapmodel 16 ] +menuitem [Barbwire fence-top] [ newent mapmodel 127 ] +menuitem [] -1 +menuitem [Corrugated fence] [ newent mapmodel 102 ] +menuitem [Corrugated fence 2] [ newent mapmodel 103 ] +menuitem [Corrugated fence post] [ newent mapmodel 66 ] +menuitem [] -1 +menuitem [Guard rail] [ newent mapmodel 67 ] +menuitem [Guard rail 2] [ newent mapmodel 68 ] +menuitem [Guard rail pole] [ newent mapmodel 106 ] newmenu Signs -menuitem "Flammable" [ saycommand "/newent mapmodel 43 " ] -menuitem "Speed Limit 5" [ saycommand "/newent mapmodel 44 " ] -menuitem "Maintenance" [ saycommand "/newent mapmodel 45 " ] -menuitem "Caution" [ saycommand "/newent mapmodel 46 " ] -menuitem "Biohazard" [ saycommand "/newent mapmodel 47 " ] -menuitem "Toxic" [ saycommand "/newent mapmodel 92 " ] -menuitem "Biohazard (2)" [ saycommand "/newent mapmodel 89 " ] -menuitem "Chemicals" [ saycommand "/newent mapmodel 90 " ] -menuitem "Confined space" [ saycommand "/newent mapmodel 91 " ] -menuitem "Do not enter!" [ saycommand "/newent mapmodel 93 " ] -menuitem "Explosives" [ saycommand "/newent mapmodel 94 " ] -menuitem "First aid" [ saycommand "/newent mapmodel 95 " ] -menuitem "No entry" [ saycommand "/newent mapmodel 96 " ] -menuitem "No smoking" [ saycommand "/newent mapmodel 97 " ] -menuitem "Radioactive" [ saycommand "/newent mapmodel 98 " ] -menuitem "Restricted area" [ saycommand "/newent mapmodel 99 " ] -menuitem "Arab" [ saycommand "/newent mapmodel 111 " ] -menuitem "Wanted Poster" [ saycommand "/newent mapmodel 55 " ] +menuitem [Flammable] [ saycommand "/newent mapmodel 43 " ] +menuitem [Speed Limit 5] [ saycommand "/newent mapmodel 44 " ] +menuitem [Maintenance] [ saycommand "/newent mapmodel 45 " ] +menuitem [Caution] [ saycommand "/newent mapmodel 46 " ] +menuitem [Biohazard] [ saycommand "/newent mapmodel 47 " ] +menuitem [Toxic] [ saycommand "/newent mapmodel 92 " ] +menuitem [Biohazard (2)] [ saycommand "/newent mapmodel 89 " ] +menuitem [Chemicals] [ saycommand "/newent mapmodel 90 " ] +menuitem [Confined space] [ saycommand "/newent mapmodel 91 " ] +menuitem [Do not enter!] [ saycommand "/newent mapmodel 93 " ] +menuitem [Explosives] [ saycommand "/newent mapmodel 94 " ] +menuitem [First aid] [ saycommand "/newent mapmodel 95 " ] +menuitem [No entry] [ saycommand "/newent mapmodel 96 " ] +menuitem [No smoking] [ saycommand "/newent mapmodel 97 " ] +menuitem [Radioactive] [ saycommand "/newent mapmodel 98 " ] +menuitem [Restricted area] [ saycommand "/newent mapmodel 99 " ] +menuitem [Arab] [ saycommand "/newent mapmodel 111 " ] +menuitem [Wanted Poster] [ saycommand "/newent mapmodel 55 " ] newmenu Other -menuitem "Cigarette" [ newent mapmodel 48 ] -menuitem "Can" [ newent mapmodel 49 ] -menuitem "Fallen Can" [ newent mapmodel 50 ] -menuitem "Broken Wood" [ newent mapmodel 51 ] -menuitem "Coffee" [ newent mapmodel 53 ] -menuitem "Flyer" [ newent mapmodel 54 ] -menuitem "Tree Flyer" [ newent mapmodel 26 ] -menuitem "Potato box" [ newent mapmodel 56 ] -menuitem "Cardboard box" [ newent mapmodel 131 ] +menuitem [Cigarette] [ newent mapmodel 48 ] +menuitem [Can] [ newent mapmodel 49 ] +menuitem [Fallen Can] [ newent mapmodel 50 ] +menuitem [Broken Wood] [ newent mapmodel 51 ] +menuitem [Coffee] [ newent mapmodel 53 ] +menuitem [Flyer] [ newent mapmodel 54 ] +menuitem [Tree Flyer] [ newent mapmodel 26 ] +menuitem [Potato box] [ newent mapmodel 56 ] +menuitem [Cardboard box] [ newent mapmodel 131 ] -newmenu "Ambient sounds" +newmenu [Ambient sounds] -menuinit [ ambientsoundmenu = "" ] -menuitem "Cave drip" [ ambientsoundmenu = 0; showmenu "Ambient sound settings" ] -menuitem "Cars driving in the distance" [ ambientsoundmenu = 1; showmenu "Ambient sound settings" ] -menuitem "Humm (01)" [ ambientsoundmenu = 2; showmenu "Ambient sound settings" ] -menuitem "Humm (02)" [ ambientsoundmenu = 3; showmenu "Ambient sound settings" ] -menuitem "Crickets at night" [ ambientsoundmenu = 4; showmenu "Ambient sound settings" ] -menuitem "Water (01)" [ ambientsoundmenu = 5; showmenu "Ambient sound settings" ] -menuitem "Wind" [ ambientsoundmenu = 6; showmenu "Ambient sound settings" ] -menuitem "Air conditioner" [ ambientsoundmenu = 7; showmenu "Ambient sound settings" ] -menuitem "Compressor" [ ambientsoundmenu = 8; showmenu "Ambient sound settings" ] -menuitem "Crow" [ ambientsoundmenu = 9; showmenu "Ambient sound settings" ] -menuitem "Dogs (01)" [ ambientsoundmenu = 10; showmenu "Ambient sound settings" ] -menuitem "Helicopter" [ ambientsoundmenu = 11; showmenu "Ambient sound settings" ] -menuitem "Humm (03)" [ ambientsoundmenu = 12; showmenu "Ambient sound settings" ] -menuitem "Humm (04)" [ ambientsoundmenu = 13; showmenu "Ambient sound settings" ] -menuitem "Humm (05)" [ ambientsoundmenu = 14; showmenu "Ambient sound settings" ] -menuitem "Humm (06)" [ ambientsoundmenu = 15; showmenu "Ambient sound settings" ] -menuitem "Dogs (02)" [ ambientsoundmenu = 16; showmenu "Ambient sound settings" ] -menuitem "Night (01)" [ ambientsoundmenu = 17; showmenu "Ambient sound settings" ] -menuitem "Night (02)" [ ambientsoundmenu = 18; showmenu "Ambient sound settings" ] -menuitem "Radio comms" [ ambientsoundmenu = 19; showmenu "Ambient sound settings" ] -menuitem "Radio static" [ ambientsoundmenu = 20; showmenu "Ambient sound settings" ] -menuitem "Sat-coms" [ ambientsoundmenu = 21; showmenu "Ambient sound settings" ] -menuitem "Sludge" [ ambientsoundmenu = 22; showmenu "Ambient sound settings" ] -menuitem "Static (01)" [ ambientsoundmenu = 23; showmenu "Ambient sound settings" ] -menuitem "Static (02)" [ ambientsoundmenu = 24; showmenu "Ambient sound settings" ] -menuitem "Vent (01)" [ ambientsoundmenu = 25; showmenu "Ambient sound settings" ] -menuitem "Vent (02)" [ ambientsoundmenu = 26; showmenu "Ambient sound settings" ] -menuitem "Water owl" [ ambientsoundmenu = 27; showmenu "Ambient sound settings" ] -menuitem "Water (02)" [ ambientsoundmenu = 28; showmenu "Ambient sound settings" ] -menuitem "Water drip" [ ambientsoundmenu = 29; showmenu "Ambient sound settings" ] -menuitem "Wind (02)" [ ambientsoundmenu = 30; showmenu "Ambient sound settings" ] -menuitem "Waterpipes (01)" [ ambientsoundmenu = 31; showmenu "Ambient sound settings" ] -menuitem "Waterpipes (02)" [ ambientsoundmenu = 32; showmenu "Ambient sound settings" ] -menuitem "Warning alarm" [ ambientsoundmenu = 33; showmenu "Ambient sound settings" ] -menuitem "Gastank" [ ambientsoundmenu = 34; showmenu "Ambient sound settings" ] -menuitem "Keyboard" [ ambientsoundmenu = 35; showmenu "Ambient sound settings" ] -menuitem "Factory" [ ambientsoundmenu = 36; showmenu "Ambient sound settings" ] -menuitem "Vent (03)" [ ambientsoundmenu = 37; showmenu "Ambient sound settings" ] -menuitem "Waterfront" [ ambientsoundmenu = 38; showmenu "Ambient sound settings" ] -menuitem "Generator" [ ambientsoundmenu = 39; showmenu "Ambient sound settings" ] -menuitem "Electric buzz" [ ambientsoundmenu = 40; showmenu "Ambient sound settings" ] -menuitem "Alarm" [ ambientsoundmenu = 41; showmenu "Ambient sound settings" ] -menuitem "Flies" [ ambientsoundmenu = 42; showmenu "Ambient sound settings" ] -menuitem "Desert hawk" [ ambientsoundmenu = 43; showmenu "Ambient sound settings" ] -menuitem "Owl" [ ambientsoundmenu = 44; showmenu "Ambient sound settings" ] -menuitem "City birds" [ ambientsoundmenu = 45; showmenu "Ambient sound settings" ] +menuinit [ ambientsoundmenu = [] ] +menuitem [Cave drip] [ ambientsoundmenu = 0; showmenu "Ambient sound settings" ] +menuitem [Cars driving in the distance] [ ambientsoundmenu = 1; showmenu "Ambient sound settings" ] +menuitem [Humm (01)] [ ambientsoundmenu = 2; showmenu "Ambient sound settings" ] +menuitem [Humm (02)] [ ambientsoundmenu = 3; showmenu "Ambient sound settings" ] +menuitem [Crickets at night] [ ambientsoundmenu = 4; showmenu "Ambient sound settings" ] +menuitem [Water (01)] [ ambientsoundmenu = 5; showmenu "Ambient sound settings" ] +menuitem [Wind] [ ambientsoundmenu = 6; showmenu "Ambient sound settings" ] +menuitem [Air conditioner] [ ambientsoundmenu = 7; showmenu "Ambient sound settings" ] +menuitem [Compressor] [ ambientsoundmenu = 8; showmenu "Ambient sound settings" ] +menuitem [Crow] [ ambientsoundmenu = 9; showmenu "Ambient sound settings" ] +menuitem [Dogs (01)] [ ambientsoundmenu = 10; showmenu "Ambient sound settings" ] +menuitem [Helicopter] [ ambientsoundmenu = 11; showmenu "Ambient sound settings" ] +menuitem [Humm (03)] [ ambientsoundmenu = 12; showmenu "Ambient sound settings" ] +menuitem [Humm (04)] [ ambientsoundmenu = 13; showmenu "Ambient sound settings" ] +menuitem [Humm (05)] [ ambientsoundmenu = 14; showmenu "Ambient sound settings" ] +menuitem [Humm (06)] [ ambientsoundmenu = 15; showmenu "Ambient sound settings" ] +menuitem [Dogs (02)] [ ambientsoundmenu = 16; showmenu "Ambient sound settings" ] +menuitem [Night (01)] [ ambientsoundmenu = 17; showmenu "Ambient sound settings" ] +menuitem [Night (02)] [ ambientsoundmenu = 18; showmenu "Ambient sound settings" ] +menuitem [Radio comms] [ ambientsoundmenu = 19; showmenu "Ambient sound settings" ] +menuitem [Radio static] [ ambientsoundmenu = 20; showmenu "Ambient sound settings" ] +menuitem [Sat-coms] [ ambientsoundmenu = 21; showmenu "Ambient sound settings" ] +menuitem [Sludge] [ ambientsoundmenu = 22; showmenu "Ambient sound settings" ] +menuitem [Static (01)] [ ambientsoundmenu = 23; showmenu "Ambient sound settings" ] +menuitem [Static (02)] [ ambientsoundmenu = 24; showmenu "Ambient sound settings" ] +menuitem [Vent (01)] [ ambientsoundmenu = 25; showmenu "Ambient sound settings" ] +menuitem [Vent (02)] [ ambientsoundmenu = 26; showmenu "Ambient sound settings" ] +menuitem [Water owl] [ ambientsoundmenu = 27; showmenu "Ambient sound settings" ] +menuitem [Water (02)] [ ambientsoundmenu = 28; showmenu "Ambient sound settings" ] +menuitem [Water drip] [ ambientsoundmenu = 29; showmenu "Ambient sound settings" ] +menuitem [Wind (02)] [ ambientsoundmenu = 30; showmenu "Ambient sound settings" ] +menuitem [Waterpipes (01)] [ ambientsoundmenu = 31; showmenu "Ambient sound settings" ] +menuitem [Waterpipes (02)] [ ambientsoundmenu = 32; showmenu "Ambient sound settings" ] +menuitem [Warning alarm] [ ambientsoundmenu = 33; showmenu "Ambient sound settings" ] +menuitem [Gastank] [ ambientsoundmenu = 34; showmenu "Ambient sound settings" ] +menuitem [Keyboard] [ ambientsoundmenu = 35; showmenu "Ambient sound settings" ] +menuitem [Factory] [ ambientsoundmenu = 36; showmenu "Ambient sound settings" ] +menuitem [Vent (03)] [ ambientsoundmenu = 37; showmenu "Ambient sound settings" ] +menuitem [Waterfront] [ ambientsoundmenu = 38; showmenu "Ambient sound settings" ] +menuitem [Generator] [ ambientsoundmenu = 39; showmenu "Ambient sound settings" ] +menuitem [Electric buzz] [ ambientsoundmenu = 40; showmenu "Ambient sound settings" ] +menuitem [Alarm] [ ambientsoundmenu = 41; showmenu "Ambient sound settings" ] +menuitem [Flies] [ ambientsoundmenu = 42; showmenu "Ambient sound settings" ] +menuitem [Desert hawk] [ ambientsoundmenu = 43; showmenu "Ambient sound settings" ] +menuitem [Owl] [ ambientsoundmenu = 44; showmenu "Ambient sound settings" ] +menuitem [City birds] [ ambientsoundmenu = 45; showmenu "Ambient sound settings" ] soundrad = 1; soundsize = 0; ambientsoundvol = 255 -newmenu "Ambient sound settings" +newmenu [Ambient sound settings] menuinit [ soundrad = 1; soundsize = 0; ambientsoundvol = 255 ] -menuitemslider "Sound radius: " 1 25 "$soundrad" 1 "" [ soundrad = $arg1 ] -menuitemslider "Sound size: " 0 25 "$soundsize" 1 "" [ soundsize = $arg1 ] -menuitemslider "Sound volume: " 1 255 "$ambientsoundvol" 5 "" [ ambientsoundvol = $arg1 ] +menuitemslider [Sound radius: ] 1 25 "$soundrad" 1 [] [ soundrad = $arg1 ] +menuitemslider [Sound size: ] 0 25 "$soundsize" 1 [] [ soundsize = $arg1 ] +menuitemslider [Sound volume: ] 1 255 "$ambientsoundvol" 5 [] [ ambientsoundvol = $arg1 ] menuitem " 2 [ OK ]" [ newent sound $ambientsoundmenu $soundrad $soundsize $ambientsoundvol ] -newmenu "Editing settings" -menuitemslider "Grid/Selection style: " 0 1 "$oldselstyle" 1 [ "triangles" "squares (default)" ] [ oldselstyle $arg1 ] -menuitemslider "Fly speeds multiplier: " 1 5 "$flyspeed" 1 "" [ flyspeed $arg1 ] -menuitemcheckbox "Enable auto save map: " "result $autosavemap" [ autosavemap = $arg1 ] -menuitemslider "Time between auto saves (in milliseconds): " 30000 600000 "$timeBetAutoSaves" 30000 [] [ timeBetAutoSaves = $arg1 ] -menuitemtextinput "Make a map backup (.BAK) every (# auto saves):" "result $numAutoSaveBackups" [ numAutoSaveBackups = $arg1 ] [] 4 \ No newline at end of file +newmenu [Editing settings] +menuitemslider [Grid/Selection style: ] 0 1 "$oldselstyle" 1 [triangles "squares (default)"] [ oldselstyle $arg1 ] +menuitemslider Fly speeds multiplier: 1 5 "$flyspeed" 1 [] [ flyspeed $arg1 ] +menuitemcheckbox [Enable auto save map: ] "result $autosavemap" [ autosavemap = $arg1 ] +menuitemslider [Time between auto saves (in milliseconds): ] 30000 600000 "$timeBetAutoSaves" 30000 [] [ timeBetAutoSaves = $arg1 ] +menuitemtextinput [Make a map backup (.BAK) every (# auto saves): ] "result $numAutoSaveBackups" [ numAutoSaveBackups = $arg1 ] [] 4 \ No newline at end of file diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg index 947ba1f4..aca0c35c 100644 --- a/config/menus_multiplayer.cfg +++ b/config/menus_multiplayer.cfg @@ -1,5 +1,5 @@ // Decides whether to open the admin or normal in-game menu. -ingamemenu = [ if (currole) [ showmenu "In-game admin" ] [ showmenu In-game ] ] +ingamemenu = [ if (currole) [ showmenu [In-game admin] ] [ showmenu In-game ] ] // "Join server" menu. personalserverlist = [] @@ -13,223 +13,222 @@ joinservermenu = [ ] // Normal in-game menu that opens when pressing escape and connected to a game. -newmenu "In-game" +newmenu [In-game] -menuitemtextinput "Nickname: " "result $curname" "name $arg1" [ __ingamemenu_showmodel "In-game" 0 ] -menuitem "Change weapon..." "showmenu Weapons" [ __ingamemenu_showmodel "In-game" 0 ] -menuitem "Change to the enemy team" "changeteam" [ __ingamemenu_showmodel "In-game" 0 ] -menuitemvar [result (concat "Change to" (if (> (player1 team) 1) [result "active"] [result "spectate"]) "mode")] "spectate" [ __ingamemenu_showmodel "In-game" 0 ] -menuitem "Change player skin..." [showmenu (at [CLA RVSF] (curteam))] [ __ingamemenu_showmodel "In-game" 1 ] -menuitem "" -1 [__ingamemenu_showmodel "In-game" 0] -menuitem "Set mode/map..." [ showmenu Gamemode ] +menuitemtextinput [Nickname: ] "result $curname" [ name $arg1 ] [ __ingamemenu_showmodel [In-game] 0 ] +menuitem [Change weapon...] [ showmenu Weapons ] [ __ingamemenu_showmodel [In-game] 0 ] +menuitem [Change to the enemy team] changeteam [ __ingamemenu_showmodel [In-game] 0 ] +menuitemvar [result (concat [Change to] (if (> (player1 team) 1) [ result active ] [ result spectate]) mode)] spectate [ __ingamemenu_showmodel [In-game] 0 ] +menuitem [Change player skin...] [showmenu (at [CLA RVSF] (curteam))] [ __ingamemenu_showmodel [In-game] 1 ] +menuitem [] -1 [__ingamemenu_showmodel [In-game] 0] +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 "Download a demo..." [ listdemos; showmenu "Download demo" ] -menuitem "Get additional server information" [ showmenu serverinfo ] -menuitem "" -1 +menuitem [Ignore/Unignore all...] [ if $ingall [ unignoreall ] [ ignoreall ] ] +menuitem [Adjust teams...] [ showmenu [Team adjustment] ] +menuitem [Download a demo...] [ listdemos; showmenu [Download demo] ] +menuitem [Get additional server information] [ showmenu serverinfo ] +menuitem [] -1 menuitem " 4Main menu..." [ closemenu In-game; showmenu main ] -menuitem " 4Browse servers..." [ closemenu "In-game"; joinservermenu ] -menuitem " 3Disconnect from server" [ disconnect ] -menuitem " 3Quit AssaultCube" [ savequit ] +menuitem " 4Browse servers..." [ closemenu In-game; joinservermenu ] +menuitem " 3Disconnect from server" disconnect +menuitem " 3Quit AssaultCube" savequit menuinitselection 13 __ingamemenu_showmodel = [ if (&& (< (curteam) 4) $arg2) [ - chmenumdl $arg1 (concatword "playermodels/" (at "CLA RVSF CLA RVSF" (curteam)) "/0" (+ 1 (skin))) idle 15 3 + chmenumdl $arg1 (concatword "playermodels/" (at [CLA RVSF CLA RVSF] (curteam)) "/0" (+ 1 (skin))) idle 15 3 ] [ chmenumdl $arg1 ] ] // In-game menu that opens if when you press escape if you're admin state and connected to a game. -newmenu "In-game admin" +newmenu [In-game admin] -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 -menuitemtextinput "Nickname: " "result $curname" [ name $arg1 ] -menuitem "Change weapon..." "showmenu Weapons" [ __ingamemenu_showmodel "In-game admin" 0 ] -menuitem "Change to the enemy team" "changeteam" [ __ingamemenu_showmodel "In-game admin" 1 ] -menuitemvar [result (concat "Change to" (if (> (player1 team) 1) [result "active"] [result "spectate"]) "mode")] "spectate" [ __ingamemenu_showmodel "In-game admin" 1 ] -menuitem "Change player skin..." [ showmenu (at [CLA RVSF] (curteam)) ] [ __ingamemenu_showmodel "In-game admin" 1 ] -menuitem "Demos..." "showmenu Demo" [ __ingamemenu_showmodel "In-game admin" 0 ] -menuitem "" -1 -menuitem " 4Main menu..." [ closemenu "In-game admin"; showmenu main ] -menuitem " 4Browse servers..." [ closemenu "In-game admin"; joinservermenu ] -menuitem " 3Disconnect from server" [ disconnect ] -menuitem " 3Quit AssaultCube" [ savequit ] +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 +menuitemtextinput [Nickname: ] "result $curname" [ name $arg1 ] +menuitem [Change weapon...] [ showmenu Weapons ] [ __ingamemenu_showmodel [In-game admin] 0 ] +menuitem [Change to the enemy team] changeteam [ __ingamemenu_showmodel [In-game admin] 1 ] +menuitemvar [result (concat [Change to] (if (> (player1 team) 1) [ result active ] [ result spectate ]) mode)] spectate [ __ingamemenu_showmodel [In-game admin] 1 ] +menuitem [Change player skin...] [ showmenu (at [CLA RVSF] (curteam)) ] [ __ingamemenu_showmodel [In-game admin] 1 ] +menuitem [Demos...] [ showmenu Demo ] [ __ingamemenu_showmodel "In-game admin" 0 ] +menuitem [] -1 +menuitem " 4Main menu..." [ closemenu [In-game admin]; showmenu main ] +menuitem " 4Browse servers..." [ closemenu [In-game admin]; joinservermenu ] +menuitem " 3Disconnect from server" disconnect +menuitem " 3Quit AssaultCube" savequit menuinitselection 16 // 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; showmenu server ] -menuitem "Custom connect" [ showmenu "Custom connect" ] -menuitem "Connect as Admin" [ showmenu "Admin connect" ] -menuitem "" -1 -menuitem "Force serverlist update" [ updatefrommaster 1; showmenu server ] +menuitem [Join a server] joinservermenu +menuitem [Join a LAN server] [ searchlan 2; showallservers 0; showmenu server ] +menuitem [Custom connect] [ showmenu [Custom connect] ] +menuitem [Connect as Admin] [ showmenu [Admin connect] ] +menuitem [] -1 +menuitem [Force serverlist update] [ updatefrommaster 1; showmenu server ] // Fancy custom connect menu. -newmenu "Custom connect" +newmenu [Custom connect] -menuinit [ cc1 = ""; cc2 = ""; cc3 = "" ] // Resets the aliases -menuitemtextinput "Server IP/DNS: " "" [ cc1 = $arg1 ] "" 255 -menuitemtextinput "Server port (optional): " "" [ cc2 = $arg1 ] "" 6 -menuitemtextinput "Server password (optional): " "" [ cc3 = $arg1 ] "" 128 -menuitem "" -1 +menuinit [ cc1 = []; cc2 = []; cc3 = [] ] // Resets the aliases +menuitemtextinput [Server IP/DNS: ] [] [ cc1 = $arg1 ] [] 255 +menuitemtextinput [Server port (optional): ] [] [ cc2 = $arg1 ] [] 6 +menuitemtextinput [Server password (optional): ] [] [ cc3 = $arg1 ] [] 128 +menuitem [] -1 menuitem " 2 [ Connect ] " [ connect $cc1 $cc2 $cc3 ] // Connect to a menu as admin. -newmenu "Admin connect" +newmenu [Admin connect] -menuinit [ acc1 = ""; acc2 = ""; acc3 = ""; echo (red)To 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: " "" [ acc1 = $arg1 ] "" 255 -menuitemtextinput "Server port (optional): " "" [ acc2 = $arg1 ] "" 6 -menuitemtextinput "Server admin password: " "" [ acc3 = $arg1 ] "" 128 -menuitem "" -1 +menuinit [ acc1 = []; acc2 = []; acc3 = []; echo (red)To 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: ] [] [ acc1 = $arg1 ] [] 255 +menuitemtextinput [Server port (optional): ] [] [ acc2 = $arg1 ] [] 6 +menuitemtextinput [Server admin password: ] [] [ acc3 = $arg1 ] [] 128 +menuitem [] -1 menuitem " 2 [ Admin connect ] " [ 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) ] +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) ] // TODO: more reasons //menuitem "" [ _kickbanreason = ""; showmenu (concat $_kickbanaction player) ] -menuitemtextinput "Reason: " "" [ _kickbanreason = $arg1 ] "" 255 +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] [ _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 ] +menuitem [Remove all bans] removebans -newmenu "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 ] +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 ] newmenu Gamemode -menuitem "Team Deathmatch" [ mode 0; showmenu maps ] -menuitem "Deathmatch" [ mode 2; showmenu maps ] -menuitem "Team Survivor" [ mode 4; showmenu maps ] -menuitem "Survivor" [ mode 3; showmenu maps ] -menuitem "Capture the Flag" [ mode 5; showmenu maps_flags ] -menuitem "Hunt the Flag" [ mode 13; showmenu maps ] -menuitem "Keep the Flag" [ mode 15; showmenu maps_flags ] -menuitem "Team Keep the Flag" [ mode 14; showmenu maps_flags ] -menuitem "Team Pistol Frenzy" [ mode 16; showmenu maps ] -menuitem "Pistol Frenzy" [ mode 6; showmenu maps ] -menuitem "Team Last Swiss Standing" [ mode 17; showmenu maps ] -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 ] +menuitem [Team Deathmatch] [ mode 0; showmenu maps ] +menuitem [Deathmatch] [ mode 2; showmenu maps ] +menuitem [Team Survivor] [ mode 4; showmenu maps ] +menuitem [Survivor] [ mode 3; showmenu maps ] +menuitem [Capture the Flag] [ mode 5; showmenu maps_flags ] +menuitem [Hunt the Flag] [ mode 13; showmenu maps ] +menuitem [Keep the Flag] [ mode 15; showmenu maps_flags ] +menuitem [Team Keep the Flag] [ mode 14; showmenu maps_flags ] +menuitem [Team Pistol Frenzy] [ mode 16; showmenu maps ] +menuitem [Pistol Frenzy] [ mode 6; showmenu maps ] +menuitem [Team Last Swiss Standing] [ mode 17; showmenu maps ] +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 -menuitem "Unlock the server (open)" [ mastermode 0 ] -menuitem "Lock the server (private)" [ mastermode 1 ] -menuitem "Lock the server (match mode)" [ mastermode 2 ] +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 -menuitem "Turn auto-team on" [ autoteam 1 ] -menuitem "Turn auto-team off" [ autoteam 0 ] +menuitem [Turn auto-team on] [ autoteam 1 ] +menuitem [Turn auto-team off] [ autoteam 0 ] -newmenu "serverbrowser help" +newmenu [serverbrowser help] -menuitem "F1: Display this help menu" -1 -menuitem "F3: Search for players by nickname..." [ showmenu "search player" ] -menuitem "F4: Edit favourites..." [ showmenu "edit favourites" ] -menuitem "F5: Update the serverlist from the masterserver" [ updatefrommaster 1; closemenu "serverbrowser help" ] -menuitem "F9: Get additional server information" [ showmenu serverinfo ] -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 ] -menuitemslider "Favourites tag column: " 0 2 "$serverbrowserhidefavtag" 1 [ "Show always" "Show when used" "Hide always"] [ serverbrowserhidefavtag $arg1 ] -menuitemslider "Server IP & port: " 0 2 "$serverbrowserhideip" 1 [ "Show" "Show in grey" "Hide"] [ serverbrowserhideip $arg1 ] -menuitemslider "Sort servers by: " 0 7 "$serversort" 1 [ "Ping" "Number of players" "Max players" "Minutes remaining" "Map name" "Gamemode" "IP address" "Server description"] [ serversort $arg1 ] +menuitem [F1: Display this help menu] -1 +menuitem [F3: Search for players by nickname...] [ showmenu [search player] ] +menuitem [F4: Edit favourites...] [ showmenu [edit favourites] ] +menuitem [F5: Update the serverlist from the masterserver] [ updatefrommaster 1; closemenu [serverbrowser help] ] +menuitem [F9: Get additional server information] [ showmenu serverinfo ] +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 ] +menuitemslider [Favourites tag column: ] 0 2 "$serverbrowserhidefavtag" 1 ["Show always" "Show when used" "Hide always"] [ serverbrowserhidefavtag $arg1 ] +menuitemslider [Server IP & port: ] 0 2 "$serverbrowserhideip" 1 [Show "Show in grey" Hide] [ serverbrowserhideip $arg1 ] +menuitemslider [Sort servers by: ] 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" +newmenu [password required] -menuinit [ sbpwd = "" ] // Resets the aliases +menuinit [ sbpwd = [] ] // Resets the aliases menuitemvar [result $sbmsg] -menuitem "You need a password to join it." -1 -menuitem "" -1 -menuitemtextinput "Password: " "" "sbpwd = $arg1" "" 128 -menuitem "" -1 -menuitem " 2 [ Connect ] " "echo connecting to $sbdesc ; connect $sbdns $sbport $sbpwd" +menuitem [You need a password to join it.] -1 +menuitem [] -1 +menuitemtextinput [Password: ] [] [ sbpwd = $arg1 ] [] 128 +menuitem [] -1 +menuitem " 2 [ Connect ] " [ echo connecting to $sbdesc ; connect $sbdns $sbport $sbpwd ] menuinitselection 3 addfavcatmenu = [ i = (+ 1 (findlist (listfavcats) $arg1)) - newmenu "edit favourites" + newmenu [edit favourites] if (< $i 11) [ menuitemvar (concatword "concat " (mod $i 10) ": $" sbfavourite_ $arg1 _desc " (concatword < s $" sbfavourite_ $arg1 _tag " r>)") (concatword "showmenu [favourites " $i "]") - newmenu "serverbrowser help" + newmenu [serverbrowser help] menuitemvar (concatword "concat " $i ": Toggle category $" sbfavourite_ $arg1 _desc " (concatword < s $" sbfavourite_ $arg1 _tag " r>)") -1 ] [ menuitemvar (concatword "result $" sbfavourite_ $arg1 _desc " (concatword < s $" sbfavourite_ $arg1 _tag " r>)") (concatword "showmenu [favourites " $i "]") ] newmenu (concat favourites $i) - 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: " 0 100 (concatword "$" sbfavourite_ $arg1 _red) 10 "" (concatword sbfavourite_ $arg1 _red " = $arg1") - menuitemslider "Background green: " 0 100 (concatword "$" sbfavourite_ $arg1 _green) 10 "" (concatword sbfavourite_ $arg1 _green " = $arg1") - menuitemslider "Background blue: " 0 100 (concatword "$" sbfavourite_ $arg1 _blue) 10 "" (concatword sbfavourite_ $arg1 _blue " = $arg1") - menuitemslider "Background alpha: " 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 ] + 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: ] 0 100 (concatword "$" sbfavourite_ $arg1 _red) 10 [] (concatword sbfavourite_ $arg1 _red " = $arg1") + menuitemslider [Background green: ] 0 100 (concatword "$" sbfavourite_ $arg1 _green) 10 [] (concatword sbfavourite_ $arg1 _green " = $arg1") + menuitemslider [Background blue: ] 0 100 (concatword "$" sbfavourite_ $arg1 _blue) 10 [] (concatword sbfavourite_ $arg1 _blue " = $arg1") + menuitemslider [Background alpha: ] 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 ] ] addallfavcatmenus = [ - newmenu "serverbrowser help" - menuitem "" -1 - menuitem "Keys to add/remove servers from categories:" -1 + newmenu [serverbrowser help] + menuitem [] -1 + menuitem [Keys to add/remove servers from categories:] -1 loop ii (listlen (listfavcats)) [ addfavcatmenu (at (listfavcats) $ii) ] ] -lastsearchname = "" +lastsearchname = [] +newmenu [search player] -newmenu "search player" - -menuitemtextinput "Search servers for a player: " "result $lastsearchname" [ lastsearchname = $arg1 ] -menuitem " 2 [ Search ]" [ closemenu "Search for a player"; searchnickname $lastsearchname] +menuitemtextinput [Search servers for a player: ] "result $lastsearchname" [ lastsearchname = $arg1 ] +menuitem " 2 [ Search ]" [ closemenu [Search for a player]; searchnickname $lastsearchname] menuinitselection 1 newmenu getmap -menuitem " This server is using a different version of this map..." -1 -menuitem "" -1 +menuitem [ This server is using a different version of this map...] -1 +menuitem [] -1 menuitemvar "result $__getmaprevisions" -menuitem "" -1 +menuitem [] -1 menuitem " 2 [ Download the servers map version and join the game ]" [ getmap ] menuitem " 3 [ Keep the local map version and disconnect from the server ]" [ showmenu ""; disconnect ] menuinitselection 4 diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index 6a4feef9..44725f45 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -1,60 +1,60 @@ newmenu settings -menuitem "Video settings" [ showmenu video ] -menuitem "Head-Up Display settings" [ showmenu HUD ] -menuitem "Gameplay settings" [ showmenu gameplay ] -menuitem "Keyboard settings" [ showmenu Keyboard ] -menuitem "Mouse settings" [ showmenu Mouse ] -menuitem "Sound settings" [ showmenu sound ] -menuitem "Misc settings" [ showmenu Misc ] -menuitem "" -1 -menuitem "Reset all settings" [ showmenu "Reset settings" ] +menuitem [Video settings] [ showmenu video ] +menuitem [Head-Up Display settings] [ showmenu HUD ] +menuitem [Gameplay settings] [ showmenu gameplay ] +menuitem [Keyboard settings] [ showmenu Keyboard ] +menuitem [Mouse settings] [ showmenu Mouse ] +menuitem [Sound settings] [ showmenu sound ] +menuitem [Misc settings] [ showmenu Misc ] +menuitem [] -1 +menuitem [Reset all settings] [ showmenu [Reset settings] ] newmenu Weapons menumdl weapons/assault/menu mapmodel 75 12 -menuitem "MTP-57 Assault Rifle" [ nextprimary 6; echo MTP-57 Assault Rifle selected ] [ chmenumdl Weapons weapons/assault/menu mapmodel 75 12 ] -menuitem "A-ARD/10 Submachine Gun" [ nextprimary 4; echo A-ARD/10 Submachine Gun selected ] [ chmenumdl Weapons weapons/subgun/menu mapmodel 75 12 ] -menuitem "Precision Tech AD-81 Sniper Rifle" [ nextprimary 5;echo Precision Tech AD-81 Sniper Rifle selected ] [ chmenumdl Weapons weapons/sniper/menu mapmodel 75 12 ] -menuitem "V-19 Combat Shotgun" [ nextprimary 3;echo V-19 Combat Shotgun selected ] [ chmenumdl Weapons weapons/shotgun/menu mapmodel 75 12 ] -menuitem "TMP-M&A Carbine" [ nextprimary 2;echo TMP-M&A Carbine selected ] [ chmenumdl Weapons weapons/carbine/menu mapmodel 75 12 ] -// menuitem "Combat Pistol" [ nextprimary 7;echo Combat Pistol selected ] [ chmenumdl Weapons weapons/cpistol/menu mapmodel 75 12 ] +menuitem [MTP-57 Assault Rifle] [ nextprimary 6; echo MTP-57 Assault Rifle selected ] [ chmenumdl Weapons weapons/assault/menu mapmodel 75 12 ] +menuitem [A-ARD/10 Submachine Gun] [ nextprimary 4; echo A-ARD/10 Submachine Gun selected ] [ chmenumdl Weapons weapons/subgun/menu mapmodel 75 12 ] +menuitem [Precision Tech AD-81 Sniper Rifle] [ nextprimary 5;echo Precision Tech AD-81 Sniper Rifle selected ] [ chmenumdl Weapons weapons/sniper/menu mapmodel 75 12 ] +menuitem [V-19 Combat Shotgun] [ nextprimary 3;echo V-19 Combat Shotgun selected ] [ chmenumdl Weapons weapons/shotgun/menu mapmodel 75 12 ] +menuitem [TMP-M&A Carbine] [ nextprimary 2;echo TMP-M&A Carbine selected ] [ chmenumdl Weapons weapons/carbine/menu mapmodel 75 12 ] +// menuitem [Combat Pistol] [ nextprimary 7;echo Combat Pistol selected ] [ chmenumdl Weapons weapons/cpistol/menu mapmodel 75 12 ] newmenu CLA menuinit [ menuselection CLA (skin_cla) ] menumdl playermodels/CLA/01 all 50 4 -menuitem "Comandante" [ skin_cla 0 ] [ chmenumdl CLA playermodels/CLA/01 all 50 4 ] -menuitem "Psycho" [ skin_cla 1 ] [ chmenumdl CLA playermodels/CLA/02 all 50 4 ] -menuitem "Bomber" [ skin_cla 2 ] [ chmenumdl CLA playermodels/CLA/03 all 50 4 ] -menuitem "Ripper" [ skin_cla 3 ] [ chmenumdl CLA playermodels/CLA/04 all 50 4 ] +menuitem [Comandante] [ skin_cla 0 ] [ chmenumdl CLA playermodels/CLA/01 all 50 4 ] +menuitem [Psycho] [ skin_cla 1 ] [ chmenumdl CLA playermodels/CLA/02 all 50 4 ] +menuitem [Bomber] [ skin_cla 2 ] [ chmenumdl CLA playermodels/CLA/03 all 50 4 ] +menuitem [Ripper] [ skin_cla 3 ] [ chmenumdl CLA playermodels/CLA/04 all 50 4 ] newmenu RVSF menuinit [menuselection RVSF (skin_rvsf)] menumdl playermodels/RVSF/01 all 50 4 -menuitem "Alpha" [ skin_rvsf 0 ] [ chmenumdl RVSF playermodels/RVSF/01 all 50 4 ] -menuitem "Tango" [ skin_rvsf 1 ] [ chmenumdl RVSF playermodels/RVSF/02 all 50 4 ] -menuitem "Cobra" [ skin_rvsf 2 ] [ chmenumdl RVSF playermodels/RVSF/03 all 50 4 ] -menuitem "Viper" [ skin_rvsf 3 ] [ chmenumdl RVSF playermodels/RVSF/04 all 50 4 ] -menuitem "Swat" [ skin_rvsf 4 ] [ chmenumdl RVSF playermodels/RVSF/05 all 50 4 ] -menuitem "Police" [ skin_rvsf 5 ] [ chmenumdl RVSF playermodels/RVSF/06 all 50 4 ] +menuitem [Alpha] [ skin_rvsf 0 ] [ chmenumdl RVSF playermodels/RVSF/01 all 50 4 ] +menuitem [Tango] [ skin_rvsf 1 ] [ chmenumdl RVSF playermodels/RVSF/02 all 50 4 ] +menuitem [Cobra] [ skin_rvsf 2 ] [ chmenumdl RVSF playermodels/RVSF/03 all 50 4 ] +menuitem [Viper] [ skin_rvsf 3 ] [ chmenumdl RVSF playermodels/RVSF/04 all 50 4 ] +menuitem [Swat] [ skin_rvsf 4 ] [ chmenumdl RVSF playermodels/RVSF/05 all 50 4 ] +menuitem [Police] [ skin_rvsf 5 ] [ chmenumdl RVSF playermodels/RVSF/06 all 50 4 ] -newmenu "QUICK setup" +newmenu [QUICK setup] -menuitemtextinput "Nickname:" "" [ name $arg1 ] -menuitemtextinput "Resolution (Width): " "$scr_w" [ scr_w $arg1 ] -menuitemtextinput "Resolution (Height): " "$scr_h" [ scr_h $arg1 ] -menuitemtextinput "Mouse sensitivity: " "$sensitivity" [ sensitivity $arg1 ] -menuitemcheckbox "Reduced violence mode: " "$poniesmodeon" [ reducedviolencemode $arg1 ] -menuitemslider "Graphics detail: " 1 6 "$gfxqualityalias" 1 [ Horrible Low Medium Good High "INSANE! (May perform slowly on older gfx)"] [ new_gfx_quality $arg1 ] -menuitemslider "Sound detail: " 1 3 "$soundqualityalias" 1 "Low Medium High" [ new_sound_quality $arg1 ] -menuitemslider "Field of view: " 75 120 "$fov" 2 "" [ fov $arg1 ] -menuitem "" -1 -menuitem " 0 [ OK; View FAQ ]" [ closemenu "QUICK setup"; resetgl; showmenu faq ] -menuitem " 2 [ OK ]" [ closemenu "QUICK setup"; resetgl ] +menuitemtextinput [Nickname:] [] [ name $arg1 ] +menuitemtextinput [Resolution (Width): ] "$scr_w" [ scr_w $arg1 ] +menuitemtextinput [Resolution (Height): ] "$scr_h" [ scr_h $arg1 ] +menuitemtextinput [Mouse sensitivity: ] "$sensitivity" [ sensitivity $arg1 ] +menuitemcheckbox [Reduced violence mode: ] "$poniesmodeon" [ reducedviolencemode $arg1 ] +menuitemslider [Graphics detail: ] 1 6 "$gfxqualityalias" 1 [Horrible Low Medium Good High "INSANE! (May perform slowly on older gfx)"] [ new_gfx_quality $arg1 ] +menuitemslider [Sound detail: ] 1 3 "$soundqualityalias" 1 [Low Medium High] [ new_sound_quality $arg1 ] +menuitemslider [Field of view: ] 75 120 "$fov" 2 [] [ fov $arg1 ] +menuitem [] -1 +menuitem " 0 [ OK; View FAQ ]" [ closemenu [QUICK setup]; resetgl; showmenu faq ] +menuitem " 2 [ OK ]" [ closemenu [QUICK setup]; resetgl ] new_gfx_quality = [ if (= $arg1 6) [ // "INSANE!" gfx quality @@ -228,94 +228,94 @@ new_sound_quality = [ ] ] -newmenu "Reset settings" +newmenu [Reset settings] menuinit [ resetyes = 0 ] // Ensures this menu works correctly. -menuitemcheckbox "Yes, reset all settings: " [ resetyes = 1 ] [ resetyes = $arg1 ] -menuitem " 2 [ Apply! ] " [ if $resetyes [ resetcfg 1; quit ] [ showmenu "" ] ] [ echo (c 3)If the above option is ticked, AssaultCube will now quit and your settings will be reset. ] // If checkbox is ticked, reset settings and quit, otherwise, close menus. +menuitemcheckbox [Yes, reset all settings: ] [ resetyes = 1 ] [ resetyes = $arg1 ] +menuitem " 2 [ Apply! ] " [ if $resetyes [ resetcfg 1; quit ] [ showmenu [] ] ] [ echo (c 3)If the above option is ticked, AssaultCube will now quit and your settings will be reset. ] // If checkbox is ticked, reset settings and quit, otherwise, close menus. newmenu Keyboard -menuitem "Select an action and press ENTER to bind a new key:" -1 -menuitem "" -1 -menuitemkeyinput "Forwards: " forward -menuitemkeyinput "Left: " left -menuitemkeyinput "Backwards: " backward -menuitemkeyinput "Right: " right -menuitemkeyinput "Attack: " attack -menuitemkeyinput "Special action: " altaction -menuitemkeyinput "Jump: " jump -menuitemkeyinput "Crouch: " crouch -menuitemkeyinput "Reload: " reload -menuitemkeyinput "Weapon menu: " showmenu Weapons -menuitemkeyinput "Next weapon: " "universaldelta 1" -menuitemkeyinput "Previous weapon: " "universaldelta -1" -menuitemkeyinput "Show scores: " showscores -menuitemkeyinput "Chat: " saycommand -menuitemkeyinput "Team chat: " "saycommand %" -menuitemkeyinput "Commandline: " "saycommand /" -menuitemkeyinput "Console output: " toggleconsole -menuitemkeyinput "Screenshot: " screenshot -menuitemkeyinput "Map overview: " toggleshowmap -menuitemkeyinput "Drop CTF flag: " dropflag -menuitemkeyinput "Fullscreen: " fullscreenscript -menuitem "" -1 -menuitemtextinput "Lookup a keybind: " [] [ echo ""; echo (concatword (c 9) "Contents of keybind " $arg1 :); echo (keybind $arg1) ] [] 256 -menuitemcheckbox "Use old editing binds?" [ $old_editbinds ] [ old_editbinds = $arg1 ] -menuitem "" -1 -menuitem "Reset keybinds to default settings..." [ showmenu "Reset Binds" ] +menuitem [Select an action and press ENTER to bind a new key:] -1 +menuitem [] -1 +menuitemkeyinput [Forwards: ] forward +menuitemkeyinput [Left: ] left +menuitemkeyinput [Backwards: ] backward +menuitemkeyinput [Right: ] right +menuitemkeyinput [Attack: ] attack +menuitemkeyinput [Special action: ] altaction +menuitemkeyinput [Jump: ] jump +menuitemkeyinput [Crouch: ] crouch +menuitemkeyinput [Reload: ] reload +menuitemkeyinput [Weapon menu: ] "showmenu Weapons" +menuitemkeyinput [Next weapon: ] "universaldelta 1" +menuitemkeyinput [Previous weapon: ] "universaldelta -1" +menuitemkeyinput [Show scores: ] showscores +menuitemkeyinput [Chat: ] saycommand +menuitemkeyinput [Team chat: ] "saycommand %" +menuitemkeyinput [Commandline: ] "saycommand /" +menuitemkeyinput [Console output: ] toggleconsole +menuitemkeyinput [Screenshot: ] screenshot +menuitemkeyinput [Map overview: ] toggleshowmap +menuitemkeyinput [Drop CTF flag: ] dropflag +menuitemkeyinput [Fullscreen: ] fullscreenscript +menuitem [] -1 +menuitemtextinput [Lookup a keybind: ] [] [ echo []; echo (concatword (c 9) [Contents of keybind ] $arg1 :); echo (keybind $arg1) ] [] 256 +menuitemcheckbox [Use old editing binds?] [ $old_editbinds ] [ old_editbinds = $arg1 ] +menuitem [] -1 +menuitem [Reset keybinds to default settings...] [ showmenu [Reset Binds] ] -newmenu "Mouse" -menuitemcheckbox "Invert mouse: " "$invmouse" [ invmouse $arg1 ] -menuitemcheckbox "Automatic Sniper-scope sensitivity: " "$autoscopesens" [ autoscopesens $arg1 ] -menuitemtextinput "Mouse Sensitivity: " "$sensitivity" [ sensitivity $arg1 ] -menuitemtextinput "Mouse Acceleration: " "$mouseaccel" [ mouseaccel $arg1 ] -menuitemtextinput "Filter mouse (for bad ones): " "$mfilter" [ mfilter $arg1 ] -menuitemtextinput "Sniper-scope sensitivity scale: " "$scopesensscale" [ scopesensscale $arg1 ] -menuitem "" -1 -menuitemslider "Crosshair size: " 0 50 "$crosshairsize" 5 "" [ crosshairsize $arg1 ] -menuitem "Change crosshair... " [ showmenu Crosshairs ] -menuitem "Change scope crosshair... " [ showmenu "Scope crosshairs" ] +newmenu Mouse +menuitemcheckbox [Invert mouse: ] "$invmouse" [ invmouse $arg1 ] +menuitemcheckbox [Automatic Sniper-scope sensitivity: ] "$autoscopesens" [ autoscopesens $arg1 ] +menuitemtextinput [Mouse Sensitivity: ] "$sensitivity" [ sensitivity $arg1 ] +menuitemtextinput [Mouse Acceleration: ] "$mouseaccel" [ mouseaccel $arg1 ] +menuitemtextinput [Filter mouse (for bad ones): ] "$mfilter" [ mfilter $arg1 ] +menuitemtextinput [Sniper-scope sensitivity scale: ] "$scopesensscale" [ scopesensscale $arg1 ] +menuitem [] -1 +menuitemslider [Crosshair size: ] 0 50 "$crosshairsize" 5 [] [ crosshairsize $arg1 ] +menuitem [Change crosshair... ] [ showmenu Crosshairs ] +menuitem [Change scope crosshair... ] [ showmenu [Scope crosshairs] ] -newmenu "Crosshairs" -menudirlist "packages/crosshairs" "png" [ loadcrosshair (concatword $arg1 .png) ] 1 +newmenu Crosshairs +menudirlist "packages/crosshairs" png [ loadcrosshair (concatword $arg1 .png) ] 1 -newmenu "Scope crosshairs" -menudirlist "packages/crosshairs" "png" [ loadcrosshair (concatword $arg1 .png) scope ] 1 +newmenu [Scope crosshairs] +menudirlist "packages/crosshairs" png [ loadcrosshair (concatword $arg1 .png) scope ] 1 -newmenu "Reset Binds" +newmenu [Reset Binds] menuinit [ resetbindsyes = 0 ] // Ensures this menu works correctly. -menuitemcheckbox "Yes, reset all binds: " [ resetbindsyes = 1 ] [ resetbindsyes = $arg1 ] -menuitem " 2 [ Apply! ] " [ if $resetbindsyes [ resetbinds ] [ showmenu "" ] ] +menuitemcheckbox [Yes, reset all binds: ] [ resetbindsyes = 1 ] [ resetbindsyes = $arg1 ] +menuitem " 2 [ Apply! ] " [ if $resetbindsyes resetbinds [ showmenu [] ] ] newmenu video -menuitemtextinput "Screen width: " "$scr_w" [ scr_w $arg1 ] "" 11 -menuitemtextinput "Screen height: " "$scr_h" [ scr_h $arg1 ] "" 11 -menuitemslider "Graphics detail: " 1 6 "$gfxqualityalias" 1 [ Horrible Low Medium Good High "INSANE! (May perform slowly on older gfx)"] [ new_gfx_quality $arg1 ] -menuitem "" -1 -menuitemslider "Field of view: " 75 120 "$fov" 2 "" [ fov $arg1 ] -menuitemslider "Gamma: " 30 300 "$gamma" 5 "" [ gamma $arg1 ] -menuitemcheckbox "Fullscreen: " "$fullscreen" [ fullscreen $arg1 ] -menuitemslider "Vsync: " -1 1 "$vsync" 1 "Default Disabled Enabled" [ vsync $arg1 ] -menuitem "" -1 -menuitem "Advanced video settings..." [ showmenu "Advanced video settings" ] -menuitem "" -1 +menuitemtextinput [Screen width: ] "$scr_w" [ scr_w $arg1 ] [] 11 +menuitemtextinput [Screen height: ] "$scr_h" [ scr_h $arg1 ] [] 11 +menuitemslider [Graphics detail: ] 1 6 "$gfxqualityalias" 1 [Horrible Low Medium Good High "INSANE! (May perform slowly on older gfx)"] [ new_gfx_quality $arg1 ] +menuitem [] -1 +menuitemslider [Field of view: ] 75 120 "$fov" 2 [] [ fov $arg1 ] +menuitemslider [Gamma: ] 30 300 "$gamma" 5 [] [ gamma $arg1 ] +menuitemcheckbox [Fullscreen: ] "$fullscreen" [ fullscreen $arg1 ] +menuitemslider [Vsync: ] -1 1 "$vsync" 1 [Default Disabled Enabled] [ vsync $arg1 ] +menuitem [] -1 +menuitem [Advanced video settings...] [ showmenu [Advanced video settings] ] +menuitem [] -1 menuitem " 2 [ Apply now! ]" [ resetgl ] -fsaa_valuemap = "-1 2 4 8 16" -minlod_valuemap = "60 100 200 250" -watersubdiv_valuemap = "16 8 4 2 1" +fsaa_valuemap = [-1 2 4 8 16] +minlod_valuemap = [60 100 200 250] +watersubdiv_valuemap = [16 8 4 2 1] -newmenu "Advanced video settings" +newmenu [Advanced video settings] -menuitemslider "Scope FOV: " 5 60 "$scopefov" 5 "" [ scopefov $arg1 ] -menuitemslider "Antialiasing (FSAA): " 0 4 "(findlist $fsaa_valuemap $fsaa)" 1 "Off 2 4 8 16" [ fsaa (at $fsaa_valuemap $arg1) ] -menuitemslider "Minimal level of detail: " 0 3 "(findlist $minlod_valuemap $minlod)" 1 [ "Low" "Decent" "Good" "Best" ] [ minlod (at $minlod_valuemap $arg1) ] -menuitemslider "Light error: " 1 100 "$lighterror" 5 "" [ lighterror $arg1 ] -menuitemslider "Water subdivision: " 0 4 "(findlist $watersubdiv_valuemap $watersubdiv)" 1 [ "Lowest quality" "Low quality" "Medium quality" "High quality" "Highest quality" ] [ watersubdiv (at $watersubdiv_valuemap $arg1) ] -menuitemslider "Dynamic shadows: " 0 2 [ getshadowq ] 1 [ "Off" "Blob" "Stencil" ] [ setshadowq $arg1 ] -menuitemslider "Tex-reduce: " -1 3 "$texreduce" 1 "" [ texreduce $arg1 ] -menuitemcheckbox "Water reflection: " "$waterreflect" [ waterreflect $arg1 ] +menuitemslider [Scope FOV: ] 5 60 "$scopefov" 5 [] [ scopefov $arg1 ] +menuitemslider [Antialiasing (FSAA): ] 0 4 "(findlist $fsaa_valuemap $fsaa)" 1 [Off 2 4 8 16] [ fsaa (at $fsaa_valuemap $arg1) ] +menuitemslider [Minimal level of detail: ] 0 3 "(findlist $minlod_valuemap $minlod)" 1 [Low Decent Good Best] [ minlod (at $minlod_valuemap $arg1) ] +menuitemslider [Light error: ] 1 100 "$lighterror" 5 [] [ lighterror $arg1 ] +menuitemslider [Water subdivision: ] 0 4 "(findlist $watersubdiv_valuemap $watersubdiv)" 1 ["Lowest quality" "Low quality" "Medium quality" "High quality" "Highest quality"] [ watersubdiv (at $watersubdiv_valuemap $arg1) ] +menuitemslider [Dynamic shadows: ] 0 2 getshadowq 1 [Off Blob Stencil] [ setshadowq $arg1 ] +menuitemslider [Tex-reduce: ] -1 3 "$texreduce" 1 [] [ texreduce $arg1 ] +menuitemcheckbox [Water reflection: ] "$waterreflect" [ waterreflect $arg1 ] getshadowq = [ if (&& $stencilshadow (>= $stencilbits 8)) [result 2] [ @@ -341,74 +341,73 @@ setshadowq = [ ] ] -menuitemcheckbox "Dynamic lights: " "$dynlight" [ dynlight $arg1 ] -menuitemcheckbox "Bulletholes: " "$bullethole" [ bullethole $arg1 ] -menuitemcheckbox "Scorch: " "$scorch" [ scorch $arg1 ] -menuitem "Enable 0.93 FOV compatiblity..." [ fovcompat; sleep 100 [ fovcompatmenu ] ] -menuitem "" -1 -menuitem "FPS Range..." [ showmenu "FPS Range" ] -menuitem "" -1 +menuitemcheckbox [Dynamic lights: ] "$dynlight" [ dynlight $arg1 ] +menuitemcheckbox [Bulletholes: ] "$bullethole" [ bullethole $arg1 ] +menuitemcheckbox [Scorch: ] "$scorch" [ scorch $arg1 ] +menuitem [Enable 0.93 FOV compatiblity...] [ fovcompat; sleep 100 fovcompatmenu ] +menuitem [] -1 +menuitem [FPS Range...] [ showmenu [FPS Range] ] +menuitem [] -1 menuitem " 2 [ Apply now! ]" [ resetgl ] -fovcompatmenu = [ showmenu settings; showmenu video; showmenu "Advanced video settings" ] +fovcompatmenu = [ showmenu settings; showmenu video; showmenu [Advanced video settings] ] -newmenu "FPS Range" +newmenu [FPS Range] -menuitem "My 486 0wnz y00 (8-10 FPS)" [ closemenu "FPS Range"; fpsrange 8 10 ] -menuitem "Slow machine (20-25 FPS)" [ closemenu "FPS Range"; fpsrange 20 25 ] -menuitem "Sensible default (30-40 FPS)" [ closemenu "FPS Range"; fpsrange 30 40 ] -menuitem "FPS whore (60-60 FPS)" [ closemenu "FPS Range"; fpsrange 60 60 ] -menuitem "I don't understand LOD (100+ FPS)" [ closemenu "FPS Range"; fpsrange 100 1000 ] +menuitem [My 486 0wnz y00 (8-10 FPS)] [ closemenu [FPS Range]; fpsrange 8 10 ] +menuitem [Slow machine (20-25 FPS)] [ closemenu [FPS Range]; fpsrange 20 25 ] +menuitem [Sensible default (30-40 FPS)] [ closemenu [FPS Range]; fpsrange 30 40 ] +menuitem [FPS whore (60-60 FPS)] [ closemenu [FPS Range]; fpsrange 60 60 ] +menuitem [I don't understand LOD (100+ FPS)] [ closemenu [FPS Range]; fpsrange 100 1000 ] if (! (checkalias nickhighlight)) [ nickhighlight = 0 ] +const default_bursts [3 2 2] -const default_bursts "3 2 2" - -newmenu "Weapon Settings" -menuitemcheckbox "Auto weapon reload: " "$autoreload" [ autoreload $arg1 ] -menuitemcheckbox "Hit sound: " "$hitsound" [ hitsound $arg1 ] -menuitemcheckbox "Auto switch to akimbo upon pickup: " "$akimboautoswitch" [ akimboautoswitch $arg1 ] -menuitemslider "Akimbo end action: " 0 2 "$akimboendaction" 1 [ "Switch to pistol" "Switch to primary weapon" "Switch to grenades" ] [ akimboendaction $arg1 ] -menuitemcheckbox "SMG - Full Auto?" "(= (burstshots $SMG) 0)" [ if (= $arg1 0) [ burstshots $SMG (at $default_bursts 0) ] [ burstshots $SMG 0 ] ] -menuitemcheckbox "AR - Full Auto?" "(= (burstshots $AR) 0)" [ if (= $arg1 0) [ burstshots $AR (at $default_bursts 1) ] [ burstshots $AR 0 ] ] -menuitemcheckbox "Akimbo - Full Auto?" "(= (burstshots $AKIMBO) 0)" [ if (= $arg1 0) [ burstshots $AKIMBO (at $default_bursts 2) ] [ burstshots $AKIMBO 0 ] ] -menuitemslider "SMG - Shots per burst: " 0 29 "(burstshots $SMG)" 1 "" [ burstshots $SMG $arg1 ] -menuitemslider "AR - Shots per burst: " 0 14 "(burstshots $AR)" 1 "" [ burstshots $AR $arg1 ] -menuitemslider "Akimbo - Shots per burst: " 0 19 "(burstshots $AKIMBO)" 1 "" [ burstshots $AKIMBO $arg1 ] +newmenu [Weapon Settings] +menuitemcheckbox [Auto weapon reload: ] "$autoreload" [ autoreload $arg1 ] +menuitemcheckbox [Hit sound: ] "$hitsound" [ hitsound $arg1 ] +menuitemcheckbox [Auto switch to akimbo upon pickup: ] "$akimboautoswitch" [ akimboautoswitch $arg1 ] +menuitemslider [Akimbo end action: ] 0 2 "$akimboendaction" 1 ["Switch to pistol" "Switch to primary weapon" "Switch to grenades"] [ akimboendaction $arg1 ] +menuitemcheckbox [SMG - Full Auto?] "(= (burstshots $SMG) 0)" [ if (= $arg1 0) [ burstshots $SMG (at $default_bursts 0) ] [ burstshots $SMG 0 ] ] +menuitemcheckbox [AR - Full Auto?] "(= (burstshots $AR) 0)" [ if (= $arg1 0) [ burstshots $AR (at $default_bursts 1) ] [ burstshots $AR 0 ] ] +menuitemcheckbox [Akimbo - Full Auto?] "(= (burstshots $AKIMBO) 0)" [ if (= $arg1 0) [ burstshots $AKIMBO (at $default_bursts 2) ] [ burstshots $AKIMBO 0 ] ] +menuitemslider [SMG - Shots per burst: ] 0 29 "(burstshots $SMG)" 1 [] [ burstshots $SMG $arg1 ] +menuitemslider [AR - Shots per burst: ] 0 14 "(burstshots $AR)" 1 [] [ burstshots $AR $arg1 ] +menuitemslider [Akimbo - Shots per burst: ] 0 19 "(burstshots $AKIMBO)" 1 [] [ burstshots $AKIMBO $arg1 ] newmenu gameplay -menuitemtextinput "Nickname: " "result $curname" [ name $arg1 ] -menuitemslider "Player skins: " 0 2 "$teamdisplaymode" 1 [ Normal "Colored vests" "Full color" ] [ teamdisplaymode $arg1 ] -menuitemslider "Custom player skins: " 0 2 "$hidecustomskins" 1 [ "Always show" "Show in non-team modes" "Never show" ] [ hidecustomskins $arg1 ] -menuitem "" -1 -menuitemcheckbox "Reduced violence mode: " "$poniesmodeon" [ reducedviolencemode $arg1 ] -menuitemslider "Gib gore: " 0 4 "$__gibsgore" 1 [ "Off" "Normal" "Good" "Messy" "Unrealistic" ] [ gibsgore $arg1 ] -menuitemslider "Name highlight color: " 0 9 "$nickhighlight" 1 [ " 0green 5(default)" " 1blue" " 2yellow" " 3red" " 4gray" "white" " 6dark brown" " 7dark red" " 8purple" " 9orange" ] [ nickhighlight = $arg1; HIGHLIGHT = (c $nickhighlight) ] -menuitemcheckbox "Show scores on death: " "$showscoresondeath" [ showscoresondeath $arg1 ] -menuitem "Change to the enemy team" [ changeteam ] -menuitem "Change weapon..." [ showmenu Weapons ] -menuitem "Change player skin..." [ showmenu (at [CLA RVSF] (curteam)) ] -menuitem "Weapon settings..." [ showmenu "Weapon Settings" ] -menuitem "Edit kill messages..." [ showmenu "Kill Messages" ] +menuitemtextinput [Nickname: ] "result $curname" [ name $arg1 ] +menuitemslider [Player skins: ] 0 2 "$teamdisplaymode" 1 [Normal "Colored vests" "Full color"] [ teamdisplaymode $arg1 ] +menuitemslider [Custom player skins: ] 0 2 "$hidecustomskins" 1 ["Always show" "Show in non-team modes" "Never show"] [ hidecustomskins $arg1 ] +menuitem [] -1 +menuitemcheckbox [Reduced violence mode: ] "$poniesmodeon" [ reducedviolencemode $arg1 ] +menuitemslider [Gib gore: ] 0 4 "$__gibsgore" 1 [Off Normal Good Messy Unrealistic] [ gibsgore $arg1 ] +menuitemslider [Name highlight color: ] 0 9 "$nickhighlight" 1 [ " 0green 5(default)" " 1blue" " 2yellow" " 3red" " 4gray" "white" " 6dark brown" " 7dark red" " 8purple" " 9orange" ] [ nickhighlight = $arg1; HIGHLIGHT = (c $nickhighlight) ] +menuitemcheckbox [Show scores on death: ] "$showscoresondeath" [ showscoresondeath $arg1 ] +menuitem [Change to the enemy team] changeteam +menuitem [Change weapon...] [ showmenu Weapons ] +menuitem [Change player skin...] [ showmenu (at [CLA RVSF] (curteam)) ] +menuitem [Weapon settings...] [ showmenu [Weapon Settings] ] +menuitem [Edit kill messages...] [ showmenu [Kill Messages] ] __fontsetting = 0 // Initial setting for status of fonts so AC doesn't give errors. __screenshottype = 0 // Initial setting for status of fonts so AC doesn't give errors. newmenu Misc -menuitemcheckbox "Auto map download: " "$autogetmap" [ autogetmap $arg1 ] -menuitemcheckbox "Show gamemodes as acronyms: " "$modeacronyms" [ modeacronyms $arg1 ] -menuitemcheckbox "Show quit dialog when quitting: " "$askquit" [ askquit = $arg1 ] -menuitemcheckbox "Auto-screenshot: " "$autoscreenshot" [ autoscreenshot $arg1 ] -menuitemcheckbox "Allow HUD echos: " "$allowhudechos" [ allowhudechos $arg1 ] -menuitemslider "Servers to ping at once: " 0 50 "$maxservpings" 5 "" [ maxservpings $arg1 ] -menuitemslider "Milliseconds between pinging servers: " 1000 60000 "$servpingrate" 1000 "" [ servpingrate $arg1 ] -menuitemslider "Screenshot type: " -1 4 "$__screenshottype" 1 [ "JPEG (Terrible Quality)" "JPEG (Bad Quality)" "JPEG (Good Quality)" "JPEG (Best Quality)" "PNG (Lossless)" "BMP (Lossless)" ] [ if (= $arg1 -1) [ screenshottype 1; jpegquality 50; __screenshottype = -1 ] [ if (= $arg1 0) [ screenshottype 1; jpegquality 70; __screenshottype = 0 ] [ if (= $arg1 1) [ screenshottype 1; jpegquality 85; __screenshottype = 1 ] [ if (= $arg1 2) [ screenshottype 1; jpegquality 100; __screenshottype = 2 ] [ if (= $arg1 3) [ screenshottype 2; __screenshottype = 3 ] [ if (= $arg1 4) [ screenshottype 0; __screenshottype = 4 ] ] ] ] ] ] ] -menuitemslider "Console size: " 0 20 "$consize" 1 "" [ consize $arg1 ] -menuitemslider "Font type: " 0 2 "$__fontsetting" 1 [ "Default" "Serif" "Monospace" ] [ if (= $arg1 1) [ setfont serif; __fontsetting = 1 ] [ if (= $arg1 2) [ setfont mono; __fontsetting = 2 ] [ setfont default; __fontsetting = 0 ] ] ] -menuitemslider "Mini-map background style: " 0 2 "$showmapbackdrop" 1 [ "Fully Transparent" "Black" "White/Transparent" ] [ showmapbackdrop $arg1 ] -menuitemcheckbox "Enable compatibility with older cubescripts " "$compatibilitymode" [ compatibilitymode $arg1; echo (c 3) This setting requires a restart to take effect. ] -menuitemcheckbox "Enable per-official map dynamic gamma: " "$dyngamma" [ dyngamma = $arg1 ] -menuitemtextinput "Set default gamma for this map: " "(at $ofc_gamma_list (findlist $defaultmaps (curmap 1)))" [ setgamma $arg1 ] +menuitemcheckbox [Auto map download: ] "$autogetmap" [ autogetmap $arg1 ] +menuitemcheckbox [Show gamemodes as acronyms: ] "$modeacronyms" [ modeacronyms $arg1 ] +menuitemcheckbox [Show quit dialog when quitting: ] "$askquit" [ askquit = $arg1 ] +menuitemcheckbox [Auto-screenshot: ] "$autoscreenshot" [ autoscreenshot $arg1 ] +menuitemcheckbox [Allow HUD echos: ] "$allowhudechos" [ allowhudechos $arg1 ] +menuitemslider [Servers to ping at once: ] 0 50 "$maxservpings" 5 [] [ maxservpings $arg1 ] +menuitemslider [Milliseconds between pinging servers: ] 1000 60000 "$servpingrate" 1000 [] [ servpingrate $arg1 ] +menuitemslider [Screenshot type: ] -1 4 "$__screenshottype" 1 ["JPEG (Terrible Quality)" "JPEG (Bad Quality)" "JPEG (Good Quality)" "JPEG (Best Quality)" "PNG (Lossless)" "BMP (Lossless)"] [ if (= $arg1 -1) [ screenshottype 1; jpegquality 50; __screenshottype = -1 ] [ if (= $arg1 0) [ screenshottype 1; jpegquality 70; __screenshottype = 0 ] [ if (= $arg1 1) [ screenshottype 1; jpegquality 85; __screenshottype = 1 ] [ if (= $arg1 2) [ screenshottype 1; jpegquality 100; __screenshottype = 2 ] [ if (= $arg1 3) [ screenshottype 2; __screenshottype = 3 ] [ if (= $arg1 4) [ screenshottype 0; __screenshottype = 4 ] ] ] ] ] ] ] +menuitemslider [Console size: ] 0 20 "$consize" 1 [] [ consize $arg1 ] +menuitemslider [Font type: ] 0 2 "$__fontsetting" 1 [Default Serif Monospace] [ if (= $arg1 1) [ setfont serif; __fontsetting = 1 ] [ if (= $arg1 2) [ setfont mono; __fontsetting = 2 ] [ setfont default; __fontsetting = 0 ] ] ] +menuitemslider [Mini-map background style: ] 0 2 "$showmapbackdrop" 1 ["Fully Transparent" Black White/Transparent] [ showmapbackdrop $arg1 ] +menuitemcheckbox [Enable compatibility with older cubescripts: ] "$compatibilitymode" [ compatibilitymode $arg1; echo (c 3) This setting requires a restart to take effect. ] +menuitemcheckbox [Enable per-official map dynamic gamma: ] "$dyngamma" [ dyngamma = $arg1 ] +menuitemtextinput [Set default gamma for this map: ] "(at $ofc_gamma_list (findlist $defaultmaps (curmap 1)))" [ setgamma $arg1 ] // Reduced game violence mode... reducedviolencemode = [ @@ -417,194 +416,193 @@ reducedviolencemode = [ blood 0 gib 0 mutesound 48 0; loop i 8 [ mutesound (+ $i 26) 0 ] // Mute pain sounds: 26 to 33 and 48 - echo (c 2)OMG! (concatword (c 8) PW (c 1) NI (c 3) ES (c 5) "!") mode enabled - Violent game content has now been reduced. + echo (c 2)OMG! (concatword (c 8) PW (c 1) NI (c 3) ES (c 5) !) mode enabled - Violent game content has now been reduced. ] [ // Violent poniesmodeon = 0 blood 1 gib 1 mutesound 48 1; loop i 8 [ mutesound (+ $i 26) 1 ] // Un-mute pain sounds - echo (c 2)OMG! (concatword (c 8) PW (c 1) NI (c 3) ES (c 5) "!") mode has been disabled. + echo (c 2)OMG! (concatword (c 8) PW (c 1) NI (c 3) ES (c 5) !) mode has been disabled. ] ] newmenu HUD -menuitem "Show:" -1 -menuitemcheckbox " Gun " "$hudgun" [ hudgun $arg1 ] -menuitemcheckbox " Team icon " "(= $hideteam 0)" [ hideteam (= $arg1 0) ] -menuitemcheckbox " Icons " "(= $hidehudequipment 0)" [ hidehudequipment (= $arg1 0) ] -menuitemcheckbox " Console " "(= $hideconsole 0)" [ hideconsole (= $arg1 0) ] -menuitemcheckbox " Player names " "$showtargetname" [ showtargetname $arg1 ] -menuitemcheckbox " Spectator info " "(= $hidespecthud 0)" [ hidespecthud (= $arg1 0) ] -menuitemcheckbox " Quick messages " "(= $hidehudmsgs 0)" [ hidehudmsgs (= $arg1 0) ] -menuitemcheckbox " Damage direction indicator " "(= $hidedamageindicator 0)" [ hidedamageindicator (= $arg1 0) ] -menuitemcheckbox " Damage screen flash " "$damagescreen" [ damagescreen $arg1 ] -menuitemcheckbox " Crosshair team-sign " "$crosshairteamsign" [ crosshairteamsign $arg1 ] -menuitemcheckbox " CTF icons" "(= $hidectfhud 0)" [ hidectfhud (= $arg1 0) ] -menuitemcheckbox " Radar " "(= $hideradar 0)" [ hideradar (= $arg1 0) ] -menuitemslider " Radar zoom: " 5 500 [ $radarheight ] 5 [][ radarheight $arg1 ] -menuitemslider " Votes: " 0 2 "$hidevote" 1 [ "Always show" "Show until you vote" "Never show" ] [ hidevote $arg1 ] -menuitemslider " Graphics statistics: " 0 2 [ $showstats ] 1 [ "None" "FPS Only" "All" ] [ showstats $arg1 ] -menuitemslider " Extra messages: " 0 3 "$hudextras" 1 [ "No extra messages" "Show extra messages in console" "Pop up extra messages!" "SPAM EXTRA MESSAGES!" ] [ hudextras $arg1 ] -menuitemslider " Hand alignment: " 0 1 "$righthanded" 1 [ "Left-handed" "Right-handed" ] [ righthanded $arg1 ] -menuitemslider " Max-roll: " 0 20 "$maxroll" 1 "" [ maxroll $arg1 ] -menuitemslider " Spectator max-roll: " 0 1 "$maxrollremote" 1 [ "Off" "On" ] [ maxrollremote $arg1 ] +menuitem [Show:] -1 +menuitemcheckbox [ Gun ] "$hudgun" [ hudgun $arg1 ] +menuitemcheckbox [ Team icon ] "(= $hideteam 0)" [ hideteam (= $arg1 0) ] +menuitemcheckbox [ Icons ] "(= $hidehudequipment 0)" [ hidehudequipment (= $arg1 0) ] +menuitemcheckbox [ Console ] "(= $hideconsole 0)" [ hideconsole (= $arg1 0) ] +menuitemcheckbox [ Player names ] "$showtargetname" [ showtargetname $arg1 ] +menuitemcheckbox [ Spectator info ] "(= $hidespecthud 0)" [ hidespecthud (= $arg1 0) ] +menuitemcheckbox [ Quick messages ] "(= $hidehudmsgs 0)" [ hidehudmsgs (= $arg1 0) ] +menuitemcheckbox [ Damage direction indicator ] "(= $hidedamageindicator 0)" [ hidedamageindicator (= $arg1 0) ] +menuitemcheckbox [ Damage screen flash ] "$damagescreen" [ damagescreen $arg1 ] +menuitemcheckbox [ Crosshair team-sign ] "$crosshairteamsign" [ crosshairteamsign $arg1 ] +menuitemcheckbox [ CTF icons ] "(= $hidectfhud 0)" [ hidectfhud (= $arg1 0) ] +menuitemcheckbox [ Radar ] "(= $hideradar 0)" [ hideradar (= $arg1 0) ] +menuitemslider [ Radar zoom: ] 5 500 [ $radarheight ] 5 [][ radarheight $arg1 ] +menuitemslider [ Votes: ] 0 2 "$hidevote" 1 ["Always show" "Show until you vote" "Never show"] [ hidevote $arg1 ] +menuitemslider [ Graphics statistics: ] 0 2 "$showstats" 1 [None "FPS Only" All] [ showstats $arg1 ] +menuitemslider [ Extra messages: ] 0 3 "$hudextras" 1 ["No extra messages" "Show extra messages in console" "Pop up extra messages!" "SPAM EXTRA MESSAGES!"] [ hudextras $arg1 ] +menuitemslider [ Hand alignment: ] 0 1 "$righthanded" 1 [Left-handed Right-handed] [ righthanded $arg1 ] +menuitemslider [ Max-roll: ] 0 20 "$maxroll" 1 [] [ maxroll $arg1 ] +menuitemslider [ Spectator max-roll: ] 0 1 "$maxrollremote" 1 [Off On] [ maxrollremote $arg1 ] newmenu sound -menuitemslider "Sound volume: " 0 255 "$soundvol" 16 "" [ soundvol $arg1 ] -menuitemslider "Music volume: " 0 255 "$musicvol" 16 "" [ musicvol $arg1 ] -menuitemslider "Sound detail: " 1 3 "($soundqualityalias)" 1 "Low Medium High" [ new_sound_quality $arg1 ] -menuitem "" -1 -menuitem "Mute/Un-mute specific sounds..." [ showmenu "Mute specific sounds" ] -menuitem "" -1 -menuitem "Advanced settings:" -1 -menuitemcheckbox " Footsteps: " "$footsteps" [ footsteps $arg1 ] -menuitemcheckbox " Disable own footsteps: " "(= $localfootsteps)" [ localfootsteps (! $arg1) ] -menuitemslider " Sounds at once: " 0 100 "$maxsoundsatonce" 2 "" [ maxsoundsatonce $arg1 ] -menuitemslider " Voice-coms: " 0 2 "$voicecomsounds" 1 [Off On "Team only"] [ voicecomsounds $arg1 ] +menuitemslider [Sound volume: ] 0 255 "$soundvol" 16 [] [ soundvol $arg1 ] +menuitemslider [Music volume: ] 0 255 "$musicvol" 16 [] [ musicvol $arg1 ] +menuitemslider [Sound detail: ] 1 3 "($soundqualityalias)" 1 [Low Medium High] [ new_sound_quality $arg1 ] +menuitem [] -1 +menuitem [Mute/Un-mute specific sounds...] [ showmenu [Mute specific sounds] ] +menuitem [] -1 +menuitem [Advanced settings:] -1 +menuitemcheckbox [ Footsteps: ] "$footsteps" [ footsteps $arg1 ] +menuitemcheckbox [ Disable own footsteps: ] "(= $localfootsteps)" [ localfootsteps (! $arg1) ] +menuitemslider [ Sounds at once: ] 0 100 "$maxsoundsatonce" 2 [] [ maxsoundsatonce $arg1 ] +menuitemslider [ Voice-coms: ] 0 2 "$voicecomsounds" 1 [Off On "Team only"] [ voicecomsounds $arg1 ] -const muteitem [ menuitemcheckbox (concatword $arg1 ": ") (concat "!" "(soundmuted" $arg2 ")") (concat "mutesound" $arg2 "$arg1") ] +const muteitem [ menuitemcheckbox (concatword $arg1 [: ]) (concat ! "(soundmuted" $arg2 ")") (concat mutesound $arg2 "$arg1") ] -newmenu "Mute specific sounds" +newmenu [Mute specific sounds] -menuitem "Weapon sounds" [ showmenu "Mute weapon sounds" ] -menuitem "Bullet/explosion sounds" [ showmenu "Mute bullet/explosion sounds" ] -menuitem "Pain/death sounds" [ showmenu "Mute pain/death sounds" ] -menuitem "Pickup sounds" [ showmenu "Mute pickup sounds" ] -menuitem "Movement sounds" [ showmenu "Mute movement sounds" ] -menuitem "Voice-com sounds" [ showmenu "Mute voice-coms" ] -menuitem "Other sounds" [ showmenu "Mute other sounds" ] -menuitem "" -1 -menuitem "Un-mute all sounds..." [ unmuteallsounds ] +menuitem [Weapon sounds] [ showmenu [Mute weapon sounds] ] +menuitem [Bullet/explosion sounds] [ showmenu [Mute bullet/explosion sounds] ] +menuitem [Pain/death sounds] [ showmenu [Mute pain/death sounds] ] +menuitem [Pickup sounds] [ showmenu [Mute pickup sounds] ] +menuitem [Movement sounds] [ showmenu [Mute movement sounds] ] +menuitem [Voice-com sounds] [ showmenu [Mute voice-coms] ] +menuitem [Other sounds] [ showmenu [Mute other sounds] ] +menuitem [] -1 +menuitem [Un-mute all sounds...] [ unmuteallsounds ] -newmenu "Mute weapon sounds" +newmenu [Mute weapon sounds] -muteitem "Knife" 7 -muteitem "Pistol" 8 -muteitem "Pistol reloading" 9 -muteitem "Carbine" 10 -muteitem "Carbine reloading" 11 -muteitem "Shotgun" 12 -muteitem "Shotgun reloading" 13 -muteitem "Submachine gun" 14 -muteitem "Submachine gun reloading" 15 -muteitem "Sniper" 16 -muteitem "Sniper reloading" 17 -muteitem "Assault Rifle" 18 -muteitem "Assault Rifle reloading" 19 -muteitem "Grenade pull" 41 -muteitem "Grenade throw" 42 -muteitem "Grenade bounce 1" 43 -muteitem "Grenade bounce 2" 44 -muteitem "Akimbo reload" 45 -muteitem "Change weapon" 46 -muteitem "Empty clip" 24 +muteitem [Knife] 7 +muteitem [Pistol] 8 +muteitem [Pistol reloading] 9 +muteitem [Carbine] 10 +muteitem [Carbine reloading] 11 +muteitem [Shotgun] 12 +muteitem [Shotgun reloading] 13 +muteitem [Submachine gun] 14 +muteitem [Submachine gun reloading] 15 +muteitem [Sniper] 16 +muteitem [Sniper reloading] 17 +muteitem [Assault Rifle] 18 +muteitem [Assault Rifle reloading] 19 +muteitem [Grenade pull] 41 +muteitem [Grenade throw] 42 +muteitem [Grenade bounce 1] 43 +muteitem [Grenade bounce 2] 44 +muteitem [Akimbo reload] 45 +muteitem [Change weapon] 46 +muteitem [Empty clip] 24 -newmenu "Mute pickup sounds" +newmenu [Mute pickup sounds] -muteitem "Ammo pickup" 20 -muteitem "Health pickup" 21 -muteitem "Armour pickup" 22 -muteitem "Akimbo pickup" 23 -muteitem "Akimbo finished" 25 -muteitem "Helmet pickup" 99 +muteitem [Ammo pickup] 20 +muteitem [Health pickup] 21 +muteitem [Armour pickup] 22 +muteitem [Akimbo pickup] 23 +muteitem [Akimbo finished] 25 +muteitem [Helmet pickup] 99 +newmenu [Mute pain/death sounds] -newmenu "Mute pain/death sounds" +muteitem [Pain 1] 26 +muteitem [Pain 2] 27 +muteitem [Pain 3] 28 +muteitem [Pain 4] 29 +muteitem [Pain 5] 30 +muteitem [Pain 6] 31 +muteitem [Die 1] 32 +muteitem [Die 2] 33 +muteitem [Gib sounds] 48 +muteitem [Tinnitus] 62 +muteitem [Heartbeat] 100 -muteitem "Pain 1" 26 -muteitem "Pain 2" 27 -muteitem "Pain 3" 28 -muteitem "Pain 4" 29 -muteitem "Pain 5" 30 -muteitem "Pain 6" 31 -muteitem "Die 1" 32 -muteitem "Die 2" 33 -muteitem "Gib sounds" 48 -muteitem "Tinnitus" 62 -muteitem "Heartbeat" 100 +newmenu [Mute movement sounds] -newmenu "Mute movement sounds" +menuitemcheckbox [Footsteps: ] "$footsteps" [ footsteps $arg1 ] +muteitem [Crouch] 54 +muteitem [Water footsteps] 55 +muteitem [Water crouching] 56 +muteitem [Crouch-in] 57 +muteitem [Crouch-out] 58 +muteitem [Jump] 0 +muteitem [Soft landing] 1 +muteitem [Hard landing] 2 +muteitem [Splash 1] 35 +muteitem [Splash 2] 36 +muteitem [Underwater] 61 -menuitemcheckbox "Footsteps: " "$footsteps" [ footsteps $arg1 ] -muteitem "Crouch" 54 -muteitem "Water footsteps" 55 -muteitem "Water crouching" 56 -muteitem "Crouch-in" 57 -muteitem "Crouch-out" 58 -muteitem "Jump" 0 -muteitem "Soft landing" 1 -muteitem "Hard landing" 2 -muteitem "Splash 1" 35 -muteitem "Splash 2" 36 -muteitem "Underwater" 61 +newmenu [Mute bullet/explosion sounds] -newmenu "Mute bullet/explosion sounds" +muteitem [Ricochet air 1] 3 +muteitem [Ricochet air 2] 4 +muteitem [Ricochet hit] 5 +muteitem [Bullet (water impact)] 6 +muteitem [Grenade explosion] 34 +menuitemcheckbox [Bullet hit: ] "$bulletbouncesound" [ bulletbouncesound $arg1 ] +menuitemcheckbox [Bullet near-miss: ] "$bulletairsound" [ bulletairsound $arg1 ] +muteitem [HitSound: ] "(! $hitsound)" [ hitsound (! $hitsound) ] -muteitem "Ricochet air 1" 3 -muteitem "Ricochet air 2" 4 -muteitem "Ricochet hit" 5 -muteitem "Bullet (water impact)" 6 -muteitem "Grenade explosion" 34 -menuitemcheckbox "Bullet hit: " "$bulletbouncesound" [ bulletbouncesound $arg1 ] -menuitemcheckbox "Bullet near-miss: " "$bulletairsound" [ bulletairsound $arg1 ] -muteitem "HitSound: " "(! $hitsound)" [ hitsound (! $hitsound) ] +newmenu [Mute other sounds] -newmenu "Mute other sounds" +muteitem [Flag drop] 37 +muteitem [Flag pickup] 38 +muteitem [Flag return] 39 +muteitem [Flag score] 40 +muteitem [Headshot] 49 +muteitem [Call vote] 50 +muteitem [Pass vote] 51 +muteitem [Fail vote] 52 +muteitem [Menu select] 59 +muteitem [Menu enter] 60 -muteitem "Flag drop" 37 -muteitem "Flag pickup" 38 -muteitem "Flag return" 39 -muteitem "Flag score" 40 -muteitem "Headshot" 49 -muteitem "Call vote" 50 -muteitem "Pass vote" 51 -muteitem "Fail vote" 52 -muteitem "Menu select" 59 -muteitem "Menu enter" 60 +newmenu [Mute voice-coms] -newmenu "Mute voice-coms" +muteitem [Affirmative] 63 +muteitem [All-right sir] 64 +muteitem [Come on, move] 65 +muteitem [Coming in with the flag] 66 +muteitem [Cover me] 67 +muteitem [Defend the flag] 68 +muteitem [Enemy down] 69 +muteitem [Go get 'em boys!] 70 +muteitem [Good job team] 71 +muteitem [I got one!] 72 +muteitem [I made contact] 73 +muteitem [I'm attacking] 74 +muteitem [I'm on defense] 75 +muteitem [I'm on your team] 76 +muteitem [Negative] 77 +muteitem [No can do] 78 +muteitem [Recover the flag] 79 +muteitem [Sorry] 80 +muteitem [Spread out] 81 +muteitem [Stay here] 82 +muteitem [Stay together] 83 +muteitem [There's no way sir] 84 +muteitem [We did it!] 85 +muteitem [Yes] 86 +muteitem [Under way] 87 +muteitem [On the move] 88 +muteitem [Got your back] 89 +muteitem [Got you covered] 90 +muteitem [In position] 91 +muteitem [In position now] 92 +muteitem [Report In!] 93 +muteitem [Nice shot] 94 +muteitem [Thanks] 95 +muteitem [Thanks, man] 96 +muteitem [Awesome (1)] 97 +muteitem [Awesome (2)] 98 -muteitem "Affirmative" 63 -muteitem "All-right sir" 64 -muteitem "Come on, move" 65 -muteitem "Coming in with the flag" 66 -muteitem "Cover me" 67 -muteitem "Defend the flag" 68 -muteitem "Enemy down" 69 -muteitem "Go get 'em boys!" 70 -muteitem "Good job team" 71 -muteitem "I got one!" 72 -muteitem "I made contact" 73 -muteitem "I'm attacking" 74 -muteitem "I'm on defense" 75 -muteitem "I'm on your team" 76 -muteitem "Negative" 77 -muteitem "No can do" 78 -muteitem "Recover the flag" 79 -muteitem "Sorry" 80 -muteitem "Spread out" 81 -muteitem "Stay here" 82 -muteitem "Stay together" 83 -muteitem "There's no way sir" 84 -muteitem "We did it!" 85 -muteitem "Yes" 86 -muteitem "Under way" 87 -muteitem "On the move" 88 -muteitem "Got your back" 89 -muteitem "Got you covered" 90 -muteitem "In position" 91 -muteitem "In position now" 92 -muteitem "Report In!" 93 -muteitem "Nice shot" 94 -muteitem "Thanks" 95 -muteitem "Thanks, man" 96 -muteitem "Awesome (1)" 97 -muteitem "Awesome (2)" 98 - -newmenu "Kill Messages" +newmenu [Kill Messages] menuitemvar [concat (orange)Frag messages: ] [] [] menuitemtextinput [Pistol: ] [fragmessage 1] [ fragmessage 1 $arg1 ] [] 15 menuitemtextinput [Carbine: ] [fragmessage 2] [ fragmessage 2 $arg1 ] [] 15 @@ -620,4 +618,3 @@ menuitemtextinput [Knife: ] [gibmessage 0] [ gibmessage 0 $arg1 ] [] 15 menuitemtextinput [Shotgun: ] [gibmessage 3] [ gibmessage 3 $arg1 ] [] 15 menuitemtextinput [Sniper: ] [gibmessage 5] [ gibmessage 5 $arg1 ] [] 15 menuitemtextinput [Grenades: ] [gibmessage 8] [ gibmessage 8 $arg1 ] [] 15 - diff --git a/config/menus_voicecom.cfg b/config/menus_voicecom.cfg index 49181b4f..6a8687c9 100644 --- a/config/menus_voicecom.cfg +++ b/config/menus_voicecom.cfg @@ -1,11 +1,11 @@ newmenu voicecom 1 1 -menuitem "1. Team Replies" [ showmenu "Team Replies" ] -menuitem "2. Team Commands" [ showmenu "Team Commands" ] -menuitem "3. Team State" [ showmenu "Team State" ] -menuitem "4. Team Talk" [ showmenu "Team Talk" ] -menuitem "5. Team Tactics" [ showmenu "Team Tactics" ] -menuitem "6. Public Talk" [ showmenu "Public Talk" ] +menuitem [1. Team Replies] [ showmenu [Team Replies] ] +menuitem [2. Team Commands] [ showmenu [Team Commands] ] +menuitem [3. Team State] [ showmenu [Team State] ] +menuitem [4. Team Talk] [ showmenu [Team Talk] ] +menuitem [5. Team Tactics] [ showmenu [Team Tactics] ] +menuitem [6. Public Talk] [ showmenu [Public Talk] ] vcrnd = [ // pick random shout if possible len = (listlen $arg1) @@ -24,43 +24,43 @@ genvcitem = [ ] // V 1 [ 1,2 ] -newmenu "Team Replies" 1 1 +newmenu [Team Replies] 1 1 // the following two mirror F1/F2 - disagree/agree -genvcitem [Yes Affirmative "All right, Sir"] "yes affirmative allrightsir" 1 // # -genvcitem ["Negative" "No can do" "There's no way, Sir!"] "negative nocando theresnowaysir" 2 // * -genvcitem ["On the move" "On my way"] "onthemove_1 onthemove_2" 3 -genvcitem ["Got your back!" "Got you covered!"] "igotyourback igotyoucovered" 4 -genvcitem ["In Position!" "In Position now!"] "inposition_1 inposition_2" 5 +genvcitem [Yes Affirmative "All right, Sir"] [yes affirmative allrightsir] 1 // # +genvcitem [Negative "No can do" "There's no way, Sir!"] [negative nocando theresnowaysir] 2 // * +genvcitem ["On the move" "On my way"] [onthemove_1 onthemove_2] 3 +genvcitem ["Got your back!" "Got you covered!"] [igotyourback igotyoucovered] 4 +genvcitem ["In Position!" "In Position now!"] [inposition_1 inposition_2] 5 // V 2 [ 1,2,3 ] -newmenu "Team Commands" 1 1 -genvcitem "Recover the flag!" recovertheflag 1 // * -genvcitem "Defend the flag!" defendtheflag 2 // # -genvcitem ["Come on, move!" "Spread Out!"] "comeonmove spreadout" 3 // * +newmenu [Team Commands] 1 1 +genvcitem [Recover the flag!] recovertheflag 1 // * +genvcitem [Defend the flag!] defendtheflag 2 // # +genvcitem ["Come on, move!" "Spread Out!"] [comeonmove spreadout] 3 // * // V 3 [ 2,3,4 ] -newmenu "Team State" 1 1 -genvcitem "I'm attacking" imattacking 1 -genvcitem "Coming in with the flag!" cominginwiththeflag 2 // * -genvcitem "I made contact" imadecontact 3 // # -genvcitem ["Enemy down" "I got one"] "enemydown igotone" 4 // * -genvcitem "I'm on defense" imondefense 5 +newmenu [Team State] 1 1 +genvcitem [I'm attacking] imattacking 1 +genvcitem [Coming in with the flag!] cominginwiththeflag 2 // * +genvcitem [I made contact] imadecontact 3 // # +genvcitem ["Enemy down" "I got one"] [enemydown igotone] 4 // * +genvcitem [I'm on defense] imondefense 5 // V 4 [ 1,2,3 ] -newmenu "Team Talk" 1 1 -genvcitem ["We did it!" "Go get 'em boys!" "Good job, team!"] "wedidit gogetemboys goodjobteam" 1 -genvcitem "Sorry" sorry 2 -genvcitem "I'm on your team, man!" imonyourteamman 3 // * +newmenu [Team Talk] 1 1 +genvcitem ["We did it!" "Go get 'em boys!" "Good job, team!"] [wedidit gogetemboys goodjobteam] 1 +genvcitem [Sorry] sorry 2 +genvcitem [I'm on your team, man!] imonyourteamman 3 // * // V 5 [ 1,2,3 ] -newmenu "Team Tactics" 1 1 -genvcitem "Cover me!" coverme 1 -genvcitem "Stay together!" staytogether 2 -genvcitem "Stay here!" stayhere 3 -genvcitem "Report In!" reportin 4 // * +newmenu [Team Tactics] 1 1 +genvcitem [Cover me!] coverme 1 +genvcitem [Stay together!] staytogether 2 +genvcitem [Stay here!] stayhere 3 +genvcitem [Report In!] reportin 4 // * // V 6 [ 1,2,3 ] -newmenu "Public Talk" 1 1 -genvcitem "Nice shot" niceshot 1 -genvcitem ["Thanks!" "Thanks, man"] "thanks_1 thanks_2" 2 -genvcitem ["Awesome" "Awesome!"] "awesome_1 awesome_2" 3 \ No newline at end of file +newmenu [Public Talk] 1 1 +genvcitem [Nice shot] niceshot 1 +genvcitem [Thanks! "Thanks, man"] [thanks_1 thanks_2] 2 +genvcitem [Awesome Awesome!] [awesome_1 awesome_2] 3 \ No newline at end of file diff --git a/config/on_quit.cfg b/config/on_quit.cfg index cba77aa8..3fd0cb4d 100644 --- a/config/on_quit.cfg +++ b/config/on_quit.cfg @@ -1,7 +1,7 @@ // Adds a list of aliases to be deleted (cleared from saved.cfg) on every quit. // Do not modify. (unless you really know what you're doing) -const addListOnQuit [ alias_list = $arg1; loop al (listlen $alias_list) [ addOnQuit (concat "delalias" (at $alias_list $al)) ] ] +const addListOnQuit [ alias_list = $arg1; loop al (listlen $alias_list) [ addOnQuit (concat delalias (at $alias_list $al)) ] ] const on_quit_aliases [ _demofile diff --git a/config/resetbinds.cfg b/config/resetbinds.cfg index 28d8ceec..cfd9014d 100644 --- a/config/resetbinds.cfg +++ b/config/resetbinds.cfg @@ -3,173 +3,173 @@ // Do not modify. -bind MOUSE1 "attack" -bind MOUSE2 "altaction" +bind MOUSE1 attack +bind MOUSE2 altaction editbind MOUSE2 [ showmenu editing ] bind MOUSE3 [ weapon ] -bind MOUSE4 "universaldelta 1" -bind MOUSE5 "universaldelta -1" -bind BACKSPACE "dropflag" -editbind BACKSPACE "delent" +bind MOUSE4 [ universaldelta 1 ] +bind MOUSE5 [ universaldelta -1 ] +bind BACKSPACE dropflag +editbind BACKSPACE delent bind TAB [ showscores 1; onrelease [ showscores 0 ] ] -bind CLEAR "" -bind RETURN "" -bind PAUSE "" -bind ESCAPE [ if $connected [ ingamemenu ] [ if (watchingdemo) [ showmenu "Watching demo" ] [ showmenu main ] ] ] ] -bind SPACE "jump" -bind EXCLAIM "" -bind QUOTEDBL "" -bind HASH "" -bind DOLLAR "" -bind AMPERSAND "" -bind QUOTE "" -bind LEFTPAREN "" -bind RIGHTPAREN "" -bind ASTERISK "" -bind PLUS "" +bind CLEAR [] +bind RETURN [] +bind PAUSE [] +bind ESCAPE [ if $connected [ ingamemenu ] [ if (watchingdemo) [ showmenu [Watching demo] ] [ showmenu main ] ] ] ] +bind SPACE jump +bind EXCLAIM [] +bind QUOTEDBL [] +bind HASH [] +bind DOLLAR [] +bind AMPERSAND [] +bind QUOTE [] +bind LEFTPAREN [] +bind RIGHTPAREN [] +bind ASTERISK [] +bind PLUS [] // Directional equalizing - look up to level the ceiling selection, look down to level the floor selection bind COMMA [ if $old_editbinds [ equalize 0 ] [ if $editing [ if (= $flrceil 0) [ equalize 0 ] [ if (= $flrceil 2) [ equalize 2 ] ] ] ] ] -bind MINUS [ if $editing [ copyent ] ] +bind MINUS [ if $editing copyent ] bind PERIOD [ if $old_editbinds [ equalize 2 ] ] -bind SLASH "saycommand /" -bind 0 "" -bind 1 "primary" +bind SLASH [ saycommand "/" ] +bind 0 [] +bind 1 primary editbind 1 [ domodifier 5 ] -bind 2 "secondary" +bind 2 secondary editbind 2 [ domodifier 7 ] -bind 3 "grenades" +bind 3 grenades editbind 3 [ domodifier 8 ] -bind 4 "melee" +bind 4 melee editbind 4 [ domodifier 9 ] -bind 5 "" -bind 6 "" -bind 7 "" -editbind 7 "nextclosestent" -bind 8 "vdelta -1" -bind 9 "vdelta 1" -bind COLON "" -bind SEMICOLON "" -editbind SEMICOLON "editent" -bind LESS "" -bind EQUALS "" -editbind EQUALS "pasteent" -bind GREATER "" -bind QUESTION "" -bind AT "" -bind LEFTBRACKET "editheight 0 -1" -bind BACKSLASH "" -bind RIGHTBRACKET "editheight 0 1" -bind CARET "saycommand /" -bind UNDERSCORE "" -bind BACKQUOTE "saycommand /" -bind A "left" -bind B "showmenu Weapons" -bind C "" -editbind C "copy" -bind D "right" -bind E "edittoggle" +bind 5 [] +bind 6 [] +bind 7 [] +editbind 7 nextclosestent +bind 8 [ vdelta -1 ] +bind 9 [ vdelta 1 ] +bind COLON [] +bind SEMICOLON [] +editbind SEMICOLON editent +bind LESS [] +bind EQUALS [] +editbind EQUALS pasteent +bind GREATER [] +bind QUESTION [] +bind AT [] +bind LEFTBRACKET [ editheight 0 -1 ] +bind BACKSLASH [] +bind RIGHTBRACKET [ editheight 0 1 ] +bind CARET [ saycommand "/" ] +bind UNDERSCORE [] +bind BACKQUOTE [ saycommand "/" ] +bind A left +bind B [ showmenu Weapons ] +bind C [] +editbind C copy +bind D right +bind E edittoggle bind F [ if $old_editbinds [ solid 1 ] [ if $editing [ if (countwalls 0) [ solid 0 ] [ solid 1 ] ] ] ] // Toggle solid/non-solid -bind G "quicknadethrow" +bind G quicknadethrow editbind G [ solid 0 ] // Directional heightfielding - look up for toggle CHF/non-solid, look down for toggle FHF/non-solid bind H [ if $old_editbinds [ heightfield 0 ] [ if $editing [ if (= $flrceil 0) [ if (countwalls 2) [ solid 0 ] [ heightfield 0 ] ] [ if (= $flrceil 2) [ if (countwalls 3) [ solid 0 ] [ heightfield 2 ] ] ] ] ] ] bind I [ if $old_editbinds [ heightfield 2 ] ] -bind J "" +bind J [] bind K [ if $old_editbinds [ corner ] [ if $editing [ if (countwalls 1) [ solid 0 ] [ corner ] ] ] ] // Toggle corner/non-solid -bind L "" +bind L [] editbind L [ showmenu Lightning ] -bind M "" +bind M [] editbind M [ domodifier 6 ] -bind N [ quickanswer ] -bind O "editheight 2 -1" -bind P "editheight 2 1" -bind Q "" +bind N quickanswer +bind O [ editheight 2 -1 ] +bind P [ editheight 2 1 ] +bind Q [] editbind Q [ domodifier 1 ] -bind R "reload" -bind S "backward" -bind T "saycommand" // or even "saycommand >" -bind U "" -editbind U "undo" +bind R reload +bind S backward +bind T saycommand // or even "saycommand >" +bind U [] +editbind U undo bind V [ showmenu voicecom ] -editbind V "paste" -bind W "forward" -bind X "" +editbind V paste +bind W forward +bind X [] editbind X [ domodifier 3 ] -bind Y "saycommand %" -bind Z "" +bind Y [ saycommand % ] +bind Z [] editbind Z [ domodifier 2 ] -bind DELETE "" -editbind DELETE "edittex 0 -1" -bind KP0 "weapon 4 1" -bind KP1 "" -bind KP2 "" -bind KP3 "" -bind KP4 "" -editbind KP4 "edittex 3 -1" -bind KP5 "" -bind KP6 "" -bind KP7 "" -editbind KP7 "edittex 3 1" -bind KP8 "" -bind KP9 "" -bind KP_PERIOD "" -bind KP_DIVIDE "" -bind KP_MULTIPLY "" -bind KP_MINUS "conskip 3" -bind KP_PLUS "conskip -1000" -bind KP_ENTER "" -bind KP_EQUALS "" -bind UP "forward" -bind DOWN "backward" -bind RIGHT "right" -bind LEFT "left" -bind INSERT "" -editbind INSERT "edittex 0 1" -bind HOME "" -editbind HOME "edittex 1 1" -bind END "" -editbind END "edittex 1 -1" -bind PAGEUP "" -editbind PAGEUP "edittex 2 1" -bind PAGEDOWN "" -editbind PAGEDOWN "edittex 2 -1" +bind DELETE [] +editbind DELETE [ edittex 0 -1 ] +bind KP0 [ weapon 4 1 ] +bind KP1 [] +bind KP2 [] +bind KP3 [] +bind KP4 [] +editbind KP4 [ edittex 3 -1 ] +bind KP5 [] +bind KP6 [] +bind KP7 [] +editbind KP7 [ edittex 3 1 ] +bind KP8 [] +bind KP9 [] +bind KP_PERIOD [] +bind KP_DIVIDE [] +bind KP_MULTIPLY [] +bind KP_MINUS [ conskip 3 ] +bind KP_PLUS [ conskip -1000 ] +bind KP_ENTER [] +bind KP_EQUALS [] +bind UP forward +bind DOWN backward +bind RIGHT right +bind LEFT left +bind INSERT [] +editbind INSERT [ edittex 0 1 ] +bind HOME [] +editbind HOME [ edittex 1 1 ] +bind END [] +editbind END [ edittex 1 -1 ] +bind PAGEUP [] +editbind PAGEUP [ edittex 2 1 ] +bind PAGEDOWN [] +editbind PAGEDOWN [ edittex 2 -1 ] bind F1 [ if $votepending [ && (vote 1) (echo you voted yes) ] ] bind F2 [ if $votepending [ && (vote 2) (echo you voted no) ] ] -bind F3 "" -bind F4 "" +bind F3 [] +bind F4 [] bind F5 [ domodifier 1 ] -editbind F5 "toggleocull" +editbind F5 toggleocull bind F6 [ domodifier 2 ] -editbind F6 "showmip" -bind F7 "" +editbind F6 showmip +bind F7 [] editbind F7 [ if $fullbright [ fullbright 0 ] [ fullbright 1 ] ] -bind F8 "" -bind F9 "" -bind F10 "getdemo" -bind F11 "conskip -1000; toggleconsole" -bind F12 "screenshot" -bind F13 "" -bind F14 "" -bind F15 "" -bind NUMLOCK "" -bind CAPSLOCK "" -bind SCROLLOCK "" -bind RSHIFT "" -bind LSHIFT "crouch" -bind RCTRL "jump" -bind LCTRL "jump" -editbind RCTRL " " -editbind LCTRL " " -bind RALT "" -bind LALT "showscores 0; toggleshowmap" -bind RMETA "" -bind LMETA "" -bind LSUPER "" -bind RSUPER "" -bind MODE "" -bind COMPOSE "" -bind HELP "" -bind PRINT "" -bind SYSREQ "" -bind BREAK "" -bind MENU "" \ No newline at end of file +bind F8 [] +bind F9 [] +bind F10 getdemo +bind F11 [ conskip -1000; toggleconsole ] +bind F12 screenshot +bind F13 [] +bind F14 [] +bind F15 [] +bind NUMLOCK [] +bind CAPSLOCK [] +bind SCROLLOCK [] +bind RSHIFT [] +bind LSHIFT crouch +bind RCTRL jump +bind LCTRL jump +editbind RCTRL [] +editbind LCTRL [] +bind RALT [] +bind LALT [ showscores 0; toggleshowmap ] +bind RMETA [] +bind LMETA [] +bind LSUPER [] +bind RSUPER [] +bind MODE [] +bind COMPOSE [] +bind HELP [] +bind PRINT [] +bind SYSREQ [] +bind BREAK [] +bind MENU [] diff --git a/config/scripts.cfg b/config/scripts.cfg index a0a86d9d..3712971d 100644 --- a/config/scripts.cfg +++ b/config/scripts.cfg @@ -381,7 +381,7 @@ const convertcase [ ] ingall = 0 -const ignoreall [ if $connected [ ingall = 1; loop ia (curplayers) [ ignore $ia ]; echo (blue)NOTE: (white)All clients currently on the server were ignored. ] ] +const ignoreall [ if $connected [ ingall = 1; loop ia (+ (highestcn) 1) [ ignore $ia ]; echo (blue)NOTE: (white)All clients currently on the server were ignored. ] ] const unignoreall [ if $connected [ ingall = 0; clearignored -1; echo (blue)NOTE: (white)All clients currently on the server were unignored. ] ] const ignoreteam [ if (curmodeattr team) [ diff --git a/config/survival.cfg b/config/survival.cfg index 3504ea52..a1e671ab 100644 --- a/config/survival.cfg +++ b/config/survival.cfg @@ -9,12 +9,12 @@ // * If the player dies, or leaves the "zone" for too long of a duration, the game ends. // * Total seconds survived, total number of enemies killed during, average amount of time between kills, and total damage dealt while alive are reported as stats when the game ends. persistidents 0 -const survResetAliases "gotCheckPoint lastCheckPoint survIsFinished startedSurvival startedOBCount startPreSurvMillis startSurvMillis survKills survTeleported survTotalDmg survOrigSets changingspeed changinggamma" +const survResetAliases [gotCheckPoint lastCheckPoint survIsFinished startedSurvival startedOBCount startPreSurvMillis startSurvMillis survKills survTeleported survTotalDmg survOrigSets changingspeed changinggamma] const resetSurvAliases [ forceinit $survResetAliases 0 - check2initlist "spamSurvMsgs survDifficulty" 0 - check2initlist "survBotsToAdd survDamageEffects" 1 + check2initlist [spamSurvMsgs survDifficulty] 0 + check2initlist [survBotsToAdd survDamageEffects] 1 check2init survNumBots 12; check2init survMaxBots 32; check2init timeBetChkPts 60000; check2init timeUntilTele 120000 ] @@ -47,7 +47,7 @@ const survival [ ] ] checkinit mapstartonce [ - startPreSurvMillis = (millis); add2list tmpSurvSets (curmap 1); sleep 3 [ storesets "gamma" survOrigSets ] + startPreSurvMillis = (millis); add2list tmpSurvSets (curmap 1); sleep 3 [ storesets gamma survOrigSets ] echo (genSurvDifStr) (yellow)Bot survival mode prepared, gather items and find the arena to start! (orange)You have (white) (div $timeUntilTele 1000) (orange)seconds to prepare! if (strstr $defaultmaps (curmap 1)) [ survMap = (findlist $defaultmaps (curmap 1)) ] setOfcZones; checkzone @@ -62,7 +62,7 @@ const startSurvival [ sleep $timeBetChkPts [ gotCheckPoint = 1; increaseDifficulty ] ] -const setzone [ if (> (listlen $arg1) 3) [ zone = ""; loop szl 4 [ add2list zone (at $arg1 $szl) ] ]; drawzone (at $arg1 0) (at $arg1 1) (at $arg1 2) (at $arg1 3); ] +const setzone [ if (> (listlen $arg1) 3) [ zone = []; loop szl 4 [ add2list zone (at $arg1 $szl) ] ]; drawzone (at $arg1 0) (at $arg1 1) (at $arg1 2) (at $arg1 3); ] // Zones consist of two points on a grid. Any area within these points are considered "inner zone". // The order of the arguments given to setzone are important: setzone "minX maxX minY maxY" @@ -103,7 +103,7 @@ const survOfcZones [ const setOfcZones [ survMapIndex = (findlist $survOfcZones (curmap 1)) - if (!= $survMapIndex -1) [ tmpSurvZone = ""; loop soz 4 [ add2list tmpSurvZone (at $survOfcZones (+ $survMapIndex (+ $soz 1))) ]; setzone $tmpSurvZone ] + if (!= $survMapIndex -1) [ tmpSurvZone = []; loop soz 4 [ add2list tmpSurvZone (at $survOfcZones (+ $survMapIndex (+ $soz 1))) ]; setzone $tmpSurvZone ] ] const findCenter [ @@ -124,7 +124,7 @@ const changespeed [ loops = (- $curspeed $targetspeed) ] [ loops = (- $targetspeed $curspeed) ] loop i $loops [ - sleep (* $i $increments) [ gamespeed ((at "+ -" (> $curspeed $targetspeed)) $gamespeed 1) ] + sleep (* $i $increments) [ gamespeed ((at [+ -] (> $curspeed $targetspeed)) $gamespeed 1) ] ] sleep (* $loops $increments) [ changingspeed = 0 ] ] [ changingspeed = 0 ] @@ -137,7 +137,7 @@ const changegamma [ loopss = (- $curgamma $targetgamma) ] [ loopss = (- $targetgamma $curgamma) ] loop t $loopss [ - sleep (* $t $incrementss) [ gamma ((at "+ -" (> $curgamma $targetgamma)) $gamma 1) ] + sleep (* $t $incrementss) [ gamma ((at [+ -] (> $curgamma $targetgamma)) $gamma 1) ] ] sleep (* $loopss $incrementss) [ changinggamma = 0 ] ] [ changinggamma = 0 ] @@ -180,7 +180,7 @@ const increaseDifficulty [ lastCheckPoint = (millis) if (curmodeattr bot) [ if (<= (+ $survNumBots $survBotsToAdd) $survMaxBots) [ += survNumBots $survBotsToAdd; addnbot $survBotsToAdd CLA best ] [ tmpSurvInt = (- $survMaxBots $survNumBots); += survNumBots $tmpSurvInt; addnbot $tmpSurvInt CLA best ] - if (< $curSurvDifficulty 4) [ += curSurvDifficulty 1; botskillall (at "bad worse medium good best" $curSurvDifficulty) ] + if (< $curSurvDifficulty 4) [ += curSurvDifficulty 1; botskillall (at [bad worse medium good best] $curSurvDifficulty) ] ] ] @@ -192,9 +192,9 @@ const endSurvival [ echo (green)Bot Survival results for map: (white) (at $tmpSurvSets 1) if (!= (at $tmpSurvSets 2) (at $tmpSurvSets 3)) [ if (= (at $tmpSurvSets 5) 1) [ sleep 5 [ echo (concatword (yellow) (format "you were %1 by %2" (gibmessage (at $tmpSurvSets 4)) (at $tmpSurvSets 6))) ] ] [ - sleep 5 [ echo (concatword (yellow) (format "you were %1 by %2" (fragmessage (at $tmpSurvSets 4)) (at $tmpSurvSets 6))) ] + sleep 5 [ echo (concatword (yellow) (format [you were %1 by %2] (fragmessage (at $tmpSurvSets 4)) (at $tmpSurvSets 6))) ] ] - ] [ sleep 5 [ echo (concatword (yellow) "you suicided!") ] ] + ] [ sleep 5 [ echo (concatword (yellow) you suicided!) ] ] ] echo $tmp_survstr if (&& $spamSurvMsgs $survKills) [ hudecho (green)GG ] @@ -204,8 +204,6 @@ const endSurvival [ ] // List of aliases that need to be cleared from saved.cfg on quit: -const survAliases (concat $survResetAliases "resetSurvAliases genSurvDifStr survival tmpSurvSets curSurvDifficulty survLastKill survTimeBetKills startPreSurvMillis startSurvival startedSurvival setzone survOfcZones setOfcZones survMapIndex tmpSurvZone findCenter midZoneX midZoneY teleportPlayer survTeleported isInZone checkzone startOBCount startedOBCount startOBMillis backInZone tmpSCtr increaseDifficulty lastCheckPoint tmpSurvInt endSurvival tmp_survstr survIsFinished tmpstrlist finalSurvMillis zone survSetsList survDifList survSetDif survResetAliases survAliases") - +const survAliases (concat $survResetAliases [resetSurvAliases genSurvDifStr survival tmpSurvSets curSurvDifficulty survLastKill survTimeBetKills startPreSurvMillis startSurvival startedSurvival setzone survOfcZones setOfcZones survMapIndex tmpSurvZone findCenter midZoneX midZoneY teleportPlayer survTeleported isInZone checkzone startOBCount startedOBCount startOBMillis backInZone tmpSCtr increaseDifficulty lastCheckPoint tmpSurvInt endSurvival tmp_survstr survIsFinished tmpstrlist finalSurvMillis zone survSetsList survDifList survSetDif survResetAliases survAliases]) addListOnQuit $survAliases - persistidents 1