diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index 7843153c..060354f1 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -400,7 +400,7 @@ menuitemslider "Screenshot type: " -1 4 "$__screenshottype" 1 [ "JPEG (Terrible 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 ] -menuitemslider "Fly style: " 0 1 "$flystyle" 1 [ "fly fast, toggle slow" "fly slow, toggle fast" ] [ flystyle = $arg1 ] +menuitemslider "Fly style: " 0 1 "$flystyle" 1 [ "fly fast, toggle slow" "fly slow, toggle fast" ] [ flystyle = $arg1; slowmove $arg1 ] 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 ] diff --git a/config/survival.cfg b/config/survival.cfg index 1168af2c..5cc234ef 100644 --- a/config/survival.cfg +++ b/config/survival.cfg @@ -114,14 +114,10 @@ checkzone = [ ] startOBCount = [ - startedOBCount = 1; startOBMillis = (millis); backInZone = 0 - echo (c 3)Get back into the arena! (c 9)You only have (c 5)5 (c 9)seconds to return.; echo (c 0)5... - if (isInZone) [ backInZone = 1 ] - sleep 1000 [ if (&& (! (isInZone)) (! $backInZone)) [ echo (c 0)4... ] [ backInZone = 1 ] ] - sleep 2000 [ if (&& (! (isInZone)) (! $backInZone)) [ echo (c 3)3... ] [ backInZone = 1 ] ] - sleep 3000 [ if (&& (! (isInZone)) (! $backInZone)) [ echo (c 3)2... ] [ backInZone = 1 ] ] - sleep 4000 [ if (&& (! (isInZone)) (! $backInZone)) [ echo (c 6)1... ] [ backInZone = 1 ] ] - sleep 5000 [ if (&& (! (isInZone)) (! $backInZone)) [ if (>= (- (millis) $startOBMillis) 5000) [ endSurvival (concatword (c 3) "You took too long to return to the arena!") ] ] [ startedOBCount = 0 ] ] + startedOBCount = 1; startOBMillis = (millis); backInZone = 0; tmpSCtr = 5 + echo (c 3)Get back into the arena! (c 9)You only have (c 5)5 (c 9)seconds to return. + loop soc 5 [ sleep (* $soc 1000) [ if (&& (! (isInZone)) (! $backInZone)) [ echo (concatword (c 2) $tmpSCtr ...); -= tmpSCtr 1 ] [ backInZone = 1 ] ] ] + sleep 5000 [ if (&& (! (isInZone)) (&& (! $backInZone) (>= (- (millis) $startOBMillis) 5000))) [ endSurvival (concatword (c 3) "You took too long to return to the arena!") ] [ startedOBCount = 0 ] ] ] increaseDifficulty = [