diff --git a/config/defaults.cfg b/config/defaults.cfg index 779e7a48..900e80c8 100644 --- a/config/defaults.cfg +++ b/config/defaults.cfg @@ -26,7 +26,6 @@ poniesmodeon = 0 // Reduced violence mode. __gibsgore = 1 // Default value for gibs slider. dyngamma = 0 old_editbinds = 1 -flystyle = 0 nickhighlight = 0 survMap = (rnd (listlen $defaultmaps)) survDifficulty = 0 diff --git a/config/survival.cfg b/config/survival.cfg index 4e44f85d..d2f2a12d 100644 --- a/config/survival.cfg +++ b/config/survival.cfg @@ -19,7 +19,7 @@ resetSurvAliases = [ resetSurvAliases; if (! (checkalias afterinit)) [ afterinit = "" ]; if (! (strstr $afterinit survMap)) [ add2alias afterinit [ if (! (checkalias survMap)) [ survMap = (rnd (listlen $defaultmaps)) ] ] ] genSurvDifStr = [ - if $nonSurvDefaults [ result "[CUSTOM]"] [ + if $nonSurvDefaults [ result "[CUSTOM]" ] [ result (at (concat (concatword (c 0) "[EASY]") (concatword (c 2) "[INTERMEDIATE]") (concatword (c 9) "[HARD]") (concatword (c 7) "[IMPOSSIBLE]")) $survDifficulty) ] ] @@ -106,7 +106,7 @@ isInZone = [ checkzone = [ if (! $survIsFinished) [ - if (&& $startedSurvival (&& (>= (- (millis) $startSurvMillis) 500) (|| (|| (idlebots 3) (! (botsshoot 3))) (|| $editing (!= $gamespeed 100))))) [ endSurvival (concatword (c 3) "Error: " (c 1) editmode (c 5) ", " (c 3) gamespeed (c 5) ", " (c 2) idlebots (c 5) ", and " (c 0) botsshoot (c 5) " are not allowed in Survival Mode.") ] + if (&& $startedSurvival (&& (>= (- (millis) $startSurvMillis) 500) (|| (|| (idlebots 2) (! (botsshoot 2))) (|| $editing (!= $gamespeed 100))))) [ endSurvival (concatword (genSurvDifStr) (c 3) " Error: " (c 1) editmode (c 5) ", " (c 3) gamespeed (c 5) ", " (c 2) idlebots (c 5) ", and " (c 0) botsshoot (c 5) " are not allowed in Survival Mode.") ] if (&& (isInZone) (! $startedSurvival)) [ startSurvival ] if (&& (! $startedSurvival) (>= (- (millis) $startPreSurvMillis) $timeUntilTele)) [ teleportPlayer ] if (&& (>= (- (millis) $lastCheckPoint) $timeBetChkPts) (&& $startedSurvival $gotCheckPoint)) [ increaseDifficulty ] @@ -136,6 +136,6 @@ endSurvival = [ ] // List of aliases that need to be cleared from saved.cfg on quit: -survAliases = "backInZone checkzone curSurvDifficulty endSurvival finalSurvMillis gotCheckPoint increaseDifficulty isInZone lastCheckPoint midZoneX midZoneY onKill resetSurvAliases setOfcZones setzone startedOBCount startedSurvival startOBCount startOBMillis startPreSurvMillis startSurvival startSurvMillis survIsFinished survival_test survKills survMapIndex survOfcZones survTeleported tmpSCtr tmpSurvCtr tmpSurvInt tmpSurvSets tmp_survstr tmpSurvZone tmpZoneCenter zone aliasinit survResetAliases survAliases" +survAliases = (concat $survResetAliases "backInZone checkzone curSurvDifficulty endSurvival finalSurvMillis increaseDifficulty isInZone midZoneX midZoneY onKill resetSurvAliases setOfcZones setzone startOBCount startOBMillis startSurvival survMapIndex survOfcZones tmpSCtr tmpSurvCtr tmpSurvInt tmpSurvSets tmp_survstr tmpSurvZone tmpZoneCenter zone aliasinit survResetAliases survAliases") addListOnQuit $survAliases \ No newline at end of file