From fd2e66a5120d0d2ecb170b35f9ab32675b9c0657 Mon Sep 17 00:00:00 2001 From: Bukz Date: Fri, 1 Apr 2011 04:36:05 +0000 Subject: [PATCH] even more alias conversions, colors on firstrun, new servpingrate slider in Misc menu, etc. git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6188 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/firstrun.cfg | 8 ++-- config/menus_settings.cfg | 88 +++++++++++++++++++-------------------- 2 files changed, 47 insertions(+), 49 deletions(-) diff --git a/config/firstrun.cfg b/config/firstrun.cfg index d07df9f8..350ffee8 100644 --- a/config/firstrun.cfg +++ b/config/firstrun.cfg @@ -4,12 +4,12 @@ delayed_firstrun = [ music "pingpong/Ping_Pong_-_Kamikadze.ogg" 89000 " " // 90 secs, fade new_gfx_quality 3 - echo "Welcome to AssaultCube" - echo "Developed by 'Rabid Viper Productions'" + echo (c 9)Welcome to AssaultCube + echo Developed by (c 1)'Rabid Viper Productions' echo "" - echo "Use the below menu to change some necessary settings..." + echo Use the below menu to change some necessary settings... echo "" - echo "Further help & information can be found in your README, which is inside your AssaultCube directory." + echo Further help & information can be found in your (concatword (c 3) README (c 5) ,) which is inside your AssaultCube directory. showmenu "QUICK setup" ] diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index cafbfc0c..850f44ae 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -62,11 +62,11 @@ menuitem "Proceed with tutorial" [ tutstart 1 ] menuitem " 3Cancel" [ closemenu "Confirm tutorial" ] -alias new_gfx_quality [ - if (= $arg1 6) [ // "INSANE!" gfx quality +new_gfx_quality = [ + if (= $arg1 6) [ // "INSANE!" gfx quality fsaa 8 minlod 250 - alias gfxqualityalias 6 + gfxqualityalias = 6 fpsrange 100 1000 watersubdiv 1 dynlight 1 @@ -87,10 +87,10 @@ alias new_gfx_quality [ texreduce 0 hidebigmenuimages 0 ] [ - if (= $arg1 5) [ // High gfx quality + if (= $arg1 5) [ // High gfx quality fsaa 4 minlod 200 - alias gfxqualityalias 5 + gfxqualityalias = 5 fpsrange 100 1000 watersubdiv 2 dynlight 1 @@ -110,10 +110,10 @@ alias new_gfx_quality [ texreduce 0 hidebigmenuimages 0 ] [ - if (= $arg1 4) [ // Good gfx quality + if (= $arg1 4) [ // Good gfx quality fsaa 0 minlod 100 - alias gfxqualityalias 4 + gfxqualityalias = 4 fpsrange 60 60 watersubdiv 2 dynlight 1 @@ -133,38 +133,38 @@ alias new_gfx_quality [ texreduce 0 hidebigmenuimages 0 ] [ - if (= $arg1 3) [ // Medium gfx quality (DEFAULT) + if (= $arg1 3) [ // Medium gfx quality (DEFAULT) fsaa 0 minlod 60 - alias gfxqualityalias 3 + gfxqualityalias = 3 fpsrange 30 40 watersubdiv 4 dynlight 1 // Makes sure the 3D card is powerful enough for water reflection/shadow stencils... if (glext "GL_ARB_fragment_program") [ waterreflect 1 ] [ waterreflect 0 ] if (|| (glext "GL_EXT_stencil_two_side") (glext "GL_ATI_separate_stencil")) [ - stencilbits 8 - stencilshadow 40 + stencilbits 8 + stencilshadow 40 ] [ - stencilbits 0 - stencilshadow 0 ] - dynshadow 40 - lighterror 4 - scorch 1 - bullethole 1 - blood 1 - gib 1 - gibnum 6 - shotline 1 - trilinear 1 - waterrefract 0 - texreduce 0 - hidebigmenuimages 0 + stencilbits 0 + stencilshadow 0 ] + dynshadow 40 + lighterror 4 + scorch 1 + bullethole 1 + blood 1 + gib 1 + gibnum 6 + shotline 1 + trilinear 1 + waterrefract 0 + texreduce 0 + hidebigmenuimages 0 ] [ - if (= $arg1 2) [ // Low gfx quality + if (= $arg1 2) [ // Low gfx quality fsaa 0 minlod 60 - alias gfxqualityalias 2 + gfxqualityalias = 2 fpsrange 20 25 watersubdiv 16 dynlight 0 @@ -182,10 +182,10 @@ alias new_gfx_quality [ waterrefract 0 texreduce 1 hidebigmenuimages 1 - ] [ // Horrible gfx quality + ] [ // Horrible gfx quality fsaa 0 minlod 60 - alias gfxqualityalias 1 + gfxqualityalias = 1 fpsrange 20 25 watersubdiv 64 dynlight 0 @@ -210,7 +210,7 @@ alias new_gfx_quality [ ] ] -alias new_sound_quality [ +new_sound_quality = [ if (= $arg1 3) [ // high sound (DEFAULT) soundqualityalias = 3 maxsoundsatonce 10 @@ -235,7 +235,7 @@ alias new_sound_quality [ ] newmenu "Reset settings" -menuinit [ alias resetyes 0 ] // Ensures this menu works correctly. +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. @@ -286,7 +286,7 @@ newmenu "Scope crosshairs" menudirlist "packages/crosshairs" "png" [ loadcrosshair (concatword $arg1 .png) scope ] 1 newmenu "Reset Binds" -menuinit [ alias resetbindsyes 0 ] // Ensures this menu works correctly. +menuinit [ resetbindsyes = 0 ] // Ensures this menu works correctly. menuitemcheckbox "Yes, reset all binds: " [ resetbindsyes = 1 ] [ resetbindsyes = $arg1 ] menuitem " 2 [ Apply! ] " [ if $resetbindsyes [ resetbinds ] [ showmenu "" ] ] @@ -305,19 +305,16 @@ 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" newmenu "Advanced video settings" menuitemslider "Scope FOV: " 5 60 "$scopefov" 5 "" [ scopefov $arg1 ] -alias fsaa_valuemap "-1 2 4 8 16" menuitemslider "Antialiasing (FSAA): " 0 4 "(findlist $fsaa_valuemap $fsaa)" 1 "Off 2 4 8 16" [ fsaa (at $fsaa_valuemap $arg1) ] - -alias minlod_valuemap "60 100 200 250" 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 ] - -alias watersubdiv_valuemap "16 8 4 2 1" 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 ] @@ -356,7 +353,7 @@ menuitem "FPS Range..." [ showmenu "FPS Range" ] menuitem "" -1 menuitem " 2 [ Apply now! ]" [ resetgl ] -alias fovcompatmenu [ showmenu settings; showmenu video; showmenu "Advanced video settings" ] +fovcompatmenu = [ showmenu settings; showmenu video; showmenu "Advanced video settings" ] newmenu "FPS Range" @@ -392,21 +389,22 @@ menuitemcheckbox "Show gamemodes as acronyms: " "$modeacronyms" [ modeacron menuitemcheckbox "Show quit dialog when quitting: " "$askquit" [ askquit = $arg1 ] menuitemcheckbox "Auto-screenshot: " "$autoscreenshot" [ autoscreenshot $arg1 ] menuitemslider "Servers to ping at once: " 0 50 "$maxservpings" 5 "" [ maxservpings $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; alias __screenshottype -1 ] [ if (= $arg1 0) [ screenshottype 1; jpegquality 70; alias __screenshottype 0 ] [ if (= $arg1 1) [ screenshottype 1; jpegquality 85; alias __screenshottype 1 ] [ if (= $arg1 2) [ screenshottype 1; jpegquality 100; alias __screenshottype 2 ] [ if (= $arg1 3) [ screenshottype 2; alias __screenshottype 3 ] [ if (= $arg1 4) [ screenshottype 0; alias __screenshottype 4 ] ] ] ] ] ] ] -menuitemslider "Console size: " 0 20 "$consize" 1 "" "consize $arg1" -menuitemslider "Font type: " 0 2 "$__fontsetting" 1 [ "Default" "v104" "Mono" ] [ if (= $arg1 1) [ setfont v104; alias __fontsetting 1 ] [ if (= $arg1 2) [ setfont mono; alias __fontsetting 2 ] [ setfont default; alias __fontsetting 0 ] ] ] +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" "v104" "Mono" ] [ if (= $arg1 1) [ setfont v104; __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 ] // Reduced game violence mode... -alias reducedviolencemode [ +reducedviolencemode = [ if (= $arg1 1) [ - alias poniesmodeon 1 + poniesmodeon = 1 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. ] [ // Violent - alias poniesmodeon 0 + poniesmodeon = 0 blood 1 gib 1 mutesound 48 1; loop i 8 [ mutesound (+ $i 26) 1 ] // Un-mute pain sounds