From 253fa445f244704553c9dbdeb4a906e2f4ec8c00 Mon Sep 17 00:00:00 2001
From: sussy layers dev <72522395+jwklong@users.noreply.github.com>
Date: Sun, 1 May 2022 18:17:31 +0100
Subject: [PATCH] v0.2.3 (#3)

good times
---
 index.html                           |  3 ++-
 js/components/aleph-locked-button.js | 10 ++++++++++
 js/components/engine-tab.js          |  7 ++++++-
 js/components/layer-locked-button.js |  2 +-
 js/components/settings-menu.js       |  4 ++--
 js/data/game.js                      | 14 +++++++++++---
 js/main.js                           |  8 ++++----
 js/mod.js                            |  4 ++--
 8 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 js/components/aleph-locked-button.js

diff --git a/index.html b/index.html
index 1a9508d..306457a 100644
--- a/index.html
+++ b/index.html
@@ -41,7 +41,7 @@ <h2 id="superImportantTitle"><span class="omega">ω</span>Engine</h2>
                 <layer-locked-button v-if="isLayerCategory === 'Layers'" @click="settings.tab = 'ReStack'" :layerid="9"><img alt="R" class="inline" src="images/layercoin.png"/> ReStack</layer-locked-button>
                 <button v-if="isLayerCategory === 'Guide'" @click="settings.tab = 'Changelog'"><img alt="C" class="inline" src="favicon.png"> Changelog</button>
                 <button v-if="isLayerCategory === 'Guide'" @click="settings.tab = 'Engine Changelog'"><img alt="EC" class="inline" src="https://jwklong.github.io/omega-engine/favicon.png"> Engine Changelog</button>
-                <button v-if="isLayerCategory === 'Achievements'" @click="settings.tab = 'Secret Achievements'"><img alt="Sa" class="inline" src="images/star.svg"> Secret Achievements</button>
+                <button v-if="isLayerCategory === 'Achievements && game.secretAchievements.filter(ach => ach.isCompleted).length > 0'" @click="settings.tab = 'Secret Achievements'"><img alt="Sa" class="inline" src="images/star.svg"> Secret Achievements</button>
                 <button v-if="isLayerCategory === 'Settings' && isDebug" @click="settings.tab = 'Debug'"><img alt="S" class="inline" src="images/settings.svg"/> Debug</button>
             </div>
         </nav>
@@ -119,6 +119,7 @@ <h2 id="superImportantTitle"><span class="omega">ω</span>Engine</h2>
 
 <script src="js/components/layer-colored-text.js"></script>
 <script src="js/components/layer-locked-button.js"></script>
+<script src="js/components/aleph-locked-button.js"></script>
 <script src="js/components/generator.js"></script>
 <script src="js/components/generator-table.js"></script>
 <script src="js/components/resource-name.js"></script>
diff --git a/js/components/aleph-locked-button.js b/js/components/aleph-locked-button.js
new file mode 100644
index 0000000..8a2fa8f
--- /dev/null
+++ b/js/components/aleph-locked-button.js
@@ -0,0 +1,10 @@
+Vue.component("aleph-locked-button", {
+    props: ["aleph"],
+    methods: {
+        totalAleph: () => game.alephLayer.aleph,
+    },
+    template: `<button @click="$emit('click')" :disabled="totalAleph().lte(aleph)">
+    <span v-if="totalAleph().lte(aleph)">Reach {{aleph}}<span class="aleph">ℵ</span></span>
+    <span v-else><slot></slot></span>
+</button>`
+})
diff --git a/js/components/engine-tab.js b/js/components/engine-tab.js
index a1614aa..ae8e95f 100644
--- a/js/components/engine-tab.js
+++ b/js/components/engine-tab.js
@@ -1,6 +1,11 @@
 Vue.component("engine-tab", {
     template: `<div class="changelog-tab">
     <guide-item>
+    <template v-slot:title>v0.2.3</template>
+    <template v-slot:text>New achievements & aleph locked buttons!
+    </template>
+    </guide-item>
+    <guide-item>
     <template v-slot:title>v0.2.2</template>
     <template v-slot:text>Challenges can now give a restack reward and endgame menu added!
     </template>
@@ -41,4 +46,4 @@ Vue.component("engine-tab", {
     </template>
     </guide-item>
 </div>`
-})
\ No newline at end of file
+})
diff --git a/js/components/layer-locked-button.js b/js/components/layer-locked-button.js
index b98a314..f8f75ad 100644
--- a/js/components/layer-locked-button.js
+++ b/js/components/layer-locked-button.js
@@ -7,4 +7,4 @@ Vue.component("layer-locked-button", {
     <span v-if="maxLayerUnlocked() < layerid">Reach <resource-name :layerid="layerid"></resource-name></span>
     <span v-else><slot></slot></span>
 </button>`
-})
\ No newline at end of file
+})
diff --git a/js/components/settings-menu.js b/js/components/settings-menu.js
index cf17cec..5e290b6 100644
--- a/js/components/settings-menu.js
+++ b/js/components/settings-menu.js
@@ -184,8 +184,8 @@ Vue.component("settings-menu", {
     <p>Inspiration: Antimatter Dimensions by hevipelle, Infinite Layers by dan-simon</p>
     <p>Original Game (Omega Layers) created by VeproGames</p>
     <p>Powered by vue.js and break_eternity.min.js</p>
-    <p>` + mod.primaryName + mod.secondaryName + ` v` + mod.engineVer +`</p>
+    <p>` + mod.primaryName + mod.secondaryName + ` v` + mod.version +`</p>
     ` + ((mod.primaryName + mod.secondaryName) !== "ωEngine" ? ("<p>Built with ωEngine v" + mod.engineVer + "</p>") : "") + `
 </div>
 </div>`
-})
\ No newline at end of file
+})
diff --git a/js/data/game.js b/js/data/game.js
index ee50503..95d4b22 100644
--- a/js/data/game.js
+++ b/js/data/game.js
@@ -91,13 +91,21 @@ const game = {
     },
     achievements: [
         new Achievement("You played!", "If you dont have this, you shouldn't exist", "&omega;", () => true),
+        new Achievement("Aleph-0", "Start gaining aleph", "&aleph;", () => game.alephLayer.isUnlocked()),
+        new Achievement("Aleph-1", "Have 1e75 aleph", "&aleph;<sub>1</sub>", () => game.alephLayer.aleph.gte("1e75")),
+        new Achievement("Aleph-2", "Have 1e200 aleph", "&aleph;<sub>2</sub>", () => game.alephLayer.aleph.gte("1e200")),
+        new Achievement("Aleph-3", "Have 1.8e308 aleph", "&aleph;<sub>3</sub>", () => game.alephLayer.aleph.gte("1.8e308")),
         new Achievement("Stacking up", "Do a restack and restart your progress", "&kappa;", () => game.restackLayer.timesReset > 0),
+        new Achievement("Upgradalicious", "Max all the non-meta upgrades", "↑<sub>↑<sub>↑</sub></sub>", () => (Object.values(game.restackLayer.permUpgrades).filter(u => u.level.gt(0)).length + Object.values(game.restackLayer.permUpgrades).filter(u => u.level.gt(1)).length) == 12),
+        new Achievement("Idle^2", "Buy the meta upgrade", "↑<sub>2<sub>", () => game.restackLayer.metaUpgrade.level.gte(1)),
         new Achievement("No turning back", "Go meta and be reborn", "&Omega;", () => game.metaLayer.active),
         new Achievement("Endgame", "Reach layer 1.8e308 and finish "+mod.primaryName+mod.secondaryName, "Ʊ", () => game.metaLayer.layer.gte(Infinities[0])),
     ],
     secretAchievements: [
-        new Achievement("Meta sucks!", "Get &Omega; without meta", "&omega;&omega;&omega;&omega;&omega;", () => game.highestLayer >= 47 && !game.metaLayer.active),
-        new Achievement("Volatility sucks!", "Get &epsilon; without volatility", "&omega;&omega;&omega;&omega;&omega;", () => game.highestLayer >= 47 && !game.metaLayer.active),
+        new Achievement("A very long wait...", "Have a game with over 3 months of time", "...", () => game.timeSpent > 50803200),
+        new Achievement("Aleph-π", "Have πe314 aleph", "&aleph;<sub>π</sub>", () => game.alephLayer.aleph.gte("3.141e341")),
+        new Achievement("Meta sucks!", "Get &Omega; without meta", "&Omega;&Omega;&Omega;&Omega;&Omega;", () => game.highestLayer >= 47 && !game.metaLayer.active),
+        new Achievement("Volatility sucks!", "Get &epsilon; without layer volatility upgrade", "&epsilon;&epsilon;&epsilon;&epsilon;&epsilon;", () => game.highestLayer >= 5 && game.volatility.layerVolatility.level.eq(0)),
     ],
     alephLayer: new AlephLayer(),
     restackLayer: new ReStackLayer(),
@@ -131,4 +139,4 @@ const game = {
         saveInfo: "i have no idea"
     },
 };
-const initialGame = functions.getSaveString();
\ No newline at end of file
+const initialGame = functions.getSaveString();
diff --git a/js/main.js b/js/main.js
index 12036e4..4763e77 100644
--- a/js/main.js
+++ b/js/main.js
@@ -84,10 +84,10 @@ function tickGame(seconds)
         }
     }
 
-    game.highestLayer = Math.max(game.highestLayer, game.layers.length - 1);
-    game.highestLayer = Math.max(game.highestLayer, game.metaLayer.layer);
-    game.highestUpdatedLayer = Math.max(game.highestUpdatedLayer, game.layers.length - 1);
-    game.highestUpdatedLayer = Math.max(game.highestUpdatedLayer, game.metaLayer.layer);
+    game.highestLayer = Decimal.max(new Decimal(game.highestLayer), game.layers.length - 1);
+    game.highestLayer = Decimal.max(new Decimal(game.highestLayer), game.metaLayer.layer);
+    game.highestUpdatedLayer = Decimal.max(new Decimal(game.highestUpdatedLayer), game.layers.length - 1);
+    game.highestUpdatedLayer = Decimal.max(new Decimal(game.highestUpdatedLayer), game.metaLayer.layer);
 
     const minActiveLayer = game.settings.showMinLayers;
     const maxActiveLayer = game.layers.length - game.settings.showMaxLayers;
diff --git a/js/mod.js b/js/mod.js
index d0b4409..9f99816 100644
--- a/js/mod.js
+++ b/js/mod.js
@@ -2,7 +2,7 @@ var mod = {
     primaryName: "ω",
     secondaryName: "Engine",
     version: "1.0.0",
-    engineVer: "0.2.2 P2", //DO NOT MODIFY
+    engineVer: "0.2.3", //DO NOT MODIFY
     debugMode: true,
     themes: [
         ["Dark", "css/themes/dark.css"],
@@ -65,4 +65,4 @@ var mod = {
 
 mod.layerNames.push(["Refresh Names", "refresh"])
 
-document.getElementById("superImportantTitle").innerHTML = "<span class='omega'>"+mod.primaryName+"</span>"+mod.secondaryName
\ No newline at end of file
+document.getElementById("superImportantTitle").innerHTML = "<span class='omega'>"+mod.primaryName+"</span>"+mod.secondaryName