Merge pull request #18 from Forwaken/Patch

Hotfix for a few bugs.

js/checkback.js

@@ -866,6 +866,9 @@ addLayer("cb", {
 
         // Epic Fragmentation Timer
         player.epic.bannerResetTimer = player.epic.bannerResetTimer.sub(time)
+        for (let i = 0; i < player.epic.bannerButtonTimers.length; i++) {
+            player.epic.bannerButtonTimers[i] = player.epic.bannerButtonTimers[i].sub(time)
+        }
 
         // Epic Pet Timers
         for (let i = 0; i < player.ep0.dotknightPointButtonTimers.length; i++) {

js/menulayers.js

@@ -22,6 +22,7 @@ addLayer("otherfeat", {
     microtabs: {},
     tabFormat: [
         ["layer-proxy", ["po", [
+            ["clickable", 1],
             ["blank", "25px"],
             ["raw-html", function () { return !inChallenge("ip", 11) ? "You have <h3>" + formatWhole(player.po.featureSlots) + "/" + formatWhole(player.po.featureSlotsMax) + "</h3> free feature slots." : "No features for you!"}, { "color": "white", "font-size": "24px", "font-family": "monospace" }],
             ["raw-html", function () { return inChallenge("ip", 14) ? "You can pick an OTF once you are at pent 15." : ""}, { "color": "white", "font-size": "24px", "font-family": "monospace" }],
@@ -56,6 +57,7 @@ addLayer("halter", {
     microtabs: {},
     tabFormat: [
         ["layer-proxy", ["po", [
+            ["clickable", 1],
             ["blank", "25px"],
             ["raw-html", function () { return "<h3>" + player.po.halterText[player.po.halterIndex]}],
             ["text-input", "halterInput", {

js/mod.js

@@ -286,6 +286,9 @@ function fixOldSave(oldVersion){
 		callAlert("Oh no, your save file was inflated. Steel, Crystal, and debuff currencies are reset.", "resources/gat.png")
 	}
 	if (oldVersion == "1.2.1" || oldVersion == "1.2" || oldVersion == "1.1.2" || oldVersion == "1.1.1" || oldVersion == "1.1" || oldVersion == "1.0") {
+		if ((player.tab == "cp" || player.tab == "ar" || player.tab == "pr" || player.tab == "an" || player.tab == "rt" || player.tab == "rg" || player.tab == "gs") && !hasUpgrade("cp", 18)) {
+			player.cp.cantepocalypseActive = true
+		}
 		setBuyableAmount("ad", 2, player.ad.dimBoostAmount)
 		setBuyableAmount("ad", 3, player.ad.galaxyAmount)
 		setBuyableAmount("id", 1, player.id.dimensionUnlockAmount)

js/pollinator.js

@@ -131,7 +131,7 @@ addLayer("pol", {
             style: { width: '75px', "min-height": '50px', }
         },
         11: {
-            title() { return "❌"},
+            title() { return "<img src='resources/pollinators/cross.png' style='width:calc(80%);height:calc(80%);padding-top:20%'></img>"},
             canClick() { return true },
             unlocked() { return true },
             onClick() {
@@ -140,7 +140,7 @@ addLayer("pol", {
             style: { width: '100px', 'min-height': '100px', 'font-size': '30px', 'border-radius': "0%", background: "#28242c", 'border-width': '4px' },
         },
         12: {
-            title() { return "🪲"},
+            title() { return "<img src='resources/pollinators/beetle.png' style='width:calc(80%);height:calc(80%);padding-top:20%'></img>"},
             canClick() { return true },
             unlocked() { return true },
             onClick() {
@@ -149,7 +149,7 @@ addLayer("pol", {
             style: { width: '100px', 'min-height': '100px', 'font-size': '30px', 'border-radius': "0%", background: "#eaf6f7", 'border-width': '4px' },
         },
         13: {
-            title() { return "🪰"},
+            title() { return "<img src='resources/pollinators/fly.png' style='width:calc(80%);height:calc(80%);padding-top:20%'></img>"},
             canClick() { return true },
             unlocked() { return true },
             onClick() {
@@ -158,7 +158,7 @@ addLayer("pol", {
             style: { width: '100px', 'min-height': '100px', 'font-size': '30px', 'border-radius': "0%", background: "#31aeb0", 'border-width': '4px' },
         },
         14: {
-            title() { return "🦇"},
+            title() { return "<img src='resources/pollinators/bat.png' style='width:calc(80%);height:calc(80%);padding-top:20%'></img>"},
             canClick() { return true },
             unlocked() { return true },
             onClick() {
@@ -167,7 +167,7 @@ addLayer("pol", {
             style: { width: '100px', 'min-height': '100px', 'font-size': '30px', 'border-radius': "0%", background: "#0B6623", 'border-width': '4px' },
         },
         15: {
-            title() { return "💨"},
+            title() { return "<img src='resources/pollinators/wind.png' style='width:calc(80%);height:calc(80%);padding-top:20%'></img>"},
             canClick() { return true },
             unlocked() { return hasUpgrade("pol", 11) },
             onClick() {
@@ -176,7 +176,7 @@ addLayer("pol", {
             style: { width: '100px', 'min-height': '100px', 'font-size': '30px', 'border-radius': "0%", background: "#119B35", 'border-width': '4px' },
         },
         16: {
-            title() { return "🐝"},
+            title() { return "<img src='resources/pollinators/bee.png' style='width:calc(80%);height:calc(80%);padding-top:20%'></img>"},
             canClick() { return true },
             unlocked() { return hasUpgrade("pol", 14) },
             onClick() {
@@ -185,7 +185,7 @@ addLayer("pol", {
             style: { width: '100px', 'min-height': '100px', 'font-size': '30px', 'border-radius': "0%", background: "#19e04d", 'border-width': '4px' },
         },
         17: {
-            title() { return "🦋"},
+            title() { return "<img src='resources/pollinators/butterfly.png' style='width:calc(80%);height:calc(80%);padding-top:20%'></img>"},
             canClick() { return true },
             unlocked() { return hasUpgrade("pol", 16) },
             onClick() {
@@ -194,7 +194,7 @@ addLayer("pol", {
             style: { width: '100px', 'min-height': '100px', 'font-size': '30px', 'border-radius': "0%", background: "#0951a6", 'border-width': '4px' },
         },
         18: {
-            title() { return "🐜"},
+            title() { return "<img src='resources/pollinators/ant.png' style='width:calc(80%);height:calc(80%);padding-top:20%'></img>"},
             canClick() { return true },
             unlocked() { return hasUpgrade("pol", 18) },
             onClick() {
@@ -375,7 +375,7 @@ addLayer("pol", {
                 return format(getBuyableAmount(this.layer, this.id), 0) + "<br/>Propagating Pollinators"
             },
             display() {
-                return "which improves pollinator upgrade I's scaling by +" + format(tmp[this.layer].buyables[this.id].effect) + ".\n\
+                return "which improves pollinator upgrade II's scaling by +" + format(tmp[this.layer].buyables[this.id].effect) + ".\n\
                     Cost: " + format(tmp[this.layer].buyables[this.id].cost) + " Pollinators"
             },
             buy() {
@@ -487,7 +487,7 @@ addLayer("pol", {
                     ["raw-html", function () { return player.pol.pollinatorsIndex == 0 ? "<h1>You are currently selecting nothing." : "" }, { "color": "white", "font-size": "16px", "font-family": "monospace" }],
                     ["raw-html", function () { return player.pol.pollinatorsIndex == 1 ? "<h1>You are currently selecting the Beetle.<br><h2>Celestial Points: x" + format(player.pol.pollinatorsEffect[0]) + "<br><h2>Factor Base: x" + format(player.pol.pollinatorsEffect[1]) : "" }, { "color": "white", "font-size": "16px", "font-family": "monospace" }],
                     ["raw-html", function () { return player.pol.pollinatorsIndex == 2 ? "<h1>You are currently selecting the Fly.<br><h2>Factor Power: x" + format(player.pol.pollinatorsEffect[2]) + "<br><h2>Prestige Points: x" + format(player.pol.pollinatorsEffect[3]) : "" }, { "color": "white", "font-size": "16px", "font-family": "monospace" }],
-                    ["raw-html", function () { return player.pol.pollinatorsIndex == 3 ? "<h1>You are currently selecting the Bat.<br><h2>Leafs: x" + format(player.pol.pollinatorsEffect[4]) + "<br><h2>Trees: x" + format(player.pol.pollinatorsEffect[5]) : "" }, { "color": "white", "font-size": "16px", "font-family": "monospace" }],
+                    ["raw-html", function () { return player.pol.pollinatorsIndex == 3 ? "<h1>You are currently selecting the Bat.<br><h2>Leaves: x" + format(player.pol.pollinatorsEffect[4]) + "<br><h2>Trees: x" + format(player.pol.pollinatorsEffect[5]) : "" }, { "color": "white", "font-size": "16px", "font-family": "monospace" }],
                     ["raw-html", function () { return player.pol.pollinatorsIndex == 4 ? "<h1>You are currently selecting Wind.<br><h2>Grass Value: x" + format(player.pol.pollinatorsEffect[6]) + "<br><h2>Golden Grass Value: x" + format(player.pol.pollinatorsEffect[7]) : "" }, { "color": "white", "font-size": "16px", "font-family": "monospace" }],
                     ["raw-html", function () { return player.pol.pollinatorsIndex == 5 ? "<h1>You are currently selecting the Bee.<br><h2>Grasshoppers: x" + format(player.pol.pollinatorsEffect[8]) + "<br><h2>Fertilizer: x" + format(player.pol.pollinatorsEffect[9]) : "" }, { "color": "white", "font-size": "16px", "font-family": "monospace" }],
                     ["raw-html", function () { return player.pol.pollinatorsIndex == 6 ? "<h1>You are currently selecting the Butterfly.<br><h2>Lines of Code: x" + format(player.pol.pollinatorsEffect[10]) + "<br><h2>Mods: x" + format(player.pol.pollinatorsEffect[11]) : "" }, { "color": "white", "font-size": "16px", "font-family": "monospace" }],

js/tav.js

@@ -152,6 +152,26 @@
             layers.ta.negativeInfinityReset();
         }
 
+        player.ta.dimensionPowerPerSecond[0] = buyableEffect("ta", 11)
+        player.ta.dimensionPowerPerSecond[1] = buyableEffect("ta", 12)
+        player.ta.dimensionPowerPerSecond[2] = buyableEffect("ta", 13)
+        player.ta.dimensionPowerPerSecond[3] = buyableEffect("ta", 14)
+        player.ta.dimensionPowerPerSecond[4] = buyableEffect("ta", 15)
+        player.ta.dimensionPowerPerSecond[5] = buyableEffect("ta", 16)
+        player.ta.dimensionPowerPerSecond[6] = buyableEffect("ta", 17)
+        player.ta.dimensionPowerPerSecond[7] = buyableEffect("ta", 18)
+        for (let i = 0; i < player.ta.dimensionPowerEffects.length; i++) {
+            player.ta.dimensionPowerEffects[i] = player.ta.dimensionPower[i].pow(0.6).div(10).add(1)
+            player.ta.dimensionPowerPerSecond[i] = player.ta.dimensionPowerPerSecond[i].mul(buyableEffect("ip", 13))
+            player.ta.dimensionPowerPerSecond[i] = player.ta.dimensionPowerPerSecond[i].mul(buyableEffect("ta", 35))
+            if (hasUpgrade('ta', 12)) player.ta.dimensionPowerPerSecond[i] = player.ta.dimensionPowerPerSecond[i].mul(upgradeEffect("ta", 12))
+            if (hasUpgrade('ip', 44)) player.ta.dimensionPowerPerSecond[i] = player.ta.dimensionPowerPerSecond[i].mul(upgradeEffect("ip", 44))
+            player.ta.dimensionPowerPerSecond[i] = player.ta.dimensionPowerPerSecond[i].mul(buyableEffect("om", 14))
+            player.ta.dimensionPowerPerSecond[i] = player.ta.dimensionPowerPerSecond[i].mul(buyableEffect("gh", 36))
+            player.ta.dimensionPowerPerSecond[i] = player.ta.dimensionPowerPerSecond[i].mul(player.cb.uncommonPetEffects[8][0])
+            player.ta.dimensionPower[i] = player.ta.dimensionPower[i].add(player.ta.dimensionPowerPerSecond[i].mul(delta))
+        }
+
         for (let i = 0; i < 11; i++) {
             if (player.ta.dimensionAutobuyToggles[i]) player.ta.dimensionAutobuyTimer[i] = player.ta.dimensionAutobuyTimer[i].add(onepersec.mul(delta))
             if (player.ta.dimensionAutobuyTimer[i].gte(player.ta.dimensionAutobuyTimeReq[i])) {