diff --git a/css/fonts/scp.css b/css/fonts/scp.css new file mode 100644 index 0000000..c7e00f7 --- /dev/null +++ b/css/fonts/scp.css @@ -0,0 +1,8 @@ +@font-face{ + font-family: scp-font; + src: url('../../fonts/scp.ttf'); +} + +:root{ + --primary-font: scp-font +} diff --git a/css/themes/modern.css b/css/themes/modern.css new file mode 100644 index 0000000..5a92612 --- /dev/null +++ b/css/themes/modern.css @@ -0,0 +1,30 @@ +:root{ + --background-body: #111; + --background-header: #222; + --color-base: #333; + --color-primary: #f90; + --color-hover: #383838; + --color-hover-strong: #444; + --color-contrast: #fff; + --color-success: #060; + --button-dark: #000; + --notification--error: #a20; + --notification--success: #3a0; + --notification--special: #a60; +} + +.omega { + display: inline-block; + transform: scale(1.5,1); + margin-right: 0.2em; +} + +button, .settings-panel { + border: none !important; + border-radius: 12px; + background-color: var(--color-base); +} + +.guide-item .header { + border-bottom: none; +} \ No newline at end of file diff --git a/fonts/scp.ttf b/fonts/scp.ttf new file mode 100644 index 0000000..19bb671 Binary files /dev/null and b/fonts/scp.ttf differ diff --git a/js/classes/prestigelayer.js b/js/classes/prestigelayer.js index 9da4969..236384a 100644 --- a/js/classes/prestigelayer.js +++ b/js/classes/prestigelayer.js @@ -44,16 +44,20 @@ class PrestigeLayer } } } - static getNameForLayer(layer) + static getNameForLayer(layer, negated = false) { let nLayer = layer; if(layer instanceof Decimal) { nLayer = layer.toNumber(); } - if(layer instanceof Decimal && !layer.gte(0)) + if(layer instanceof Decimal && !layer.gte(0) && !negated) { - return "-" + PrestigeLayer.getNameForLayer(new Decimal("-1").minus(nLayer)) + return "-" + PrestigeLayer.getNameForLayer(new Decimal("-1").minus(nLayer), true) + } + if(layer instanceof Decimal && layer.round().neq(layer)) { + if (negated) layer = layer.add(1) + return "𐌒≠" + layer.toString() } if(layer instanceof Decimal && layer.gte(mod.Infinities[0]) && !layer.gte(mod.Infinities[1])) { diff --git a/js/components/engine-tab.js b/js/components/engine-tab.js index 96b71f4..58e57e9 100644 --- a/js/components/engine-tab.js +++ b/js/components/engine-tab.js @@ -1,6 +1,11 @@ Vue.component("engine-tab", { template: `
+ + + + diff --git a/js/components/layer-colored-text.js b/js/components/layer-colored-text.js index bdedeb4..94fd553 100644 --- a/js/components/layer-colored-text.js +++ b/js/components/layer-colored-text.js @@ -34,13 +34,16 @@ Vue.component("layer-colored-text", { }, textGlow: function() { - const thickness = 0.025 * this.getLayerId(); + var layer = this.getLayerId() + let thickness = 0.025 * layer; + if (thickness < 0) thickness = .4 + layer = Math.abs(layer) const t = [Math.max(0, Math.min(0.7, thickness)), Math.max(0, Math.min(0.7, thickness / 2)), Math.max(0, Math.min(0.7, Math.max(0, thickness - 0.3) / 4))]; - const color = "currentcolor"; - return "0px 0px " + t[0] + "em currentcolor"+ - ",0px 0px " + t[1] + "em currentcolor"+ - ",0px 0px " + t[2] + "em currentcolor"; + var color = this.textColor + return "0px 0px " + t[0] + "em "+color+ + ",0px 0px " + t[1] + "em "+color+ + ",0px 0px " + t[2] + "em "+color; } }, methods: diff --git a/js/components/settings-menu.js b/js/components/settings-menu.js index bd385c1..3f9ad59 100644 --- a/js/components/settings-menu.js +++ b/js/components/settings-menu.js @@ -172,7 +172,7 @@ Vue.component("settings-menu", {

Layer Info Finder


Layer ID:

- +

Output:


Layer:


@@ -184,8 +184,8 @@ Vue.component("settings-menu", {

Inspiration: Antimatter Dimensions by hevipelle, Infinite Layers by dan-simon

Original Game (Omega Layers) created by VeproGames

Powered by vue.js and break_eternity.min.js

-

` + mod.primaryName + mod.secondaryName + ` v` + mod.version +`

- ` + ((mod.primaryName + mod.secondaryName) !== "ωEngine" ? ("

Built with ωEngine v" + mod.engineVer + "

") : "") + ` +

${mod.primaryName + mod.secondaryName} v${mod.primaryName + mod.secondaryName === "ωEngine" ? mod.engineVer : mod.version}

+

${mod.primaryName + mod.secondaryName !== "ωEngine" ? "Made with ωEngine v" + mod.engineVer : ""}

` }) diff --git a/js/data/functions.js b/js/data/functions.js index 6b94e5b..abcd3d1 100644 --- a/js/data/functions.js +++ b/js/data/functions.js @@ -414,12 +414,15 @@ const functions = { }, textGlow: function(layer) { - const thickness = 0.025 * layer; + let thickness = 0.025 * layer; + if (thickness < 0) thickness = .4 + layer = layer.abs() const t = [Math.max(0, Math.min(0.7, thickness)), Math.max(0, Math.min(0.7, thickness / 2)), Math.max(0, Math.min(0.7, Math.max(0, thickness - 0.3) / 4))]; - return "0px 0px " + t[0] + "em currentcolor"+ - ",0px 0px " + t[1] + "em currentcolor"+ - ",0px 0px " + t[2] + "em currentcolor"; + var color = this.textColor(layer) + return "0px 0px " + t[0] + "em "+color+ + ",0px 0px " + t[1] + "em "+color+ + ",0px 0px " + t[2] + "em "+color; }, layerFinder: function(layer) { layer = new Decimal(layer) diff --git a/js/main.js b/js/main.js index 4763e77..381c3e4 100644 --- a/js/main.js +++ b/js/main.js @@ -6,7 +6,7 @@ let localTimer = 0; let keyMap = []; let tabMap = {}; -const textBoxFocused = false; +let textBoxFocused = false; const app = new Vue({ el: "#app", diff --git a/js/mod.js b/js/mod.js index cfdf945..e1740a6 100644 --- a/js/mod.js +++ b/js/mod.js @@ -2,12 +2,13 @@ const mod = { primaryName: "ω", secondaryName: "Engine", version: "1.0.0", - engineVer: "1.0.0 P1", //DO NOT MODIFY + engineVer: "1.0.1", //DO NOT MODIFY debugMode: false, Infinities: [new Decimal(2).pow(1024), new Decimal("1.8e30008"), new Decimal("1.8e300000008"), new Decimal("ee38")], themes: [ ["Dark", "css/themes/dark.css"], ["Dark Alt (by Jeehan2561)", "css/themes/darkalt.css"], + ["Modern", "css/themes/modern.css"], ["Light", "css/themes/light.css"], ["Neon", "css/themes/neon.css"], ["Godot Blue", "css/themes/darkblue.css"], @@ -52,8 +53,10 @@ const mod = { [Utils.createRandomWord(2, new Random(Math.floor(Date.now()/3)).nextInt()),Utils.createRandomWord(3, new Random(Math.floor(Date.now()/4)).nextInt()),Utils.createRandomWord(4, new Random(Math.floor(Date.now()/5)).nextInt()),Utils.createRandomWord(5, new Random(Math.floor(Date.now()/6)).nextInt())] ]] ], + layerNamePlaceholder: "𐌒", fonts: [ ["Monospace Typewriter", "css/fonts/typespace.css"], + ["Source Code Pro", "css/fonts/scp.css"], ["Comic Sans", "css/fonts/comic.css"], ["Arial", "css/fonts/arial.css"], ["Roboto", "css/fonts/roboto.css"], @@ -67,11 +70,6 @@ const mod = { ["Save 3", "3"], ["Save 4", "4"], ], - extraNames: [ - this.primaryName+this.secondaryName, //title name - this.primaryName+this.secondaryName, //save name - this.primaryName+this.secondaryName, //save .txt name - ], debugClasses: [] }