From 985174e5013f76d587858eb7a03de545d132f6da Mon Sep 17 00:00:00 2001 From: Icecreamdude <72051053+Icecreamdudes@users.noreply.github.com> Date: Sat, 31 Aug 2024 19:46:18 -0400 Subject: [PATCH] f --- js/Cantepocalypse/altRanks.js | 1 + js/Cantepocalypse/anonymity.js | 1 + js/Cantepocalypse/cantepocalypse.js | 3 + js/Cantepocalypse/repliGrass.js | 129 +++++++++++++++++++++++++++- js/Cantepocalypse/repliTrees.js | 3 +- js/debuff.js | 4 +- 6 files changed, 136 insertions(+), 5 deletions(-) diff --git a/js/Cantepocalypse/altRanks.js b/js/Cantepocalypse/altRanks.js index 21128be..1badf65 100644 --- a/js/Cantepocalypse/altRanks.js +++ b/js/Cantepocalypse/altRanks.js @@ -49,6 +49,7 @@ player.ar.tetrPointsToGet = player.ar.tierPoints.mul(0.1).pow(0.4) player.ar.tetrPointsEffect = player.ar.tetrPoints.pow(0.5).add(1) if (hasUpgrade("an", 18)) player.ar.tetrPoints = player.ar.tetrPoints.add(player.ar.tetrPointsToGet.mul(Decimal.mul(delta, 0.05))) + player.ar.tierPointsToGet = player.ar.tetrPointsToGet.mul(buyableEffect("rg", 16)) }, clickables: { 1: { diff --git a/js/Cantepocalypse/anonymity.js b/js/Cantepocalypse/anonymity.js index 52c22cf..395591f 100644 --- a/js/Cantepocalypse/anonymity.js +++ b/js/Cantepocalypse/anonymity.js @@ -23,6 +23,7 @@ player.an.anonymityToGet = player.cp.replicantiPoints.div(250000).pow(0.25) if (hasUpgrade("an", 17)) player.an.anonymityToGet = player.an.anonymityToGet.mul(upgradeEffect("an", 17)) player.an.anonymityToGet = player.an.anonymityToGet.mul(player.rt.repliTreesEffect) + player.an.anonymityToGet = player.an.anonymityToGet.mul(buyableEffect("rg", 17)) }, clickables: { 1: { diff --git a/js/Cantepocalypse/cantepocalypse.js b/js/Cantepocalypse/cantepocalypse.js index 635af3f..190d1d3 100644 --- a/js/Cantepocalypse/cantepocalypse.js +++ b/js/Cantepocalypse/cantepocalypse.js @@ -44,6 +44,7 @@ addLayer("cp", { if (hasUpgrade("an", 12)) multAdd = multAdd.mul(upgradeEffect("an", 12)) multAdd = multAdd.mul(buyableEffect("rt", 15)) multAdd = multAdd.mul(player.rg.repliGrassEffect) + multAdd = multAdd.mul(buyableEffect("rg", 15)) player.cp.replicantiPointsTimerReq = new Decimal(3) player.cp.replicantiPointsTimerReq = player.cp.replicantiPointsTimerReq.div(buyableEffect("pr", 12)) @@ -52,6 +53,7 @@ addLayer("cp", { player.cp.replicantiSoftcapStart = player.cp.replicantiSoftcapStart.mul(buyableEffect("pr", 15)) if (hasUpgrade("an", 14)) player.cp.replicantiSoftcapStart = player.cp.replicantiSoftcapStart.mul(1000) if (hasUpgrade("an", 19)) player.cp.replicantiSoftcapStart = player.cp.replicantiSoftcapStart.mul(upgradeEffect("an", 19)) + player.cp.replicantiSoftcapStart = player.cp.replicantiSoftcapStart.mul(buyableEffect("rg", 18)) player.cp.replicantiSoftcapEffect = player.cp.replicantiPoints.sub(player.cp.replicantiSoftcapStart).pow(0.375) player.cp.replicantiSoftcapEffect = player.cp.replicantiSoftcapEffect.div(buyableEffect("pr", 16)) @@ -64,6 +66,7 @@ addLayer("cp", { if (hasUpgrade("an", 14)) player.cp.replicantiSoftcap2Start = player.cp.replicantiSoftcap2Start.mul(1000) player.cp.replicantiSoftcap2Start = player.cp.replicantiSoftcap2Start.mul(buyableEffect("rt", 17)) if (hasUpgrade("an", 19)) player.cp.replicantiSoftcap2Start = player.cp.replicantiSoftcap2Start.mul(upgradeEffect("an", 19)) + player.cp.replicantiSoftcap2Start = player.cp.replicantiSoftcap2Start.mul(buyableEffect("rg", 18)) player.cp.replicantiSoftcap2Effect = player.cp.replicantiPoints.sub(player.cp.replicantiSoftcap2Start).pow(0.25).div(4) player.cp.replicantiSoftcap2Effect = player.cp.replicantiSoftcap2Effect.div(buyableEffect("pr", 16)) diff --git a/js/Cantepocalypse/repliGrass.js b/js/Cantepocalypse/repliGrass.js index 7436365..8277cb6 100644 --- a/js/Cantepocalypse/repliGrass.js +++ b/js/Cantepocalypse/repliGrass.js @@ -76,7 +76,7 @@ player.rg.repliGrassSoftcapStart = new Decimal(1000) player.rg.repliGrassSoftcapStart = player.rg.repliGrassSoftcapStart.mul(buyableEffect("rg", 14)) - let multAdd = new Decimal(0.01) + let multAdd = new Decimal(0.02) multAdd = multAdd.add(buyableEffect("rg", 11)) player.rg.repliGrassMult = multAdd.add(1) @@ -143,7 +143,7 @@ buyables: { 11: { cost(x) { return new Decimal(1.25).pow(x || getBuyableAmount(this.layer, this.id)).mul(1)}, - effect(x) { return new getBuyableAmount(this.layer, this.id).mul(0.001) }, + effect(x) { return new getBuyableAmount(this.layer, this.id).mul(0.0025) }, unlocked() { return true }, canAfford() { return player.rg.repliGrass.gte(this.cost()) }, title() { @@ -266,6 +266,130 @@ }, style: { width: '275px', height: '150px', } }, + 15: { + cost(x) { return new Decimal(1.45).pow(x || getBuyableAmount(this.layer, this.id)).mul(3)}, + effect(x) { return new getBuyableAmount(this.layer, this.id).mul(0.1).pow(0.8).add(1) }, + unlocked() { return true }, + canAfford() { return player.rg.repliGrass.gte(this.cost()) }, + title() { + return format(getBuyableAmount(this.layer, this.id), 0) + "
Replicanti Point Multiplier." + }, + display() { + return "which are multiplying the replicanti point multiplier by x" + format(tmp[this.layer].buyables[this.id].effect) + ".\n\ + Cost: " + format(tmp[this.layer].buyables[this.id].cost) + " Repli-Grass." + }, + buy() { + let base = new Decimal(3) + let growth = 1.45 + if (player.buyMax == false) + { + let buyonecost = new Decimal(growth).pow(getBuyableAmount(this.layer, this.id)).mul(base) + player.rg.repliGrass = player.rg.repliGrass.sub(buyonecost) + setBuyableAmount(this.layer, this.id, getBuyableAmount(this.layer, this.id).add(1)) + } else + { + let max = Decimal.affordGeometricSeries(player.rg.repliGrass, base, growth, getBuyableAmount(this.layer, this.id)) + let cost = Decimal.sumGeometricSeries(max, base, growth, getBuyableAmount(this.layer, this.id)).floor() + player.rg.repliGrass = player.rg.repliGrass.sub(cost) + + setBuyableAmount(this.layer, this.id, getBuyableAmount(this.layer, this.id).add(max)) + } + }, + style: { width: '275px', height: '150px', } + }, + 16: { + cost(x) { return new Decimal(1.55).pow(x || getBuyableAmount(this.layer, this.id)).mul(7)}, + effect(x) { return new getBuyableAmount(this.layer, this.id).mul(0.25).add(1) }, + unlocked() { return true }, + canAfford() { return player.rg.repliGrass.gte(this.cost()) }, + title() { + return format(getBuyableAmount(this.layer, this.id), 0) + "
Tetr Point Multiplier." + }, + display() { + return "which are multiplying tetr points by x" + format(tmp[this.layer].buyables[this.id].effect) + ".\n\ + Cost: " + format(tmp[this.layer].buyables[this.id].cost) + " Repli-Grass." + }, + buy() { + let base = new Decimal(7) + let growth = 1.55 + if (player.buyMax == false) + { + let buyonecost = new Decimal(growth).pow(getBuyableAmount(this.layer, this.id)).mul(base) + player.rg.repliGrass = player.rg.repliGrass.sub(buyonecost) + setBuyableAmount(this.layer, this.id, getBuyableAmount(this.layer, this.id).add(1)) + } else + { + let max = Decimal.affordGeometricSeries(player.rg.repliGrass, base, growth, getBuyableAmount(this.layer, this.id)) + let cost = Decimal.sumGeometricSeries(max, base, growth, getBuyableAmount(this.layer, this.id)).floor() + player.rg.repliGrass = player.rg.repliGrass.sub(cost) + + setBuyableAmount(this.layer, this.id, getBuyableAmount(this.layer, this.id).add(max)) + } + }, + style: { width: '275px', height: '150px', } + }, + 17: { + cost(x) { return new Decimal(1.5).pow(x || getBuyableAmount(this.layer, this.id)).mul(16)}, + effect(x) { return new getBuyableAmount(this.layer, this.id).mul(0.25).pow(0.8).add(1) }, + unlocked() { return true }, + canAfford() { return player.rg.repliGrass.gte(this.cost()) }, + title() { + return format(getBuyableAmount(this.layer, this.id), 0) + "
Anonymity Multiplier." + }, + display() { + return "which are multiplying anonymity by x" + format(tmp[this.layer].buyables[this.id].effect) + ".\n\ + Cost: " + format(tmp[this.layer].buyables[this.id].cost) + " Repli-Grass." + }, + buy() { + let base = new Decimal(16) + let growth = 1.5 + if (player.buyMax == false) + { + let buyonecost = new Decimal(growth).pow(getBuyableAmount(this.layer, this.id)).mul(base) + player.rg.repliGrass = player.rg.repliGrass.sub(buyonecost) + setBuyableAmount(this.layer, this.id, getBuyableAmount(this.layer, this.id).add(1)) + } else + { + let max = Decimal.affordGeometricSeries(player.rg.repliGrass, base, growth, getBuyableAmount(this.layer, this.id)) + let cost = Decimal.sumGeometricSeries(max, base, growth, getBuyableAmount(this.layer, this.id)).floor() + player.rg.repliGrass = player.rg.repliGrass.sub(cost) + + setBuyableAmount(this.layer, this.id, getBuyableAmount(this.layer, this.id).add(max)) + } + }, + style: { width: '275px', height: '150px', } + }, + 18: { + cost(x) { return new Decimal(1.35).pow(x || getBuyableAmount(this.layer, this.id)).mul(30)}, + effect(x) { return new getBuyableAmount(this.layer, this.id).pow(1.2).add(1) }, + unlocked() { return true }, + canAfford() { return player.rg.repliGrass.gte(this.cost()) }, + title() { + return format(getBuyableAmount(this.layer, this.id), 0) + "
Softcap Extender." + }, + display() { + return "which are extending the first, second, and repli-tree softcap by x" + format(tmp[this.layer].buyables[this.id].effect) + ".\n\ + Cost: " + format(tmp[this.layer].buyables[this.id].cost) + " Repli-Grass." + }, + buy() { + let base = new Decimal(30) + let growth = 1.35 + if (player.buyMax == false) + { + let buyonecost = new Decimal(growth).pow(getBuyableAmount(this.layer, this.id)).mul(base) + player.rg.repliGrass = player.rg.repliGrass.sub(buyonecost) + setBuyableAmount(this.layer, this.id, getBuyableAmount(this.layer, this.id).add(1)) + } else + { + let max = Decimal.affordGeometricSeries(player.rg.repliGrass, base, growth, getBuyableAmount(this.layer, this.id)) + let cost = Decimal.sumGeometricSeries(max, base, growth, getBuyableAmount(this.layer, this.id)).floor() + player.rg.repliGrass = player.rg.repliGrass.sub(cost) + + setBuyableAmount(this.layer, this.id, getBuyableAmount(this.layer, this.id).add(max)) + } + }, + style: { width: '275px', height: '150px', } + }, }, milestones: { @@ -298,6 +422,7 @@ [ ["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 index 57b4c5b..a91ab75 100644 --- a/js/Cantepocalypse/repliTrees.js +++ b/js/Cantepocalypse/repliTrees.js @@ -32,7 +32,7 @@ multAdd = new Decimal(0) multAdd = buyableEffect("rt", 11) - multAdd = multAdd.mul(player.ar.repliGrassEffect2) + multAdd = multAdd.mul(player.rg.repliGrassEffect2) player.rt.repliLeavesTimerReq = new Decimal(6) if (hasUpgrade("an", 21)) player.rt.repliLeavesTimerReq = player.rt.repliLeavesTimerReq.sub(1.5) @@ -40,6 +40,7 @@ player.rt.repliTreesSoftcapStart = new Decimal(10) player.rt.repliTreesSoftcapStart = player.rt.repliTreesSoftcapStart.mul(buyableEffect("rt", 18)) + player.rt.repliTreesSoftcapStart = player.rt.repliTreesSoftcapStart.mul(buyableEffect("rg", 18)) player.rt.repliTreeSoftcapEffect = player.rt.repliTrees.sub(player.rt.repliTreeSoftcapStart).pow(1.25).div(10).add(1) if (player.rt.repliTrees.gte(player.rt.repliTreeSoftcapStart)) diff --git a/js/debuff.js b/js/debuff.js index 79842b1..b91314a 100644 --- a/js/debuff.js +++ b/js/debuff.js @@ -101,14 +101,14 @@ player.de.antidebuffText = "Your chosen effect is boosting nothing." } - player.de.tavPointsToGet = player.points.pow(0.075).add(1) + player.de.tavPointsToGet = player.points.pow(0.08).add(1) player.de.tavPointsToGet = player.de.tavPointsToGet.mul(buyableEffect("de", 14)) if (hasUpgrade("de", 19)) player.de.tavPointsToGet = player.de.tavPointsToGet.mul(upgradeEffect("de", 19)) if (hasUpgrade("tad", 14)) player.de.tavPointsToGet = player.de.tavPointsToGet.mul(buyableEffect("tad", 14)) if (hasUpgrade("de", 18)) player.de.tavPoints = player.de.tavPoints.add(player.de.tavPointsToGet.mul(0.1).mul(delta)) - player.de.tavEssencePerSecond = player.de.tavPoints.pow(1.5).add(1) + player.de.tavEssencePerSecond = player.de.tavPoints.pow(1.55).add(1) player.de.tavEssencePerSecond = player.de.tavEssencePerSecond.mul(buyableEffect("de", 13)) if (hasUpgrade("de", 12)) player.de.tavEssencePerSecond = player.de.tavEssencePerSecond.mul(upgradeEffect("de", 12)) if (hasUpgrade("de", 19)) player.de.tavEssencePerSecond = player.de.tavEssencePerSecond.mul(upgradeEffect("de", 19))