diff --git a/mods/mars.js b/mods/mars.js index 22d17f11..864d909b 100644 --- a/mods/mars.js +++ b/mods/mars.js @@ -113,7 +113,7 @@ elements.mars_ironheart_ore = { elements.mars_ironheart = { color: ["#e8e8e8", "#bd1102"], behavior: [ - "XX|CR:radiation%3|XX", + "XX|XX|XX", "XX|XX|XX", "XX|XX|XX", ], @@ -191,22 +191,6 @@ elements.depleted_ironheart = { "electric": { elem1: "smint", elem2: "null" }, }, } -elements.feynmanium = { - color: "#8C7656", - behavior: [ - "XX|XX|XX|", - "XX|XX|XX|", - "M2|M1|M2|", - ], - category: "mars", - density: 1200, - state: "solid", - stateHigh: "molten_mars", - tempHigh: 6000, - reactions: { - "electric": { elem1: "smint", elem2: "null" }, - }, -} elements.antigunk = { color: "#cecece", behavior: behaviors.DGAS, @@ -391,8 +375,59 @@ elements.ironheart_core = { conduct: 1, extraInfo: "wha" } - -// 2.10.20 +elements.mars_fossil = { + color: ["#3d3d3d", "#707070", "#395034"], + behavior: behaviors.WALL, + category: "mars", + state: "solid", + tempHigh: 2500, + hardness: 0.975, + stateHigh: "molten_mars", + tempLow: -170, + stateLow: "mars_rock", + extraInfo: "Fossils! From Mars! Simply just smash them to get some tiny creatures.", + hardness: 0.4, + breakInto: "mars_debris" +} +elements.ironheart_gas = { + color: ["#500000ff", "#a7a7a7ff", "#a80000ff"], + behavior: behaviors.GAS, + category: "mars", + state: "gas", + tempLow: -100, + stateLow: "liquid_ironheart_gas", + extraInfo: "gasses" +} +elements.liquid_ironheart_gas = { + color: ["#500000ff", "#a7a7a7ff", "#a80000ff"], + behavior: behaviors.LIQUID, + category: "mars", + state: "liquid", + temp: -150, + extraInfo: "liquids" +} +elements.phing = { + color: "#00c40aff", + behavior: [ + "XX|XX|XX|", + "XX|XX|XX", + "XX|XX|XX", + ], + category: "phings", + state: "solid", + tempHigh: "800", + stateHigh: "dead_phing", + breakInto: "dead_phing", + extraInfo: "wha" +} +elements.dead_phing = { + color: "#947e00ff", + behavior: behaviors.POWDER, + category: "phings", + state: "solid", + extraInfo: "DEAD! You KILLED THEM!" +} +// 2.11.20 // most elements done :D // iron heart ore // iron heart @@ -427,6 +462,12 @@ elements.ironheart_core = { // Red Gold is Solid // Feynmanium // make things have recaitons +// its here! +// remove feynmanium +// ironheart is no longer radioactive +// fossils! + // Creditssss // Ghanisma - idea for 2.9.16 + diff --git a/mods/zoom.js b/mods/zoom.js index 6c5ba232..7a9e488e 100644 --- a/mods/zoom.js +++ b/mods/zoom.js @@ -1,289 +1,300 @@ -// IIFE because paranoid -(() => { - const zoom_levels = [ - 0.5, - 1, - 2, - 3, - 6, - 12 +const zoom_levels = [ + 0.5, + 1, + 2, + 3, + 6, + 12 +] +window.zoom_data_div = null + +window.zoom_level = 1 +window.zoom_panning = [0,0] + +function handle_zoom(direction){ + switch (direction){ + case "in": + if (!(zoom_level+1 in zoom_levels)) { break; } + window.zoom_level += 1 + break; + case "out": + if (!(zoom_level-1 in zoom_levels)) { break; } + window.zoom_level -= 1 + break; + } + rescale() +} + +function handle_pan(direction, speed){ + switch (direction){ + case "right": + zoom_panning[0] -= speed + break; + case "left": + zoom_panning[0] += speed + break; + case "up": + zoom_panning[1] += speed + break; + case "down": + zoom_panning[1] -= speed + break; + } + rescale() +} + +function gen_button(row, col, html, click, nopos, id){ + const elem = document.createElement("button") + + + if (!nopos){ + elem.style.gridColumn = row + elem.style.gridRow = col + } + if (id) { elem.id = id } + + // Table for the data-pos to assign (row major). If null, don't add. + const data_pos_map = [ + ["tl", null, "tr"], + [null, null, null], + ["bl", null, "br"] ] - window.zoom_data_div = null - window.zoom_level = 1 - window.zoom_panning = [0,0] + elem.innerHTML = html + elem.onclick = click - function handle_zoom(direction){ - switch (direction){ - case "in": - if (!(zoom_level+1 in zoom_levels)) { break; } - window.zoom_level += 1 - break; - case "out": - if (!(zoom_level-1 in zoom_levels)) { break; } - window.zoom_level -= 1 - break; - } - rescale() + if (data_pos_map[row-1][col-1] !== null) { + elem.dataset.pos = data_pos_map[row-1][col-1] } - function handle_pan(direction, speed){ - switch (direction){ - case "right": - zoom_panning[0] -= speed - break; - case "left": - zoom_panning[0] += speed - break; - case "up": - zoom_panning[1] += speed - break; - case "down": - zoom_panning[1] -= speed - break; - } - rescale() + return elem +} + +function add_css(){ + const CSS = ` + #zm_data_div { margin-bottom: 10px; } + #canvasDiv { overflow: hidden } + + @media(pointer=coarse){ + #zm_floater_container#zm_floater_container { + width: 40%; + height: auto; + } + #zm_floater_container:has(#zm_collapse[data-collapsed="true"]){ + width: calc(40% / 3); + } } - function gen_button(row, col, html, click, nopos, id){ - const elem = document.createElement("button") - - - if (!nopos){ - elem.style.gridColumn = row - elem.style.gridRow = col + @media(pointer:coarse) and (orientation:landscape){ + #zm_floater_container#zm_floater_container { + width: auto; + top: 5px; } - if (id) { elem.id = id } - - // Table for the data-pos to assign (row major). If null, don't add. - const data_pos_map = [ - ["tl", null, "tr"], - [null, null, null], - ["bl", null, "br"] - ] - - elem.innerHTML = html - elem.onclick = click - - if (data_pos_map[row-1][col-1] !== null) { - elem.dataset.pos = data_pos_map[row-1][col-1] + #zm_floater_container:has(#zm_collapse[data-collapsed="true"]){ + width: calc(40% / 3); } + } - return elem + #zm_floater_container { + position: absolute; + display: grid; + + right: 5px; + bottom: 5px; + height: 100px; + aspect-ratio: 1; + + max-width: 200px; + max-height: 200px; + + border: 2px solid white; + background-color: black; + font-size: 120%; + + button { text-align: center; border: 0px solid white } + + button:where([data-pos="tl"]) { border-width: 0px 2px 2px 0px }; + button:where([data-pos="tr"]) { border-width: 2px 2px 0px 0px }; + button:where([data-pos="bl"]) { border-width: 0px 0px 2px 2px }; + button:where([data-pos="br"]) { border-width: 2px 0px 0px 2px }; + } + #zm_floater_container:has(#zm_collapse[data-collapsed="true"]) { + button:not(#zm_collapse) { + display: none + } } - function add_css(){ - const FLOATER_CSS = ` - #zm_data_div { - margin-bottom: 10px; - } + .zm_corner { border: 2px solid white; } - #canvasDiv { - overflow: hidden - } - - #zm_floater_container { - position: absolute; - display: grid; - - right: 5px; - bottom: 5px; - height: 24%; - aspect-ratio: 1; - - border: 2px solid white; - background-color: black; - font-size: 1.2em; - - button { text-align: center; border: 0px solid white } - - button:where([data-pos="tl"]) { border-width: 0px 2px 2px 0px }; - button:where([data-pos="tr"]) { border-width: 2px 2px 0px 0px }; - button:where([data-pos="bl"]) { border-width: 0px 0px 2px 2px }; - button:where([data-pos="br"]) { border-width: 2px 0px 0px 2px }; - } - #zm_floater_container:has(#zm_collapse[data-collapsed="true"]) { - height: calc(8% - 1px); - - button:not(#zm_collapse) { - display: none - } - } - - .zm_corner { - border: 2px solid white; - } - - #zm_collapse { - grid-row: 3; - grid-column: 3; - } - #zm_collapse[data-collapsed="true"] { - grid-row: 1; - grid-column: 1; - border-width: 0px; - } - ` - - const style_div = document.createElement("style") - style_div.innerHTML = FLOATER_CSS - - document.head.appendChild(style_div) + #zm_collapse { + grid-row: 3; + grid-column: 3; } + #zm_collapse[data-collapsed="true"] { + grid-row: 1; + grid-column: 1; + border-width: 0px; + } + ` - function add_zoom_floaters(){ - const container = document.createElement("div") - container.id = "zm_floater_container" + const style_div = document.createElement("style") + style_div.innerHTML = CSS - // Pan mode selector (C: Coarse F: Fine) - const pan_mode_sel = gen_button( - 1,3, "C", + document.head.appendChild(style_div) +} + +function add_zoom_floaters(){ + const container = document.createElement("div") + container.id = "zm_floater_container" + + // Pan mode selector (C: Coarse F: Fine) + const pan_mode_sel = gen_button( + 1,3, "C", + (evt) => { + evt.target.dataset.mode = evt.target.dataset.mode == "F" ? "C" : "F" + evt.target.innerText = evt.target.dataset.mode + }, + false, + "zm_panmode_sel" + ) + + const speed = () => + (window.zoom_level > 3 ? 5 : 10) * // More granular at higher zoom levels + (pan_mode_sel.dataset.mode == "F" ? 0.25 : 1) // Increase granularity in fine mode + + container.append( + // Direction buttons + gen_button(2,1, "↑", () => handle_pan("up" ,speed())), + gen_button(1,2, "←", () => handle_pan("left" ,speed())), + gen_button(3,2, "→", () => handle_pan("right" ,speed())), + gen_button(2,3, "↓", () => handle_pan("down" ,speed())), + + // Zoom buttons + gen_button(1,1, "+", () => handle_zoom("in")), + gen_button(3,1, "-", () => handle_zoom("out")), + + // Collapse button + gen_button( + 3,3, "#", (evt) => { - evt.target.dataset.mode = evt.target.dataset.mode == "F" ? "C" : "F" - evt.target.innerText = evt.target.dataset.mode - }, - false, - "zm_panmode_sel" - ) + evt.target.dataset.collapsed = evt.target.dataset.collapsed == "true" + ? "false" + : "true" + }, + true, + "zm_collapse" + ), + pan_mode_sel + ) - const speed = () => - (window.zoom_level > 3 ? 5 : 10) * // More granular at higher zoom levels - (pan_mode_sel.dataset.mode == "F" ? 0.25 : 1) // Increase granularity in fine mode + const canvas_div = document.getElementById("canvasDiv") + canvas_div.appendChild(container) +} - container.append( - // Direction buttons - gen_button(2,1, "↑", () => handle_pan("up" ,speed())), - gen_button(1,2, "←", () => handle_pan("left" ,speed())), - gen_button(3,2, "→", () => handle_pan("right" ,speed())), - gen_button(2,3, "↓", () => handle_pan("down" ,speed())), +function rescale(){ + log_info() - // Zoom buttons - gen_button(1,1, "+", () => handle_zoom("in")), - gen_button(3,1, "-", () => handle_zoom("out")), + const scale = zoom_levels[zoom_level] + const x = zoom_panning[0] * (pixelSize * scale) + const y = zoom_panning[1] * (pixelSize * scale) - // Collapse button - gen_button( - 3,3, "#", - (evt) => { - evt.target.dataset.collapsed = evt.target.dataset.collapsed == "true" - ? "false" - : "true" - }, - true, - "zm_collapse" - ), - pan_mode_sel - ) + gameCanvas.style.transform = `translate(${x}px,${y}px) scale(${scale})` +} - const canvas_div = document.getElementById("canvasDiv") - canvas_div.appendChild(container) - } +function log_info(){ + // Values are negated to make them more intuitive + const x_pan = (-zoom_panning[0]).toString().padEnd(4) + const y_pan = (-zoom_panning[1]).toString().padEnd(4) - function rescale(){ - log_info() + if (zoom_data_div === null){ return; } - const scale = zoom_levels[zoom_level] - const x = zoom_panning[0] * (pixelSize * scale) - const y = zoom_panning[1] * (pixelSize * scale) + zoom_data_div.innerText = "" + zoom_data_div.innerText += `Scale: ${zoom_levels[zoom_level]}x\n` + zoom_data_div.innerText += `Pan : ${x_pan}, ${y_pan}` +} - gameCanvas.style.transform = `translate(${x}px,${y}px) scale(${scale})` - } +function patch_keybinds(){ + // Be more granular at higher zoom levels + const speed_a = () => zoom_level > 3 ? 5 : 10 + const speed_b = () => zoom_level > 3 ? 10 : 20 - function log_info(){ - // Values are negated to make them more intuitive - const x_pan = (-zoom_panning[0]).toString().padEnd(4) - const y_pan = (-zoom_panning[1]).toString().padEnd(4) + keybinds["9"] = () => handle_zoom("in") + keybinds["0"] = () => handle_zoom("out") - if (zoom_data_div === null){ return; } + keybinds["w"] = () => handle_pan("up", speed_a()) + keybinds["a"] = () => handle_pan("left", speed_a()) + keybinds["s"] = () => handle_pan("down", speed_a()) + keybinds["d"] = () => handle_pan("right", speed_a()) - zoom_data_div.innerText = "" - zoom_data_div.innerText += `Scale: ${zoom_levels[zoom_level]}x\n` - zoom_data_div.innerText += `Pan : ${x_pan}, ${y_pan}` - } + keybinds["W"] = () => handle_pan("up", speed_b()) + keybinds["A"] = () => handle_pan("left", speed_b()) + keybinds["S"] = () => handle_pan("down", speed_b()) + keybinds["D"] = () => handle_pan("right", speed_b()) +} - function patch_keybinds(){ - // Be more granular at higher zoom levels - const speed_a = () => zoom_level > 3 ? 5 : 10 - const speed_b = () => zoom_level > 3 ? 10 : 20 +function patch_ui(){ + add_css() + add_zoom_floaters() + + zoom_data_div = document.createElement("div") + zoom_data_div.id = "zm_data_div" + document.getElementById("logDiv").prepend(zoom_data_div) - keybinds["9"] = () => handle_zoom("in") - keybinds["0"] = () => handle_zoom("out") - - keybinds["w"] = () => handle_pan("up", speed_a()) - keybinds["a"] = () => handle_pan("left", speed_a()) - keybinds["s"] = () => handle_pan("down", speed_a()) - keybinds["d"] = () => handle_pan("right", speed_a()) - - keybinds["W"] = () => handle_pan("up", speed_b()) - keybinds["A"] = () => handle_pan("left", speed_b()) - keybinds["S"] = () => handle_pan("down", speed_b()) - keybinds["D"] = () => handle_pan("right", speed_b()) + const controls_table = document.getElementById("controlsTable").lastElementChild + controls_table.insertAdjacentHTML("beforeBegin",` + + Zoom in/out + + 9/ + 0 + + + + Pan + + W + A + S + D + + + + Pan (fast) + + Shift + + W + A + S + D + + + `) +} + +// Redefine to give correct numbers when zoomed +window.getMousePos = (canvas, evt) => { + if (evt.touches) { + evt.preventDefault(); + evt = evt.touches[0]; + isMobile = true; } + const rect = canvas.getBoundingClientRect(); - function patch_ui(){ - add_css() - add_zoom_floaters() + let x = (evt.clientX - rect.left) / zoom_levels[zoom_level]; + let y = (evt.clientY - rect.top) / zoom_levels[zoom_level]; - zoom_data_div = document.createElement("div") - zoom_data_div.id = "zm_data_div" - document.getElementById("logDiv").prepend(zoom_data_div) - - const controls_table = document.getElementById("controlsTable").lastElementChild - controls_table.insertAdjacentHTML("beforeBegin",` - - Zoom in/out - - 9/ - 0 - - - - Pan - - W - A - S - D - - - - Pan (fast) - - Shift + - W - A - S - D - - - `) - } + x = Math.floor((x / canvas.clientWidth) * (width+1)); + y = Math.floor((y / canvas.clientHeight) * (height+1)); - // Redefine to give correct numbers when zoomed - window.getMousePos = (canvas, evt) => { - if (evt.touches) { - evt.preventDefault(); - evt = evt.touches[0]; - isMobile = true; - } - const rect = canvas.getBoundingClientRect(); + return {x:x, y:y}; +} - let x = (evt.clientX - rect.left) / zoom_levels[zoom_level]; - let y = (evt.clientY - rect.top) / zoom_levels[zoom_level]; +runAfterReset(() => { + window.zoom_level = 1 + rescale() +}) - x = Math.floor((x / canvas.clientWidth) * (width+1)); - y = Math.floor((y / canvas.clientHeight) * (height+1)); - - return {x:x, y:y}; - } - - runAfterReset(() => { - window.zoom_level = 1 - rescale() - }) - - runAfterLoad(() => { - patch_keybinds() - patch_ui() - }) -})() +runAfterLoad(() => { + patch_keybinds() + patch_ui() +})