diff --git a/js/canvas.js b/js/canvas.js index d077b78..7081a72 100644 --- a/js/canvas.js +++ b/js/canvas.js @@ -29,9 +29,9 @@ var colors = { 3: "#7f7f7f", }, aqua: { - 1: "#bfefff", - 2: "#8fb3bf", - 3: "#5f777f", + 1: "#bfdfff", + 2: "#8fa7bf", + 3: "#5f6f7f", }, } var colors_theme diff --git a/js/game.js b/js/game.js index 0c7a637..975c47a 100644 --- a/js/game.js +++ b/js/game.js @@ -1870,7 +1870,11 @@ function checkForVars() { } if (player.hasNaN === undefined) player.hasNaN = false if (player.h.active === undefined) player.h.active = 0 - if (player.h.time === undefined) player.h.time = 0 + if (player.h.time === undefined) player.h.time = player.timePlayed + else if (typeof(player.h.time) == "string") { + player.h.time = Number(player.h.time) + if (isNaN(player.h.time)) player.h.time = player.timePlayed + } if (player.q.auto === undefined) player.q.auto = false if (player.msDisplay === undefined) player.msDisplay = "always" if (player.hb.auto === undefined) player.hb.auto = false @@ -3849,8 +3853,10 @@ function gameLoop(diff) { player.tab = "gameEnded" } if (player.devSpeed) diff *= player.devSpeed + player.timePlayed += diff player.h.time += diff + if (tmp.challActive ? tmp.challActive.h[42] : true) { if (player.h.time>=10) diff = 0 else diff = Decimal.div(diff, Decimal.div(10, Decimal.sub(10, player.h.time + 1)).pow(1000)) @@ -3939,10 +3945,11 @@ function gameLoop(diff) { if (player.ps.auto&&player.ps.best.gte(2)) doReset("ps") if (player.hasNaN&&!NaNalert) { - alert("We have detected a corruption in your save. Please visit https://discord.gg/wwQfgPa for help.") clearInterval(interval); player.autosave = false; NaNalert = true; + + alert("We have detected a corruption in your save. Please visit https://discord.gg/wwQfgPa for help.") } } @@ -3985,9 +3992,10 @@ const theme_names = { function changeTheme() { let aqua = player.theme == "aqua" colors_theme = colors[player.theme || "default"] - document.body.style.setProperty('--background', aqua ? "#002f3f" : "#000000") - document.body.style.setProperty('--color', aqua ? "#bfefff" : "#bfbfbf") - document.body.style.setProperty('--points', aqua ? "#dff7ff" : "#ffffff") + document.body.style.setProperty('--background', aqua ? "#001f3f" : "#0f0f0f") + document.body.style.setProperty('--background_tooltip', aqua ? "rgba(0, 15, 31, 0.75)" : "rgba(0, 0, 0, 0.75)") + document.body.style.setProperty('--color', aqua ? "#bfdfff" : "#dfdfdf") + document.body.style.setProperty('--points', aqua ? "#dfefff" : "#ffffff") } function getThemeName() { @@ -4010,8 +4018,8 @@ document.onkeydown = function(e) { let shiftDown = e.shiftKey let ctrlDown = e.ctrlKey let key = e.key - if (ctrlDown && (key != "a" || key != "c" || key != "v")) e.preventDefault() if (onFocused) return + if (ctrlDown) e.preventDefault() if (player.m.unl && key >= 0 && key <= 9) { if (key == 0) activateSpell(10) else activateSpell(key) @@ -4031,7 +4039,7 @@ document.onkeydown = function(e) { if (player.sg.unl) doReset("sg") return case "s": - if (ctrlDown && player.hs.unl) doReset("ss") + if (ctrlDown && player.hs.unl) doReset("hs") return case "S": if (player.ss.unl) doReset("ss") diff --git a/style.css b/style.css index af8ef39..ec580d5 100644 --- a/style.css +++ b/style.css @@ -16,7 +16,7 @@ body { background-color: var(--background); color: var(--color); overflow: hidden; - --background: #000000; + --background: #0f0f0f; --color: #dfdfdf; --points: #ffffff; } @@ -583,9 +583,10 @@ ul { } .hChall { - background-color: #fa7f8a; - border: 2px solid #ff0017; - color: #ff0017; + background-color: #bf8f8f; + border: 4px solid; + border-color: rgba(255, 255, 255, 0.125) rgba(0, 0, 0, 0.25) rgba(0, 0, 0, 0.25) rgba(255, 255, 255, 0.125); + color: rgba(0, 0, 0, 0.5); width: 300px; height: 300px; font-size: 15px; @@ -593,15 +594,11 @@ ul { } .hChall.done { - background-color: #95fcb4; - border: 2px solid #038c2c; - color: #038c2c; + background-color: #77bf5f; } .hChall.canComplete { - background-color: #93f0fa; - border: 2px solid #03858f; - color: #03858f; + background-color: #ffbf00; } .fullWidth { @@ -640,9 +637,8 @@ ul { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - background-color: #000; - background-color: hsla(0, 0%, 5%, 0.9); - color: #fff; + background-color: var(--background_tooltip); + color: var(--points); content: attr(tooltip); text-align: center; font-size: 14px; @@ -657,8 +653,7 @@ ul { left: 50%; margin-left: -5px; width: 0; - border-top: 5px solid #000; - border-top: 5px solid hsla(0, 0%, 5%, 0.9); + border-top: 5px solid var(--background_tooltip); border-right: 5px solid transparent; border-left: 5px solid transparent; content: " ";