From 5035a5a630f6c4eaf66f343235870623f609d9c9 Mon Sep 17 00:00:00 2001
From: jwklong <jwklong@gmx.com>
Date: Mon, 14 Feb 2022 16:36:58 +0000
Subject: [PATCH] v0.2.2

---
 README.md                          |  2 +-
 css/main.css                       | 32 +++++++++++++++++++++++++++++-
 index.html                         |  5 ++++-
 js/classes/challenge.js            |  4 +++-
 js/classes/featureunlockmanager.js | 15 +++++++++-----
 js/classes/prestigelayer.js        |  7 +++++++
 js/classes/restacklayer.js         | 15 ++++++++++++--
 js/components/endgame-tab.js       | 17 ++++++++++++++++
 js/components/engine-tab.js        |  5 +++++
 js/data/computed.js                |  3 +++
 js/data/functions.js               |  1 +
 js/data/game.js                    |  2 +-
 js/data/temp.js                    |  3 +++
 js/debug/TabTesting.js             |  6 ++++++
 js/debug/test.js                   |  6 +++++-
 js/debug/test2.js                  |  6 ------
 js/main.js                         |  5 +++++
 js/mod.js                          |  8 ++++----
 18 files changed, 119 insertions(+), 23 deletions(-)
 create mode 100644 js/components/endgame-tab.js
 create mode 100644 js/data/temp.js
 create mode 100644 js/debug/TabTesting.js
 delete mode 100644 js/debug/test2.js

diff --git a/README.md b/README.md
index 8d81769..07b37e8 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ωEngine v0.2.1
+# ωEngine v0.2.2
 ### A engine made from Ω-Lλγers built for making mods
 #### <a href='https://veprogames.github.io/omega-layers'>Ω-Lλγers</a> (the original) by VeproGames
 #### Play the engine <a href='https://jwklong.github.io/omega-engine'>now</a>
diff --git a/css/main.css b/css/main.css
index 66c4058..85c379b 100644
--- a/css/main.css
+++ b/css/main.css
@@ -92,7 +92,7 @@ header nav button{
     font-size: 110%;
 }
 
-header .omega{
+.omega{
     color: var(--color-primary);
 }
 
@@ -164,6 +164,36 @@ img.inline{
     font-size: 3vh;
 }
 
+#endgame{
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background-color: var(--background-body);
+    z-index: 1000;
+    text-align: center;
+
+    transition: opacity 2000ms;
+}
+
+#endgame > * {
+    position: absolute;
+    transform: translateX(-50%);
+    left: 50%;
+}
+
+#endgame h2{
+    top: 20%;
+    font-size: 10vh;
+    width: 100%;
+}
+
+#endgame p{
+    top: 50%;
+    font-size: 3vh;
+}
+
 /*Layer Navigation*/
 
 div.layer-navigation{
diff --git a/index.html b/index.html
index 1bd7e5b..8bf713d 100644
--- a/index.html
+++ b/index.html
@@ -65,6 +65,7 @@ <h2 id="superImportantTitle"><span class="omega">ω</span>Engine</h2>
         <changelog-tab v-if="settings.tab === 'Changelog'"></changelog-tab>
         <engine-tab v-if="settings.tab === 'Engine Changelog'"></engine-tab>
         <debug-tab v-if="settings.tab === 'Debug'"></debug-tab>
+        <endgame-tab v-if="settings.tab === 'Endgame'"></endgame-tab>
     </main>
     <footer>
         <div>
@@ -101,7 +102,7 @@ <h2 id="superImportantTitle"><span class="omega">ω</span>Engine</h2>
 <script src="js/mod.js"></script>
 
 <script src="js/debug/test.js"></script>
-<script src="js/debug/test2.js"></script>
+<script src="js/debug/TabTesting.js"></script>
 
 <script src="js/classes/generator.js"></script>
 <script src="js/classes/powergenerator.js"></script>
@@ -153,9 +154,11 @@ <h2 id="superImportantTitle"><span class="omega">ω</span>Engine</h2>
 <script src="js/components/changelog-tab.js"></script>
 <script src="js/components/engine-tab.js"></script>
 <script src="js/components/debug-tab.js"></script>
+<script src="js/components/endgame-tab.js"></script>
 
 <script src="js/data/functions.js"></script>
 <script src="js/data/computed.js"></script>
+<script src="js/data/temp.js"></script>
 <script src="js/data/game.js"></script>
 
 <script src="js/main.js"></script>
diff --git a/js/classes/challenge.js b/js/classes/challenge.js
index f7522c1..7942dba 100644
--- a/js/classes/challenge.js
+++ b/js/classes/challenge.js
@@ -1,7 +1,7 @@
 const CHALLENGE_EFFECT_UPGRADESTRENGTH_SIMPLEBOOST = 0, CHALLENGE_EFFECT_PRICES_POWER = 1, CHALLENGE_EFFECT_GENMULTI = 2,
     CHALLENGE_EFFECT_PRESTIGEREWARD = 3;
 const CHALLENGE_REWARD_POWERGENERATORS = 0, CHALLENGE_REWARD_GENMULTI = 1, CHALLENGE_REWARD_PRESTIGEREWARD = 2,
-    CHALLENGE_REWARD_GENMULTI_ABS = 3;
+    CHALLENGE_REWARD_GENMULTI_ABS = 3, CHALLENGE_REWARD_RESTACK = 4;
 
 class Challenge
 {
@@ -60,6 +60,8 @@ class Challenge
                 return "Prestige Reward of Layer " + PrestigeLayer.getNameForLayer(this.cfg.layerid) + " is x" + functions.formatNumber(this.applyReward(), 2, 2) + " higher";
             case CHALLENGE_REWARD_GENMULTI_ABS:
                 return "All Alpha Generators are x" + functions.formatNumber(this.applyReward(), 2, 2) + " stronger";
+            case CHALLENGE_REWARD_RESTACK:
+                return "Restack gain is multiplied by x" + functions.formatNumber(this.applyReward(), 2, 2);
             default:
                 return "A Cake."
         }
diff --git a/js/classes/featureunlockmanager.js b/js/classes/featureunlockmanager.js
index dc7b3fc..8231521 100644
--- a/js/classes/featureunlockmanager.js
+++ b/js/classes/featureunlockmanager.js
@@ -23,7 +23,7 @@ class FeatureUnlockManager
 
     static getUpgradeTypes(layer)
     {
-        const upgTypes = [UPGRADE_RESOURCE, UPGRADE_GENERATOR];
+        var upgTypes = [UPGRADE_RESOURCE, UPGRADE_GENERATOR];
         if(layer >= 1 && layer < 8)
         {
             upgTypes.push(UPGRADE_GENMULTI);
@@ -46,11 +46,16 @@ class FeatureUnlockManager
 
     static getChallengeRewardTypes(layer)
     {
-        if(layer >= 4)
-        {
-            return [CHALLENGE_REWARD_POWERGENERATORS, CHALLENGE_REWARD_GENMULTI_ABS, CHALLENGE_REWARD_PRESTIGEREWARD];
+        var rewardTypes = [CHALLENGE_REWARD_POWERGENERATORS, CHALLENGE_REWARD_PRESTIGEREWARD];
+        if(layer >= 4) {
+            rewardTypes.push(CHALLENGE_REWARD_GENMULTI_ABS)
+        } else {
+            rewardTypes.push(CHALLENGE_REWARD_GENMULTI)
+        }
+        if(layer >= 9) {
+            rewardTypes.push(CHALLENGE_REWARD_RESTACK)
         }
-        return [CHALLENGE_REWARD_POWERGENERATORS, CHALLENGE_REWARD_GENMULTI, CHALLENGE_REWARD_PRESTIGEREWARD];
+        return rewardTypes
     }
 
     static getUpgradeTreeTypes(layer)
diff --git a/js/classes/prestigelayer.js b/js/classes/prestigelayer.js
index ca6e199..0eb8b57 100644
--- a/js/classes/prestigelayer.js
+++ b/js/classes/prestigelayer.js
@@ -385,6 +385,13 @@ class PrestigeLayer
                         return Decimal.pow(10, baseLog.mul(level));
                     }
                     break;
+                case CHALLENGE_REWARD_RESTACK:
+                    const randomthing = rand.nextDouble()*this.layer
+                    formula_reward = function(level)
+                    {
+                        return new Decimal(1+((0.02*randomthing)*level))
+                    }
+                    break;
                 default:
                     return;
             }
diff --git a/js/classes/restacklayer.js b/js/classes/restacklayer.js
index c571dd6..9558ef3 100644
--- a/js/classes/restacklayer.js
+++ b/js/classes/restacklayer.js
@@ -197,7 +197,18 @@ class ReStackLayer
     getRestackGain()
     {
         const l = game.metaLayer.active ? game.metaLayer.layer : new Decimal(game.layers.length - 1);
-        return l >= 9 ? Decimal.pow(10, l.sub(9).floor()) : new Decimal(0);
+        let gain = l >= 9 ? Decimal.pow(10, l.sub(9).floor()) : new Decimal(0);
+        if (!game.metaLayer.active) {
+            for (const layer of game.layers) {
+                if (layer.hasChallenges() && layer.layer >= 9) {
+                    for(const c of layer.challenges.filter(ch => ch.rewardType === CHALLENGE_REWARD_RESTACK))
+                    {
+                        gain = gain.mul(c.applyReward());
+                    }
+                }
+            }
+        }
+        return gain
     }
 
     allPermUpgradesBought()
@@ -253,7 +264,7 @@ class ReStackLayer
         game.layers = [];
         functions.generateLayer(0);
         game.currentLayer = game.layers[0];
-        if(this.upgradeTreeNames.noReset.apply() === "Resets") {
+        if(this.upgradeTreeNames.noReset.level == 0) {
             this.timeSpent = 0;
         }
         if(game.metaLayer.active)
diff --git a/js/components/endgame-tab.js b/js/components/endgame-tab.js
new file mode 100644
index 0000000..80464ae
--- /dev/null
+++ b/js/components/endgame-tab.js
@@ -0,0 +1,17 @@
+Vue.component("endgame-tab", {
+    computed: {
+        timeSpent: function() {
+            time = game.timeSpent;
+            formattedTime = functions.formatTime(time)
+            return formattedTime
+        },
+    },
+    methods: {
+        hardResetGame: () => functions.hardResetGame(),
+    },
+    template: `<div id="endgame">
+    <h2><span class="omega">You</span> Win!</h2>
+    <p>You beat the game in <span class="omega">{{timeSpent}}</span><br>
+    <button onclick="game.settings.tab = 'Layers'">Continue</button> <button @click="hardResetGame()">Wipe Game</button></p>
+</div>`
+})
\ No newline at end of file
diff --git a/js/components/engine-tab.js b/js/components/engine-tab.js
index cce0de0..a1614aa 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.2</template>
+    <template v-slot:text>Challenges can now give a restack reward and endgame menu added!
+    </template>
+    </guide-item>
+    <guide-item>
     <template v-slot:title>v0.2.1</template>
     <template v-slot:text>All buttons menu in debug mode, new random layer names and 4th infinity!
     </template>
diff --git a/js/data/computed.js b/js/data/computed.js
index c424d1d..71b9aac 100644
--- a/js/data/computed.js
+++ b/js/data/computed.js
@@ -32,6 +32,9 @@ const computed = {
             case "Debug":
                 category = "Settings";
                 break;
+            default:
+                category = "Unknown";
+                break;
         }
         return category
     },
diff --git a/js/data/functions.js b/js/data/functions.js
index a49b1f7..beca64b 100644
--- a/js/data/functions.js
+++ b/js/data/functions.js
@@ -363,6 +363,7 @@ const functions = {
         functions.generateLayer(0);
         functions.loadGame(initialGame);
         game.currentLayer = game.layers[0];
+        game.settings.tab = "Layers"
     },
     hslToHex: function(h, s, l) {
         l /= 100;
diff --git a/js/data/game.js b/js/data/game.js
index a2f6331..1753e80 100644
--- a/js/data/game.js
+++ b/js/data/game.js
@@ -130,6 +130,6 @@ const game = {
         font: mod.fonts[0][1],
         saveInfo: "i have no idea"
     },
-    console: console
+    isEndgame: false //this.metaLayer.layer.gte(Infinities[0])
 };
 const initialGame = functions.getSaveString();
\ No newline at end of file
diff --git a/js/data/temp.js b/js/data/temp.js
new file mode 100644
index 0000000..aa359b5
--- /dev/null
+++ b/js/data/temp.js
@@ -0,0 +1,3 @@
+var temp = {
+    endgameOverride: false
+}
\ No newline at end of file
diff --git a/js/debug/TabTesting.js b/js/debug/TabTesting.js
new file mode 100644
index 0000000..9f57fb2
--- /dev/null
+++ b/js/debug/TabTesting.js
@@ -0,0 +1,6 @@
+mod.debugClasses.push(new DebugClass("Tab Testing", "Test some tabs!", "0.1", [
+    [
+        "Test Endgame Tab",
+        'game.settings.tab = "Endgame"'
+    ]
+]))
\ No newline at end of file
diff --git a/js/debug/test.js b/js/debug/test.js
index c1cafe0..7affcf6 100644
--- a/js/debug/test.js
+++ b/js/debug/test.js
@@ -6,5 +6,9 @@ mod.debugClasses.push(new DebugClass("test.js", "test", "0.0.0", [
     [
         "test button 2",
         'console.warn("too many test buttons")'
-    ]
+    ],
+    [
+        "test button 3",
+        'console.error("test overload!!!")'
+    ],
 ]))
\ No newline at end of file
diff --git a/js/debug/test2.js b/js/debug/test2.js
deleted file mode 100644
index 3caeaef..0000000
--- a/js/debug/test2.js
+++ /dev/null
@@ -1,6 +0,0 @@
-mod.debugClasses.push(new DebugClass("test2.js", "another test", "0.0.0", [
-    [
-        "test button 3",
-        'console.error("test overload!!!")'
-    ]
-]))
\ No newline at end of file
diff --git a/js/main.js b/js/main.js
index 53d2573..ba64ad5 100644
--- a/js/main.js
+++ b/js/main.js
@@ -37,6 +37,11 @@ function tickGame(seconds)
     saveTimer += seconds;
     localTimer += seconds;
 
+    if (game.isEndgame && !temp.endgameOverride) {
+        game.settings.tab = "Endgame"
+        temp.endgameOverride = true
+    }
+
     let titleInfo = "";
     switch(game.settings.titleStyle)
     {
diff --git a/js/mod.js b/js/mod.js
index 77e2049..f7628da 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.1", //DO NOT MODIFY
+    engineVer: "0.2.2", //DO NOT MODIFY
     debugMode: true,
     themes: [
         ["Dark", "css/themes/dark.css"],
@@ -39,9 +39,9 @@ var mod = {
         ]],
         ["Random",
         [
-            Utils.createRandomWord(10),
-            Utils.createRandomWord(10),
-            [Utils.createRandomWord(2),Utils.createRandomWord(3),Utils.createRandomWord(4),Utils.createRandomWord(5)]
+            Utils.createRandomWord(10, new Random(Date.now()).nextInt()),
+            Utils.createRandomWord(10, new Random(Math.floor(Date.now()/2)).nextInt()),
+            [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())]
         ]]
     ],
     fonts: [