From 7f24c52a4f6d92afa4bf515d449cd2ef8d82e94e Mon Sep 17 00:00:00 2001 From: Harley White Date: Thu, 17 Jun 2021 13:40:55 -0400 Subject: [PATCH] Fixed endgame screen --- changelog.md | 3 +++ demo.html | 14 +++++++------- index.html | 14 +++++++------- js/Demo/demoMod.js | 4 ++-- js/game.js | 13 ++++++------- js/technical/temp.js | 1 + js/utils/save.js | 2 +- 7 files changed, 27 insertions(+), 24 deletions(-) diff --git a/changelog.md b/changelog.md index 51ba76a..cf5446e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,8 @@ # The Modding Tree changelog: +# v2.6.4.1 - 6/17/21 +- Fixed a bug with the endgame screen. + # v2.6.4 - 6/17/21 - The game now autosaves before closing, if autosave is on. (Thank you to thepaperpilot for this!) - More Anti-NaN safety. diff --git a/demo.html b/demo.html index 2b48777..6bdc9ee 100644 --- a/demo.html +++ b/demo.html @@ -41,13 +41,13 @@
- +

Loading... (If this takes too long it means there was a serious error!)←

-
-
+
+

{{modInfo.name}} {{VERSION.withoutName}}




@@ -66,7 +66,7 @@

-
Main Prestige Tree server
- +
@@ -100,7 +100,7 @@
-




-
+
diff --git a/index.html b/index.html index 2197348..827a067 100644 --- a/index.html +++ b/index.html @@ -40,13 +40,13 @@
- +

Loading... (If this takes too long it means there was a serious error!)←

-
-
+
+

{{modInfo.name}} {{VERSION.withoutName}}




@@ -65,7 +65,7 @@

-
Main Prestige Tree server
- +
@@ -99,7 +99,7 @@
-




-
+
diff --git a/js/Demo/demoMod.js b/js/Demo/demoMod.js index 4257d46..59a652e 100644 --- a/js/Demo/demoMod.js +++ b/js/Demo/demoMod.js @@ -13,7 +13,7 @@ let modInfo = { // Set your version in num and name let VERSION = { - num: "2.6.4", + num: "2.6.4.1", name: "Fixed Reality", } @@ -61,7 +61,7 @@ var displayThings = [ // Determines when the game "ends" function isEndgame() { - return player.points.gte(new Decimal("e280000000")) + return player.points.gte(new Decimal("11")) } diff --git a/js/game.js b/js/game.js index 68e3580..8c6a416 100644 --- a/js/game.js +++ b/js/game.js @@ -1,10 +1,9 @@ var player; var needCanvasUpdate = true; -var gameEnded = false; // Don't change this const TMT_VERSION = { - tmtNum: "2.6.4", + tmtNum: "2.6.4.1", tmtName: "Fixed Reality" } @@ -312,15 +311,15 @@ function autobuyUpgrades(layer){ } function gameLoop(diff) { - if (isEndgame() || gameEnded){ - gameEnded = 1 + if (isEndgame() || tmp.gameEnded){ + tmp.gameEnded = true clearParticles() } if (isNaN(diff) || diff < 0) diff = 0 - if (gameEnded && !player.keepGoing) { + if (tmp.gameEnded && !player.keepGoing) { diff = 0 - //player.tab = "gameEnded" + //player.tab = "tmp.gameEnded" clearParticles() } @@ -389,7 +388,7 @@ var ticking = false var interval = setInterval(function() { if (player===undefined||tmp===undefined) return; if (ticking) return; - if (gameEnded&&!player.keepGoing) return; + if (tmp.gameEnded&&!player.keepGoing) return; ticking = true let now = Date.now() let diff = (now - player.time) / 1e3 diff --git a/js/technical/temp.js b/js/technical/temp.js index 91ceeaf..eab66e2 100644 --- a/js/technical/temp.js +++ b/js/technical/temp.js @@ -28,6 +28,7 @@ function setupTemp() { tmp.backgroundStyle = {} tmp.displayThings = [] tmp.scrolled = 0 + tmp.gameEnded = false funcs = {} setupTempData(layers, tmp, funcs) diff --git a/js/utils/save.js b/js/utils/save.js index 597cdd1..324c1b2 100644 --- a/js/utils/save.js +++ b/js/utils/save.js @@ -308,7 +308,7 @@ function versionCheck() { var saveInterval = setInterval(function () { if (player === undefined) return; - if (gameEnded && !player.keepGoing) + if (tmp.gameEnded && !player.keepGoing) return; if (options.autosave) save();