Merge pull request #11 from Forwaken/Bug_Fixes_and_QoL

Many bug fixes, QoL changes, and a few small balance changes.
Icecreamdudes · Nov 5, 2024 · 94c1138 · 94c1138
2 parents 21d5309 + f377478
commit 94c1138
Show file tree

Hide file tree

Showing 30 changed files with 503 additions and 122 deletions.
diff --git a/js/Cantepocalypse/grassSkip.js b/js/Cantepocalypse/grassSkip.js
@@ -134,7 +134,7 @@
             onClick() {
                 player.buyMax = true
             },
-            style: { width: '75px', "min-height": '75px', }
+            style: { width: '75px', "min-height": '50px', }
         },
         3: {
             title() { return "Buy Max Off" },
@@ -143,7 +143,7 @@
             onClick() {
                 player.buyMax = false
             },
-            style: { width: '75px', "min-height": '75px', }
+            style: { width: '75px', "min-height": '50px', }
         },
         11: {
             title() { return "<h2>Reset all content previous alt-uni 1 content, but grass-skip.<br>Req: " + formatWhole(player.gs.grassSkipReq) + " Replicanti Points" },
@@ -492,7 +492,7 @@
                     ["blank", "25px"],
                     ["raw-html", function () { return "You are at grass-skip <h3>" + formatWhole(player.gs.grassSkip) + ". (+" + formatWhole(player.gs.grassSkipToGet) + ")"  }, { "color": "white", "font-size": "24px", "font-family": "monospace" }],
                     ["raw-html", function () { return "Your grass-skip boosts multiplies the replicanti point multiplier by x" + format(player.gs.grassSkipEffect) + "." }, { "color": "white", "font-size": "20px", "font-family": "monospace" }],
-        ["row", [["clickable", 11]]],
+                    ["row", [["clickable", 11]]],
                     ["blank", "25px"],
                     ["raw-html", function () { return "Milestones"  }, { "color": "white", "font-size": "24px", "font-family": "monospace" }],
                     ["row", [["milestone", 11]]],
@@ -509,14 +509,16 @@
                 unlocked() { return hasMilestone("gs", 11) },
                 content:
                 [
-        ["blank", "25px"],
-        ["raw-html", function () { return "You have <h3>" + format(player.gs.grassSkippers) + "</h3> grass-skippers." }, { "color": "white", "font-size": "24px", "font-family": "monospace" }],
-        ["raw-html", function () { return "You are gaining <h3>" + format(player.gs.grassSkippersPerSecond) + "</h3> grass-skippers per second." }, { "color": "white", "font-size": "20px", "font-family": "monospace" }],
-        ["raw-html", function () { return "Your grass-skippers are boosting rank, tier, and tetr points by x<h3>" + format(player.gs.grassSkippersEffect) + "</h3>." }, { "color": "white", "font-size": "20px", "font-family": "monospace" }],
-        ["blank", "25px"],
-        ["row", [["buyable", 11], ["buyable", 12], ["buyable", 13], ["buyable", 14]]],
-        ["row", [["buyable", 15], ["buyable", 16], ["buyable", 17], ["buyable", 18]]],
-    ]
+                    ["blank", "25px"],
+                    ["raw-html", function () { return "You have <h3>" + format(player.gs.grassSkippers) + "</h3> grass-skippers." }, { "color": "white", "font-size": "24px", "font-family": "monospace" }],
+                    ["raw-html", function () { return "You are gaining <h3>" + format(player.gs.grassSkippersPerSecond) + "</h3> grass-skippers per second." }, { "color": "white", "font-size": "20px", "font-family": "monospace" }],
+                    ["raw-html", function () { return "Your grass-skippers are boosting rank, tier, and tetr points by x<h3>" + format(player.gs.grassSkippersEffect) + "</h3>." }, { "color": "white", "font-size": "20px", "font-family": "monospace" }],
+                    ["blank", "25px"],
+                    ["row", [["clickable", 2], ["clickable", 3]]],
+                    ["blank", "25px"], 
+                    ["row", [["buyable", 11], ["buyable", 12], ["buyable", 13], ["buyable", 14]]],
+                    ["row", [["buyable", 15], ["buyable", 16], ["buyable", 17], ["buyable", 18]]],
+                ]
             },
         },
     }, 

diff --git a/js/Cantepocalypse/oil.js b/js/Cantepocalypse/oil.js
@@ -160,6 +160,24 @@
             },
             style: { width: '100px', "min-height": '50px' },
         },
+        3: {
+            title() { return "Buy Max On" },
+            canClick() { return player.buyMax == false },
+            unlocked() { return true },
+            onClick() {
+                player.buyMax = true
+            },
+            style: { width: '75px', "min-height": '50px', }
+        },
+        4: {
+            title() { return "Buy Max Off" },
+            canClick() { return player.buyMax == true  },
+            unlocked() { return true },
+            onClick() {
+                player.buyMax = false
+            },
+            style: { width: '75px', "min-height": '50px', }
+        },
         11: {
             title() { return "<h2>Reset all content previous content (except grass and grass-skip) for oil. (Based on anonymity)" },
             canClick() { return player.oi.oilToGet.gte(1) },
@@ -580,6 +598,8 @@
                     ["blank", "25px"],
                     ["raw-html", function () { return player.oi.linkerTexts[player.oi.linkerChoice] }, { "color": "white", "font-size": "20px", "font-family": "monospace" }],
                     ["raw-html", function () { return player.oi.linkerTextEffects[player.oi.linkerChoice] }, { "color": "white", "font-size": "20px", "font-family": "monospace" }],
+                    ["row", [["clickable", 2], ["clickable", 3]]],
+                    ["blank", "25px"], 
                     ["row", [["clickable", 12], ["clickable", 13]]],
                     ["blank", "25px"],
                     ["row", [["buyable", 11], ["buyable", 12], ["buyable", 13], ["buyable", 14], ["buyable", 15], ["buyable", 16]]],
@@ -607,6 +627,8 @@
                     ["blank", "25px"],
                     ["row", [["clickable", 14]]],
                     ["blank", "25px"],
+                    ["row", [["clickable", 4], ["clickable", 5]]],
+                    ["blank", "25px"], 
                     ["row", [["buyable", 21], ["buyable", 22], ["buyable", 23], ["buyable", 24]]],
                 ]
             },

diff --git a/js/Cantepocalypse/perks.js b/js/Cantepocalypse/perks.js
@@ -59,7 +59,7 @@
             onClick() {
                 player.buyMax = true
             },
-            style: { width: '75px', "min-height": '75px', }
+            style: { width: '75px', "min-height": '50px', }
         },
         3: {
             title() { return "Buy Max Off" },
@@ -68,7 +68,7 @@
             onClick() {
                 player.buyMax = false
             },
-            style: { width: '75px', "min-height": '75px', }
+            style: { width: '75px', "min-height": '50px', }
         },
     },
     bars: {
@@ -363,15 +363,15 @@
                 unlocked() { return true },
                 content:
                 [
-                    ["blank", "25px"],
-                    ["row", [["clickable", 2], ["clickable", 3]]],
                     ["blank", "25px"],
                     ["raw-html", function () { return "You have <h3>" + format(player.pr.perkPoints) + "</h3> perk points." }, { "color": "white", "font-size": "20px", "font-family": "monospace" }],
                     ["raw-html", function () { return "You will gain <h3>" + format(player.pr.perkPointsToGet) + "</h3> perk points." }, { "color": "white", "font-size": "16px", "font-family": "monospace" }],
                     ["raw-html", function () { return "Chance to gain perk points: <h3>" + format(player.pr.perkPointsChance.mul(100)) + "</h3>%" }, { "color": "white", "font-size": "16px", "font-family": "monospace" }],
                     ["blank", "25px"],
+                    ["row", [["clickable", 2], ["clickable", 3]]],
+                    ["blank", "25px"], 
                     ["row", [["buyable", 11], ["buyable", 12], ["buyable", 13], ["buyable", 14]]],
-        ["row", [["buyable", 15], ["buyable", 16], ["buyable", 17], ["buyable", 18]]],
+                    ["row", [["buyable", 15], ["buyable", 16], ["buyable", 17], ["buyable", 18]]],
     ]
 
             },

diff --git a/js/Cantepocalypse/repliGrass.js b/js/Cantepocalypse/repliGrass.js
@@ -126,7 +126,7 @@
             onClick() {
                 player.buyMax = true
             },
-            style: { width: '75px', "min-height": '75px', }
+            style: { width: '75px', "min-height": '50px', }
         },
         3: {
             title() { return "Buy Max Off" },
@@ -135,7 +135,7 @@
             onClick() {
                 player.buyMax = false
             },
-            style: { width: '75px', "min-height": '75px', }
+            style: { width: '75px', "min-height": '50px', }
         },
     },
     bars: {
@@ -423,6 +423,8 @@
                 content:
                 [
                     ["blank", "25px"],
+                    ["row", [["clickable", 2], ["clickable", 3]]],
+                    ["blank", "25px"], 
                     ["row", [["buyable", 11], ["buyable", 12], ["buyable", 13], ["buyable", 14]]],
                     ["row", [["buyable", 15], ["buyable", 16], ["buyable", 17], ["buyable", 18]]],
                 ]

diff --git a/js/Cantepocalypse/repliTrees.js b/js/Cantepocalypse/repliTrees.js
@@ -107,7 +107,7 @@
             onClick() {
                 player.buyMax = true
             },
-            style: { width: '75px', "min-height": '75px', }
+            style: { width: '75px', "min-height": '50px', }
         },
         3: {
             title() { return "Buy Max Off" },
@@ -116,7 +116,7 @@
             onClick() {
                 player.buyMax = false
             },
-            style: { width: '75px', "min-height": '75px', }
+            style: { width: '75px', "min-height": '50px', }
         },
     },
     bars: {
@@ -425,8 +425,6 @@
                 unlocked() { return true },
                 content:
                 [
-                    ["blank", "25px"],
-                    ["row", [["clickable", 2], ["clickable", 3]]],
                     ["blank", "25px"],
                     ["raw-html", function () { return "<h2>You have " + formatWhole(player.rt.repliTrees) + "<h2> repli-trees, which boost anonymity gain by x" + format(player.rt.repliTreesEffect) + "."}],
                     ["raw-html", function () { return "<h2>You will gain " + format(player.rt.repliTreesToGet, 1) + "<h2> repli-trees." }],
@@ -436,6 +434,8 @@
                     ["row", [["bar", "repliTreeBar"]]],
                     ["row", [["bar", "replileafBar"]]],
                     ["blank", "25px"],
+                    ["row", [["clickable", 2], ["clickable", 3]]],
+                    ["blank", "25px"], 
                     ["row", [["buyable", 11], ["buyable", 12], ["buyable", 13], ["buyable", 14]]],
                     ["row", [["buyable", 15], ["buyable", 16], ["buyable", 17], ["buyable", 18]]],
                 ]

diff --git a/js/breakInfinity.js b/js/breakInfinity.js
@@ -112,6 +112,24 @@
             },
             style: { width: '100px', "min-height": '50px' },
         },
+        2: {
+            title() { return "Buy Max On" },
+            canClick() { return player.buyMax == false },
+            unlocked() { return true },
+            onClick() {
+                player.buyMax = true
+            },
+            style: { width: '75px', "min-height": '50px', }
+        },
+        3: {
+            title() { return "Buy Max Off" },
+            canClick() { return player.buyMax == true  },
+            unlocked() { return true },
+            onClick() {
+                player.buyMax = false
+            },
+            style: { width: '75px', "min-height": '50px', }
+        },
         11: {
             title() { return "<h2>Break Your Infinities" },
             canClick() { return true },
@@ -627,6 +645,8 @@
                     ["blank", "25px"],
                     ["row", [["clickable", 11]]],
                     ["blank", "25px"],
+                    ["row", [["clickable", 2], ["clickable", 3]]],
+                    ["blank", "25px"], 
                     ["row", [["buyable", 11], ["buyable", 12], ["buyable", 13]]],
                 ]
 

diff --git a/js/cante.js b/js/cante.js
@@ -715,6 +715,8 @@
         ["raw-html", function () { return "Replicanti Mult: " + format(player.ca.replicantiMult) + "x" }, { "color": "white", "font-size": "22px", "font-family": "monospace" }],
         ["raw-html", function () { return "Replicate Chance: " + format(player.ca.replicateChance.mul(100)) + "%" }, { "color": "white", "font-size": "22px", "font-family": "monospace" }],
         ["blank", "25px"],
+        ["row", [["clickable", 2], ["clickable", 3]]],
+        ["blank", "25px"], 
         ["row", [["buyable", 11], ["buyable", 12], ["buyable", 13]]],
         ["row", [["buyable", 14], ["buyable", 15], ["buyable", 16]]],
         ["row", [["buyable", 17], ["buyable", 18], ["buyable", 19]]],
@@ -733,6 +735,8 @@
         ["blank", "25px"],
         ["row", [["clickable", 12]]],
         ["blank", "25px"],
+        ["row", [["clickable", 2], ["clickable", 3]]],
+        ["blank", "25px"], 
         ["row", [["buyable", 21], ["buyable", 22], ["buyable", 23], ["buyable", 24]]],
         ["blank", "25px"],
         ["raw-html", function () { return "You have <h3>" + formatWhole(player.ca.replicantiGalaxies) + "/" + formatWhole(player.ca.replicantiGalaxiesCap) + "</h3> replicanti galaxies." }, { "color": "#979EE8", "font-size": "24px", "font-family": "monospace" }],

diff --git a/js/cantepocalypsePuzzle.js b/js/cantepocalypsePuzzle.js
@@ -69,11 +69,11 @@ addLayer("cap", {
 
         player.cap.quizNumber = player.cap.quizInput
 
-        player.cap.quizQuestions = ["log10(infinity points) + check back level", "log10(points)/pet points", "(cante energy/cante energy req) * cante cores",
+        player.cap.quizQuestions = ["log10(infinity points) + check back level", "log10(celestial points)/pet points", "(cante energy/cante energy req) * cante cores",
              "log10(negative infinity points) + cante cores^4",
              "pet points - (check back level * log10(infinities))", 
              "log10(broken infinities) + infinities on reset + (evolution shards * paragon shards)", 
-             "log1000(points) + log100(points) + log10(steel)", ""]
+             "log1000(celestial points) + log100(celestial points) + log10(steel)", ""]
 
         if (player.cap.quizIndex.eq(7))
         {
@@ -87,13 +87,13 @@ addLayer("cap", {
 
         player.cap.quizAnswers = 
         [
-            player.in.infinityPoints.plus(1).log10().add(player.cb.level),
-            player.points.plus(1).log10().div(player.cb.petPoints.add(0.01)),
-            player.ca.canteEnergy.div(player.ca.canteEnergyReq).mul(player.ca.canteCores),
-            player.ta.negativeInfinityPoints.plus(1).log10().add(player.ca.canteCores.pow(4)),
-            player.cb.petPoints.sub(player.cb.level.mul(player.in.infinities.plus(1).log10())),
-            player.bi.brokenInfinities.plus(1).log10().add(player.in.infinitiesToGet.add(player.cb.evolutionShards.mul(player.cb.paragonShards))),
-            player.points.plus(1).log(1000).add(player.points.plus(1).log(100).add(player.gh.steel.plus(1).log10())),
+            player.in.infinityPoints.plus(1).log10().add(player.cb.level).abs(),
+            player.points.plus(1).log10().div(player.cb.petPoints.add(0.01)).abs(),
+            player.ca.canteEnergy.div(player.ca.canteEnergyReq).mul(player.ca.canteCores).abs(),
+            player.ta.negativeInfinityPoints.plus(1).log10().add(player.ca.canteCores.pow(4)).abs(),
+            player.cb.petPoints.sub(player.cb.level.mul(player.in.infinities.plus(1).log10())).abs(),
+            player.bi.brokenInfinities.plus(1).log10().add(player.in.infinitiesToGet.add(player.cb.evolutionShards.mul(player.cb.paragonShards))).abs(),
+            player.points.plus(1).log(1000).add(player.points.plus(1).log(100).add(player.gh.steel.plus(1).log10())).abs(),
             new Decimal(0)
         ]
 
@@ -250,6 +250,7 @@ addLayer("cap", {
                 [
         ["blank", "25px"],
         ["raw-html", function () { return "If the answer is close enough it can work." }, { "color": "white", "font-size": "16px", "font-family": "monospace" }],
+        ["raw-html", function () { return "All answers are converted to positive." }, { "color": "white", "font-size": "16px", "font-family": "monospace" }],
         ["raw-html", function () { return "Your answer: " + format(player.cap.quizNumber) }, { "color": "white", "font-size": "16px", "font-family": "monospace" }],
         ["blank", "25px"],
         ["raw-html", function () { return player.cap.quizQuestions[player.cap.quizIndex] }, { "color": "white", "font-size": "24px", "font-family": "monospace" }],