diff --git a/js/checkback.js b/js/checkback.js index f6bbac2..bf793c6 100644 --- a/js/checkback.js +++ b/js/checkback.js @@ -1043,7 +1043,7 @@ title() { return player.cb.commonPetAmounts[0].gt(0) || player.cb.commonPetLevels[0].gt(0) ? player.cb.commonPetImage[0] : player.cb.lockedImg}, canClick() { return player.cb.commonPetAmounts[0].gt(0) || player.cb.commonPetLevels[0].gt(0) }, unlocked() { return true }, - tooltip() { return player.cb.commonPetAmounts[0].gt(0) && !player.cb.viewingEvolved[3]|| player.cb.commonPetAmounts[0].gt(0) && !player.cb.viewingEvolved[3]? "

x" + format(player.cb.commonPetEffects[0][0]) + " to points.
x" + format(player.cb.commonPetEffects[0][1]) + " to check back xp.": "x" + format(player.cb.evolvedEffects[3][0]) + " to infinities.
x" + format(player.cb.evolvedEffects[3][1]) + " to broken infinities."}, + tooltip() { return player.cb.commonPetAmounts[0].gt(0) && !player.cb.viewingEvolved[3] || player.cb.commonPetLevels[0].gt(0) && !player.cb.viewingEvolved[3]? "

x" + format(player.cb.commonPetEffects[0][0]) + " to points.
x" + format(player.cb.commonPetEffects[0][1]) + " to check back xp." : player.cb.viewingEvolved[3] ? "x" + format(player.cb.evolvedEffects[3][0]) + " to infinities.
x" + format(player.cb.evolvedEffects[3][1]) + " to broken infinities." : ""}, onClick() { player.cb.petDisplayIndex = new Decimal(0) }, diff --git a/js/factors.js b/js/factors.js index f07d0fb..300be8b 100644 --- a/js/factors.js +++ b/js/factors.js @@ -125,6 +125,8 @@ player.f.factorPowerPerSecond = player.f.factorPowerPerSecond.mul(buyableEffect("f", 23)) player.f.factorPowerPerSecond = player.f.factorPowerPerSecond.mul(buyableEffect("f", 24)) player.f.factorPowerPerSecond = player.f.factorPowerPerSecond.mul(buyableEffect("f", 25)) + player.f.factorPowerPerSecond = player.f.factorPowerPerSecond.mul(buyableEffect("f", 26)) + player.f.factorPowerPerSecond = player.f.factorPowerPerSecond.mul(buyableEffect("f", 27)) player.f.factorPowerPerSecond = player.f.factorPowerPerSecond.mul(buyableEffect("t", 16)) if (hasUpgrade("p", 16)) player.f.factorPowerPerSecond = player.f.factorPowerPerSecond.mul(upgradeEffect("p", 16)) player.f.factorPowerPerSecond = player.f.factorPowerPerSecond.mul(buyableEffect("g", 15)) @@ -1797,7 +1799,7 @@ ["row", [["buyable", 11], ["buyable", 12], ["buyable", 13], ["buyable", 14]]], ["row", [["buyable", 15], ["buyable", 16], ["buyable", 17], ["buyable", 18]]], ["blank", "25px"], - ["raw-html", function () { return "Total Mult: x" + format(Decimal.mul(buyableEffect("f", 11), buyableEffect("f", 12), buyableEffect("f", 13), buyableEffect("f", 14), buyableEffect("f", 15), buyableEffect("f", 16), buyableEffect("f", 17), buyableEffect("f", 18))) }, { "color": "white", "font-size": "24px", "font-family": "monospace" }], + ["raw-html", function () { return "Total Mult: x" + format(buyableEffect("f", 11).mul(buyableEffect("f", 12).mul(buyableEffect("f", 13)).mul(buyableEffect("f", 14)).mul(buyableEffect("f", 15)).mul(buyableEffect("f", 16)).mul(buyableEffect("f", 17)).mul(buyableEffect("f", 18)))) }, { "color": "white", "font-size": "24px", "font-family": "monospace" }], ] }, "Power": { @@ -1820,7 +1822,7 @@ ["row", [["buyable", 19], ["buyable", 21], ["buyable", 22], ["buyable", 23]]], ["row", [["buyable", 24], ["buyable", 25], ["buyable", 26], ["buyable", 27]]], ["blank", "25px"], - ["raw-html", function () { return "Total Mult: x" + format(Decimal.mul(buyableEffect("f", 19), buyableEffect("f", 21), buyableEffect("f", 22), buyableEffect("f", 23), buyableEffect("f", 24), buyableEffect("f", 25), buyableEffect("f", 26), buyableEffect("f", 27))) }, { "color": "white", "font-size": "24px", "font-family": "monospace" }], + ["raw-html", function () { return "Total Mult: x" + format(buyableEffect("f", 19).mul(buyableEffect("f", 21).mul(buyableEffect("f", 22)).mul(buyableEffect("f", 23)).mul(buyableEffect("f", 24)).mul(buyableEffect("f", 25)).mul(buyableEffect("f", 26)).mul(buyableEffect("f", 27)))) }, { "color": "white", "font-size": "24px", "font-family": "monospace" }], ] }, "Tree": { @@ -1839,7 +1841,7 @@ ["row", [["buyable", 28], ["buyable", 29], ["buyable", 31], ["buyable", 32]]], ["row", [["buyable", 33], ["buyable", 34], ["buyable", 35], ["buyable", 36]]], ["blank", "25px"], - ["raw-html", function () { return "Total Mult: x" + format(Decimal.mul(buyableEffect("f", 28), buyableEffect("f", 29), buyableEffect("f", 31), buyableEffect("f", 32), buyableEffect("f", 33), buyableEffect("f", 34), buyableEffect("f", 35), buyableEffect("f", 36))) }, { "color": "white", "font-size": "24px", "font-family": "monospace" }], + ["raw-html", function () { return "Total Mult: x" + format(buyableEffect("f", 28).mul(buyableEffect("f", 29).mul(buyableEffect("f", 31)).mul(buyableEffect("f", 32)).mul(buyableEffect("f", 33)).mul(buyableEffect("f", 34)).mul(buyableEffect("f", 35)).mul(buyableEffect("f", 36)))) }, { "color": "white", "font-size": "24px", "font-family": "monospace" }], ] }, "Grass": { @@ -1854,7 +1856,7 @@ ["row", [["buyable", 1], ["buyable", 2], ["buyable", 3], ["buyable", 4]]], ["row", [["buyable", 5], ["buyable", 6], ["buyable", 7], ["buyable", 8]]], ["blank", "25px"], - ["raw-html", function () { return "Total Mult: x" + format(Decimal.mul(buyableEffect("f", 1), buyableEffect("f", 2), buyableEffect("f", 3), buyableEffect("f", 4), buyableEffect("f", 5), buyableEffect("f", 6), buyableEffect("f", 7), buyableEffect("f", 8))) }, { "color": "white", "font-size": "24px", "font-family": "monospace" }], + ["raw-html", function () { return "Total Mult: x" + format(buyableEffect("f", 1).mul(buyableEffect("f", 2).mul(buyableEffect("f", 3)).mul(buyableEffect("f", 4)).mul(buyableEffect("f", 5)).mul(buyableEffect("f", 6)).mul(buyableEffect("f", 7)).mul(buyableEffect("f", 8)))) }, { "color": "white", "font-size": "24px", "font-family": "monospace" }], ] }, "Infinity": { @@ -1869,7 +1871,8 @@ ["row", [["buyable", 41], ["buyable", 42], ["buyable", 43], ["buyable", 44]]], ["row", [["buyable", 45], ["buyable", 46], ["buyable", 47], ["buyable", 48]]], ["blank", "25px"], - ["raw-html", function () { return "Total Mult: x" + format(Decimal.mul(buyableEffect("f", 41), buyableEffect("f", 42), buyableEffect("f", 43), buyableEffect("f", 44), buyableEffect("f", 45), buyableEffect("f", 46), buyableEffect("f", 47), buyableEffect("f", 48))) }, { "color": "white", "font-size": "24px", "font-family": "monospace" }], + ["raw-html", function () { return "Total Mult: x" + format(buyableEffect("f", 41).mul(buyableEffect("f", 42).mul(buyableEffect("f", 43)).mul(buyableEffect("f", 44)).mul(buyableEffect("f", 45)).mul(buyableEffect("f", 46)).mul(buyableEffect("f", 47)).mul(buyableEffect("f", 48)))) }, { "color": "white", "font-size": "24px", "font-family": "monospace" }], + ] }, "Negative Infinity": { @@ -1884,7 +1887,7 @@ ["row", [["buyable", 51], ["buyable", 52], ["buyable", 53], ["buyable", 54]]], ["row", [["buyable", 55], ["buyable", 56], ["buyable", 57], ["buyable", 58]]], ["blank", "25px"], - ["raw-html", function () { return "Total Mult: x" + format(Decimal.mul(buyableEffect("f", 51), buyableEffect("f", 52), buyableEffect("f", 53), buyableEffect("f", 54), buyableEffect("f", 55), buyableEffect("f", 56), buyableEffect("f", 57), buyableEffect("f", 58))) }, { "color": "white", "font-size": "24px", "font-family": "monospace" }], + ["raw-html", function () { return "Total Mult: x" + format(buyableEffect("f", 51).mul(buyableEffect("f", 52).mul(buyableEffect("f", 53)).mul(buyableEffect("f", 54)).mul(buyableEffect("f", 55)).mul(buyableEffect("f", 56)).mul(buyableEffect("f", 57)).mul(buyableEffect("f", 58)))) }, { "color": "white", "font-size": "24px", "font-family": "monospace" }], ] }, }, diff --git a/js/ranks.js b/js/ranks.js index 5fd5991..29069be 100644 --- a/js/ranks.js +++ b/js/ranks.js @@ -577,7 +577,7 @@ ["raw-html", function () { return hasUpgrade("i", 13) ? "Your tetr boosts points by x" + format(player.r.tetrEffect) + "." : ""}, { "color": "white", "font-size": "20px", "font-family": "monospace" }], ["row", [["clickable", 13]]], ["blank", "25px"], - ["raw-html", function () { return "Total Mult: x" + format(Decimal.mul(player.r.rankEffect, player.r.tierEffect, player.r.tetrEffect)) }, { "color": "white", "font-size": "24px", "font-family": "monospace" }], + ["raw-html", function () { return "Total Mult: x" + format(player.r.rankEffect.mul(player.r.tierEffect.mul(player.r.tetrEffect))) }, { "color": "white", "font-size": "24px", "font-family": "monospace" }], ]