From 4eeb474467e094dbeec00ebac0d7248f9013867c Mon Sep 17 00:00:00 2001 From: Bukz Date: Sat, 23 Apr 2011 18:47:42 +0000 Subject: [PATCH] menus/config updates git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6309 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/admin.cfg | 6 ++++-- config/defaults.cfg | 2 +- config/menus.cfg | 2 ++ config/menus_bot.cfg | 4 ++-- config/menus_multiplayer.cfg | 2 ++ config/menus_settings.cfg | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/config/admin.cfg b/config/admin.cfg index cb708c6e..f769da1a 100644 --- a/config/admin.cfg +++ b/config/admin.cfg @@ -1,3 +1,5 @@ +ingall = 0 + kick = [ callvote 0 $arg1 $arg2 ] ban = [ callvote 1 $arg1 $arg2 ] removebans = [ callvote 2 $arg1 ] @@ -5,8 +7,8 @@ mastermode = [ callvote 3 $arg1 ] autoteam = [ callvote 4 $arg1 ] forceteam = [ callvote 5 $arg1 ] forceme = [ forceteam (findcn $curname) ] -ignoreall = [ if $connected [ loop ia 21 [ ignore $ia ] ] ] -unignoreall = [ if $connected [ clearignored ] ] +ignoreall = [ if $connected [ ingall = 1; loop ia 21 [ ignore $ia ]; echo (c 1)NOTE: (c 5)All clients currently on the server were ignored. ] ] +unignoreall = [ if $connected [ ingall = 0; clearignored ]; echo (c 1)NOTE: (c 5)All clients currently on the server were unignored. ] giveadmin = [ callvote 6 $arg1 ] map = [ callvote 7 $arg1 $arg2 ] recorddemo = [ callvote 8 1 ] diff --git a/config/defaults.cfg b/config/defaults.cfg index 79277c37..edadc6aa 100644 --- a/config/defaults.cfg +++ b/config/defaults.cfg @@ -26,7 +26,7 @@ poniesmodeon = 0 // Reduced violence mode. __gibsgore = 1 // Default value for gibs slider. dyngamma = 0 old_editbinds = 1 -nickhighlight = 5 +nickhighlight = 0 survMap = (rnd (listlen $defaultmaps)) survDifficulty = 0 survNumBots = 12 diff --git a/config/menus.cfg b/config/menus.cfg index a740f6b0..b330f74b 100755 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -66,6 +66,8 @@ menuitem "Download demos from the server" [ listdemos; showmenu "Download demo" newmenu "Download demo" menuinit [ echo (c 4)Choose the demo number you wish to download, as shown below in the console. ] +menuitem " 9 Download the latest demo..." [ getdemo "" ] +menuitem [] -1 menuitemtextinput "Demo number: " "" [ dldemo = $arg1 ] menuitem " 2 [ Download ] " [ getdemo $dldemo ] diff --git a/config/menus_bot.cfg b/config/menus_bot.cfg index 18849774..c4391aa1 100644 --- a/config/menus_bot.cfg +++ b/config/menus_bot.cfg @@ -108,8 +108,8 @@ newmenu "Survival Mode" menuitemslider "Map: " 0 28 "$survMap" 1 [ "ac_aqueous" "ac_arabian" "ac_arctic" "ac_arid" "ac_complex" "ac_depot" "ac_desert" "ac_desert2" "ac_desert3" "ac_douze" "ac_edifice" "ac_elevation" "ac_gothic" "ac_iceroad" "ac_industrial" "ac_ingress" "ac_keller" "ac_mines" "ac_outpost" "ac_power" "ac_rattrap" "ac_scaffold" "ac_shine" "ac_snow" "ac_stellar" "ac_sunset" "ac_toxic" "ac_urban" "ac_werk" ] [ survMap = $arg1 ] menuitemslider "Difficulty: " 0 3 "$survDifficulty" 1 [ "easy" "intermediate" "hard" "impossible" ] [ survDifficulty = $arg1; tmpSurvCtr = 0; loop sdl 4 [ (at $survSetsList $sdl) = (at (at $survDifList $survDifficulty) $tmpSurvCtr); += tmpSurvCtr 1 ] ] 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" menuitemslider "# of bots to spawn on start: " 6 20 "$survNumBots" 1 [] [ survNumBots = $arg1 ] diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg index 0adaf0ba..f772ebb8 100644 --- a/config/menus_multiplayer.cfg +++ b/config/menus_multiplayer.cfg @@ -23,6 +23,7 @@ menuitem "Change player skin..." [showmenu (at [CLA RVSF] (curteam))] [ __ingam 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 ] @@ -119,6 +120,7 @@ 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 ] newmenu Gamemode diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index 0645152c..d7086037 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -377,7 +377,7 @@ menuitem "" -1 menuitemcheckbox "Reduced violence mode: " "$poniesmodeon" [ reducedviolencemode $arg1 ] menuitemcheckbox "Auto weapon reload: " "$autoreload" [ autoreload $arg1 ] menuitemslider "Gib gore: " 0 4 "$__gibsgore" 1 [ "Off" "Normal" "Good" "Messy" "Unrealistic" ] [ gibsgore $arg1 ] -menuitemslider "Name highlight color: " 0 9 "$nickhighlight" 1 [ " 0green" " 1blue" " 2yellow" " 3red" " 4gray" "white" " 6dark brown" " 7dark red" " 8purple" " 9orange" ] [ nickhighlight = $arg1; HIGHLIGHT = (c $nickhighlight) ] +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 "Hit sound: " "$hitsound" [ hitsound $arg1 ] menuitemcheckbox "Show scores on death: " "$showscoresondeath" [ showscoresondeath $arg1 ] menuitem "Change to the enemy team" [ changeteam ]