v0.0.3

jwklong · Jan 3, 2022 · c4456ff · c4456ff
1 parent 1528733
commit c4456ff
Show file tree

Hide file tree

Showing 18 changed files with 91 additions and 49 deletions.
diff --git a/css/fonts/arial.css b/css/fonts/arial.css
@@ -0,0 +1,8 @@
+@font-face{
+    font-family: arial-font;
+    src: url('../../fonts/arial.ttf');
+}
+
+:root{
+    --primary-font: arial-font
+}
diff --git a/css/fonts/comic.css b/css/fonts/comic.css
@@ -0,0 +1,8 @@
+@font-face{
+    font-family: comic-sans;
+    src: url('../../fonts/comic.ttf');
+}
+
+:root{
+    --primary-font: comic-sans
+}
diff --git a/css/fonts/roboto.css b/css/fonts/roboto.css
@@ -0,0 +1,8 @@
+@font-face{
+    font-family: roboto;
+    src: url('../../fonts/roboto.ttf');
+}
+
+:root{
+    --primary-font: roboto
+}
diff --git a/css/fonts/typespace.css b/css/fonts/typespace.css
diff --git a/css/main.css b/css/main.css
@@ -1,6 +1,6 @@
 @font-face{
-    font-family: monospace-typewriter-font;
-    src: url('../fonts/MonospaceTypewriter.ttf');
+    font-family: typespace;
+    src: url('../fonts/typespace.ttf');
 }
 
 :root{
@@ -21,7 +21,7 @@
     --notification--success--border: #000000;
     --notification--special: #ff00ff;
     --notification--special--border: #000000;
-    --primary-font: monospace-typewriter-font
+    --primary-font: typespace
 }
 
 @keyframes resource-hue-spin{

diff --git a/fonts/arial.ttf b/fonts/arial.ttf
diff --git a/fonts/comic.ttf b/fonts/comic.ttf
diff --git a/fonts/roboto.ttf b/fonts/roboto.ttf
diff --git a/fonts/MonospaceTypewriter.ttf → fonts/typespace.ttf b/fonts/MonospaceTypewriter.ttf → fonts/typespace.ttf
diff --git a/index.html b/index.html
@@ -2,21 +2,22 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8"/>
-    <title>&#3486;-l&lambda;&gamma;ers</title>
+    <title>&omega;Engine</title>
     <link rel="icon" href="favicon.png"/>
 
-    <meta name="keywords" content="sussy"/>
-    <meta name="description" content="when the layers are demo 😳😳😳"/>
+    <meta name="keywords" content="&omega;Engine"/>
+    <meta name="description" content="Modding Engine"/>
     <meta name="image" content="cover.png"/>
-    <meta name="theme-color" content="#F5431F"/>
+    <meta name="theme-color" content="#ffa600"/>
 
-    <meta name="og:title" content="sussy layers"/>
+    <meta name="og:title" content="&omega;Engine"/>
     <meta name="og:type" content="website"/>
-    <meta name="og:description" content="when the layers are demo 😳😳😳"/>
+    <meta name="og:description" content="Modding Engine"/>
     <meta name="og:image" content="cover.png"/>
 
     <link rel="stylesheet" href="css/main.css"/>
     <link id="theme" rel="stylesheet" href="css/themes/dark.css"/>
+    <link id="font" rel="stylesheet" href="css/fonts/typespace.css"/>
 </head>
 <body>
 <div id="loading">
@@ -61,7 +62,7 @@ <h2 id="superImportantTitle"><span class="omega">ω</span>Engine</h2>
     <footer>
         <div>
             <a href="https://veprogames.github.io/omega-layers" target="_blank">Original Game</a>
-            <a href="https://www.youtube.com/watch?v=dQw4w9WgXcQ" target="_blank">Website</a>
+            <a href="https://github.com/jwklong/omega-engine" target="_blank">Source Code</a>
         </div>
     </footer>
 </div>
@@ -77,9 +78,7 @@ <h2 id="superImportantTitle"><span class="omega">ω</span>Engine</h2>
 <!-- <script src="https://cdn.jsdelivr.net/npm/vue@2"></script> -->
 
 <script>
-    const INFINITY = new Decimal("1.8e308");
-    const INFINITY2 = new Decimal("1.8e30800");
-    const INFINITY3 = new Decimal("1.8e308000000");
+    const Infinities = [new Decimal("1.8e308"), new Decimal("1.8e30800"), new Decimal("1.8e308000000")]
     var LETTERS = "αβγδεζηθικλμνξοπρστυφχψωΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩ";
     var ORDERS = "ψϝϛͱϻϙͳϸ";
     var GIANTS = ["<span class='flipped-v'>Ω</span>", "<span class='flipped-v'>Ω</span><sup>2</sup>","<span class='flipped-v'>Ω</span><sup>3</sup>"]

diff --git a/js/classes/prestigelayer.js b/js/classes/prestigelayer.js
@@ -55,35 +55,35 @@ class PrestigeLayer
         {
             return "-" + PrestigeLayer.getNameForLayer(new Decimal("-1").minus(nLayer))
         }
-        if(layer instanceof Decimal && layer.gte(INFINITY) && !layer.gte(INFINITY2))
+        if(layer instanceof Decimal && layer.gte(Infinities[0]) && !layer.gte(Infinities[1]))
         {
-            const infinityOrder = Decimal.log(layer, INFINITY).floor();
+            const infinityOrder = Decimal.log(layer, Infinities[0]).floor();
             if(infinityOrder.gte(6))
             {
-                const exp = PrestigeLayer.getNameForLayer(layer.div(Decimal.pow(INFINITY, infinityOrder)).floor().sub(1));
+                const exp = PrestigeLayer.getNameForLayer(layer.div(Decimal.pow(Infinities[0], infinityOrder)).floor().sub(1));
                 return "(" + GIANTS[0] + "↑↑" + functions.formatNumber(infinityOrder, 3, 0, 1e9) + ")<sup>" + exp + "</sup>";
             }
-            return GIANTS[0] + "<sup>" + PrestigeLayer.getNameForLayer(layer.div(INFINITY).floor().sub(1)) + "</sup>";
+            return GIANTS[0] + "<sup>" + PrestigeLayer.getNameForLayer(layer.div(Infinities[0]).floor().sub(1)) + "</sup>";
         }
-        if(layer instanceof Decimal && layer.gte(INFINITY2) && !layer.gte(INFINITY3))
+        if(layer instanceof Decimal && layer.gte(Infinities[1]) && !layer.gte(Infinities[2]))
         {
-            const infinityOrder = Decimal.log(layer, INFINITY2).floor();
+            const infinityOrder = Decimal.log(layer, Infinities[1]).floor();
             if(infinityOrder.gte(6))
             {
-                const exp = PrestigeLayer.getNameForLayer(layer.div(Decimal.pow(INFINITY2, infinityOrder)).floor().sub(1));
+                const exp = PrestigeLayer.getNameForLayer(layer.div(Decimal.pow(Infinities[1], infinityOrder)).floor().sub(1));
                 return "(" + GIANTS[1] + "↑↑" + functions.formatNumber(infinityOrder, 3, 0, 1e9) + ")<sup>" + exp + "</sup>";
             }
-            return GIANTS[1] + "<sup>" + PrestigeLayer.getNameForLayer(layer.div(INFINITY2).floor().sub(1)) + "</sup>";
+            return GIANTS[1] + "<sup>" + PrestigeLayer.getNameForLayer(layer.div(Infinities[1]).floor().sub(1)) + "</sup>";
         }
-        if(layer instanceof Decimal && layer.gte(INFINITY3))
+        if(layer instanceof Decimal && layer.gte(Infinities[2]))
         {
-            const infinityOrder = Decimal.log(layer, INFINITY3).floor();
+            const infinityOrder = Decimal.log(layer, Infinities[2]).floor();
             if(infinityOrder.gte(6))
             {
-                const exp = PrestigeLayer.getNameForLayer(layer.div(Decimal.pow(INFINITY3, infinityOrder)).floor().sub(1));
+                const exp = PrestigeLayer.getNameForLayer(layer.div(Decimal.pow(Infinities[2], infinityOrder)).floor().sub(1));
                 return "(" + GIANTS[2] + "↑↑" + functions.formatNumber(infinityOrder, 3, 0, 1e9) + ")<sup>" + exp + "</sup>";
             }
-            return GIANTS[2] + "<sup>" + PrestigeLayer.getNameForLayer(layer.div(INFINITY3).floor().sub(1)) + "</sup>";
+            return GIANTS[2] + "<sup>" + PrestigeLayer.getNameForLayer(layer.div(Infinities[2]).floor().sub(1)) + "</sup>";
         }
         const letters = LETTERS;
         const orders = ORDERS;
@@ -283,7 +283,7 @@ class PrestigeLayer
         {
             return new Decimal(1);
         }
-        const boostRes = Decimal.min(this.resource, INFINITY).mul(Decimal.pow(Decimal.max(1, this.resource.div(INFINITY)), 0.2));
+        const boostRes = Decimal.min(this.resource, Infinities[0]).mul(Decimal.pow(Decimal.max(1, this.resource.div(Infinities[0])), 0.2));
         const challengePow = game.currentChallenge && game.currentChallenge.type === CHALLENGE_EFFECT_UPGRADESTRENGTH_SIMPLEBOOST ? game.currentChallenge.applyEffect() : 1;
         const boost = boostRes.add(1).pow(2 * Math.pow(this.getExponentialBoostFactor(), this.layer - 1)).pow(challengePow);
         return this.hasSimpleBoost() ? boost : new Decimal(1);

diff --git a/js/classes/utils.js b/js/classes/utils.js
@@ -53,7 +53,7 @@ class Utils
         return gen;
     }
 
-    static createValueDilation(value, strength, start = INFINITY)
+    static createValueDilation(value, strength, start = Infinities[0])
     {
         return value.pow(Decimal.max(0, value.div(start).log10().mul(strength)).add(1));
     }

diff --git a/js/components/layer-colored-text.js b/js/components/layer-colored-text.js
@@ -4,15 +4,15 @@ Vue.component("layer-colored-text", {
         textColor: function()
         {
             const lid = new Decimal(this.getLayerId());
-            if(this.getLayerId() instanceof Decimal && this.getLayerId().gte(INFINITY3))
+            if(this.getLayerId() instanceof Decimal && this.getLayerId().gte(Infinities[2]))
             {
                 return "#ff9100";
             }
-            if(this.getLayerId() instanceof Decimal && this.getLayerId().gte(INFINITY2))
+            if(this.getLayerId() instanceof Decimal && this.getLayerId().gte(Infinities[1]))
             {
                 return "#00ffb7";
             }
-            if(this.getLayerId() instanceof Decimal && this.getLayerId().gte(INFINITY))
+            if(this.getLayerId() instanceof Decimal && this.getLayerId().gte(Infinities[0]))
             {
                 return "#ff00ff";
             }

diff --git a/js/components/settings-menu.js b/js/components/settings-menu.js
@@ -6,7 +6,8 @@ Vue.component("settings-menu", {
             exportString: "The exported Save String will appear here. Keep it somewhere safe." +
                 " Click Import to load the save string from the text field.",
             themes: mod.themes,
-            names: mod.layerNames
+            names: mod.layerNames,
+            fonts: mod.fonts
         }
     },
     mounted: function()
@@ -37,7 +38,7 @@ Vue.component("settings-menu", {
             a.style.display = "none";
             document.body.appendChild(a);
             a.href = "data:application/octet-stream;charset=utf-8," + this.exportString;
-            a.download = "omega-layers-" + dateString + ".txt";
+            a.download = mod.primaryName+mod.secondaryName+dateString+".txt";
             a.click();
             document.body.removeChild(a);
         },
@@ -78,22 +79,23 @@ Vue.component("settings-menu", {
             {
                 if(!ret)
                 {
-                    functions.createNotification(new Notification(NOTIFICATION_ERROR, "your import too sussy to load", "images/save.svg"));
+                    functions.createNotification(new Notification(NOTIFICATION_ERROR, "Error occured while importing...", "images/save.svg"));
                 }
                 else if(ret === -1)
                 {
-                    functions.createNotification(new Notification(NOTIFICATION_ERROR, "bro why did you do among us..."));
+                    functions.createNotification(new Notification(NOTIFICATION_ERROR, "CoNfUsIoN"));
                 }
                 else
                 {
-                    functions.createNotification(new Notification(NOTIFICATION_SUCCESS, "sussy game imported!11!!", "images/save.svg"));
+                    functions.createNotification(new Notification(NOTIFICATION_SUCCESS, "Game imported!", "images/save.svg"));
                 }
             }
             game.settings.tab = "Layers";
         },
         hardResetGame: () => functions.hardResetGame(),
         setTheme: css => functions.setTheme(css),
         setNames: js => functions.setNames(js),
+        setFont: css => functions.setFont(css),
         volatilityUnlocked: () => functions.maxLayerUnlocked() >= 2
     },
     template: `<div class="settings">
@@ -134,9 +136,13 @@ Vue.component("settings-menu", {
 </div>
 <div class="settings-row">
     <label>Theme <button :class="{selected: settings.theme === t[1]}" v-for="t in themes" @click="setTheme(t[1])">{{t[0]}}</button></label>
-</div><div class="settings-row">
+</div>
+<div class="settings-row">
     <label>Layer Names <button :class="{selected: settings.layerNames === t[1]}" v-for="t in names" @click="setNames(t[1])">{{t[0]}}</button></label>
 </div>
+<div class="settings-row">
+    <label>Fonts <button :class="{selected: settings.font === t[1]}" v-for="t in fonts" @click="setFont(t[1])">{{t[0]}}</button></label>
+</div>
 <div class="settings-row">
     <button @click="save()">Save Game</button>
     <button @click="exportGame()">Export</button>
@@ -159,14 +165,14 @@ Vue.component("settings-menu", {
     First Letter of a tab ([L]ayers, [V]olatility) to select it; C to select Achievements</p>
 </div>
 <div class="credits">
-    <h1>Layer Finder by jwklong</h1>
+    <h2>Layer Finder by jwklong</h2>
     <h3>Layer ID:</h3>
     <input type="input" min="1" max="Infinity" id="layerID">
     <button onclick="functions.layerFinder(document.getElementById('layerID').value)">Get Layer</button>
     <h3>Output:</h3>
-    <h2>Layer: <a id="layernameoutput"></a></h2>
-    <h3>Hex Color: <a id="layercoloroutput"></a></h3>
-    <h3>Glow Info: <a id="layerglowoutput"></a></h3>
+    <h4>Layer: <a id="layernameoutput"></a></h4>
+    <h5>Hex Color: <a id="layercoloroutput"></a></h5>
+    <h5>Glow Info: <a id="layerglowoutput"></a></h5>
 </div>
 <div class="credits">
     <h4>Credits</h4>

diff --git a/js/data/functions.js b/js/data/functions.js
@@ -92,6 +92,11 @@ const functions = {
         document.getElementById("theme").href = css;
         game.settings.theme = css;
     },
+    setFont: function(css)
+    {
+        document.getElementById("font").href = css;
+        game.settings.font = css;
+    },
     setNames: function(stuff)
     {
         if (stuff === "refresh") {
@@ -190,7 +195,7 @@ const functions = {
         const isImported = typeof(str) !== "undefined";
         str = str || localStorage.getItem(mod.primaryName+mod.secondaryName) || null;
         if(str === null) return;
-        if(str === "among us")
+        if(str === "?")
         {
             functions.setTheme("broken.css");
             return -1;
@@ -299,6 +304,7 @@ const functions = {
         }
         this.setTheme(game.settings.theme)
         this.setNames(game.settings.layerNames)
+        this.setFont(game.settings.font)
 
         if(game.version !== loadObj.version)
         {
@@ -361,15 +367,15 @@ const functions = {
     textColor: function(layer)
     {
         const lid = new Decimal(layer);
-        if(lid.gte(INFINITY3))
+        if(lid.gte(Infinities[2]))
         {
             return "#ff9100";
         }
-        if(lid.gte(INFINITY2))
+        if(lid.gte(Infinities[1]))
         {
             return "#00ffb7";
         }
-        if(lid.gte(INFINITY))
+        if(lid.gte(Infinities[0]))
         {
             return "#ff00ff";
         }

diff --git a/js/data/game.js b/js/data/game.js
@@ -107,8 +107,9 @@ const game = {
         confirmations: true,
         offlineProgress: true,
         titleStyle: 2,
-        theme: "sussy.css",
+        theme: "css/themes/dark.css",
         layerNames: ["αβγδεζηθικλμνξοπρστυφχψωΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩ", "ψϝϛͱϻϙͳϸ", ["<span class='flipped-v'>Ω</span>", "<span class='flipped-v'>Ω</span><sup>2</sup>","<span class='flipped-v'>Ω</span><sup>3</sup>"]],
+        font: "css/fonts/typespace.css"
     },
 };
 const initialGame = functions.getSaveString();
diff --git a/js/main.js b/js/main.js
@@ -39,16 +39,16 @@ function tickGame(seconds)
     switch(game.settings.titleStyle)
     {
         case 0:
-            titleInfo = "";
             break;
         case 1:
             titleInfo = Utils.getMOTD();
             break;
         case 2:
-            titleInfo = game.metaLayer.active ? "layer " + functions.formatNumber(game.metaLayer.layer.add(1), 3, 0) : "layer " + new Decimal(1).add(game.highestLayer);
+            titleInfo = "Layer "
+            titleInfo += game.metaLayer.active ? functions.formatNumber(game.metaLayer.layer.add(1), 3, 0) : new Decimal(1).add(game.highestLayer);
             break;
     }
-    document.title = "ඞ-lλγers" + (game.settings.titleStyle !== 0 ? ":" : "") + " " + titleInfo;
+    document.title = "ωEngine" + (game.settings.titleStyle !== 0 ? ":" : "") + " " + titleInfo;
 
     if(saveTimer > 30)
     {

diff --git a/js/mod.js b/js/mod.js
@@ -1,7 +1,7 @@
 var mod = {
     primaryName: "ω",
     secondaryName: "Engine",
-    version: "0.0.2 P1",
+    version: "0.0.3",
     themes: [
         ["Dark", "css/themes/dark.css"],
         ["Light", "https://veprogames.github.io/omega-layers/css/main.css"],
@@ -35,6 +35,12 @@ var mod = {
             "01",
             ["2","3","4"]
         ]]
+    ],
+    fonts: [
+        ["Monospace Typewriter", "css/fonts/typespace.css"],
+        ["Comic Sans", "css/fonts/comic.css"],
+        ["Arial", "css/fonts/arial.css"],
+        ["Roboto", "css/fonts/roboto.css"]
     ]
 }