From 3d3d47e859f2918c03b4b6a4edfcf2828b5abedf Mon Sep 17 00:00:00 2001 From: dystopias-user <50160441+Dystopia-user181@users.noreply.github.com> Date: Mon, 17 May 2021 18:08:16 +0800 Subject: [PATCH 1/3] made AI CONSC calculation a bit more accurate --- js/layers.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/layers.js b/js/layers.js index 907552b429..c7f19456ef 100644 --- a/js/layers.js +++ b/js/layers.js @@ -8498,9 +8498,11 @@ addLayer("ai", { update(diff) { if (!player[this.layer].unlocked) return; player.ai.time = player.ai.time.plus(diff); - player.ai.consc = player.ai.consc.plus(tmp.ai.buyables[11].effect.times(diff)).div(Decimal.pow(tmp.ai.divConsc, diff)); + //player.ai.consc = player.ai.consc.plus(tmp.ai.buyables[11].effect.times(diff)).div(Decimal.pow(tmp.ai.divConsc, diff)); + if (tmp.ai.divConsc.lte(1.00001)) player.ai.consc = player.ai.consc.add(tmp.ai.buyables[11].effect.mul(diff)); + else player.ai.consc = player.ai.consc.add(tmp.ai.buyables[11].effect.mul(0.001).sub(player.ai.consc.mul(tmp.ai.divConsc.pow(0.001).sub(1))).mul(tmp.ai.divConsc.pow(0.001).sub(1).recip().mul(Decimal.sub(1, tmp.ai.divConsc.pow(0.001).recip().pow(diff*1000))))) }, - divConsc() { return player.ai.time.plus(1).log10().plus(1).sqrt() }, + divConsc() { return player.ai.time.plus(1).log10().plus(1).sqrt()}, conscEff1() { return player.ai.consc.plus(1) }, conscEff2() { return player.ai.consc.plus(1).log(3).plus(1) }, tabFormat: ["main-display", From 5546a9316134e50d0b111a86d86898c0d7d7bdbd Mon Sep 17 00:00:00 2001 From: dystopias-user <50160441+Dystopia-user181@users.noreply.github.com> Date: Tue, 18 May 2021 16:55:36 +0800 Subject: [PATCH 2/3] mechEn testing --- js/layers.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/layers.js b/js/layers.js index c7f19456ef..d899c3f81d 100644 --- a/js/layers.js +++ b/js/layers.js @@ -7295,7 +7295,9 @@ addLayer("mc", { branches: ["hs", "i", "id"], update(diff) { if (!player[this.layer].unlocked) return; - player.mc.mechEn = player.mc.mechEn.plus(player.ge.rotations.times(tmp.mc.mechPer).times(diff)).times(tmp.mc.decayPower.pow(diff)); + //player.mc.mechEn = player.mc.mechEn.plus(player.ge.rotations.times(tmp.mc.mechPer).times(diff)).times(tmp.mc.decayPower.pow(diff)); + let decayPower = tmp.mc.decayPower.recip(); + player.mc.mechEn = player.mc.mechEn.add(player.ge.rotations.times(tmp.mc.mechPer).mul(0.001).sub(player.mc.mechEn.mul(decayPower.pow(0.001).sub(1))).mul(decayPower.pow(0.001).sub(1).recip().mul(Decimal.sub(1, tmp.mc.decayPower.pow(diff))))) if (hasMilestone("id", 3) && player.mc.autoSE) layers.mc.buyables[11].max(); if (hasMilestone("mc", 1) && player.mc.auto) { player.mc.clickables[11] = player.mc.clickables[11].max(player.mc.mechEn.times(tmp.mc.mechEnMult)); From 7af69de1139d37a82e720c6293489e5ba571db32 Mon Sep 17 00:00:00 2001 From: dystopias-user <50160441+Dystopia-user181@users.noreply.github.com> Date: Tue, 18 May 2021 17:31:20 +0800 Subject: [PATCH 3/3] fixed bug --- js/layers.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/js/layers.js b/js/layers.js index d899c3f81d..75b0220239 100644 --- a/js/layers.js +++ b/js/layers.js @@ -7297,7 +7297,11 @@ addLayer("mc", { if (!player[this.layer].unlocked) return; //player.mc.mechEn = player.mc.mechEn.plus(player.ge.rotations.times(tmp.mc.mechPer).times(diff)).times(tmp.mc.decayPower.pow(diff)); let decayPower = tmp.mc.decayPower.recip(); - player.mc.mechEn = player.mc.mechEn.add(player.ge.rotations.times(tmp.mc.mechPer).mul(0.001).sub(player.mc.mechEn.mul(decayPower.pow(0.001).sub(1))).mul(decayPower.pow(0.001).sub(1).recip().mul(Decimal.sub(1, tmp.mc.decayPower.pow(diff))))) + + if (tmp.mc.decayPower.lte(1.0001)) + player.mc.mechEn = player.mc.mechEn.add(player.ge.rotations.times(tmp.mc.mechPer).mul(diff)); + else + player.mc.mechEn = player.mc.mechEn.add(player.ge.rotations.times(tmp.mc.mechPer).mul(0.001).sub(player.mc.mechEn.mul(decayPower.pow(0.001).sub(1))).mul(decayPower.pow(0.001).sub(1).recip().mul(Decimal.sub(1, tmp.mc.decayPower.pow(diff))))) if (hasMilestone("id", 3) && player.mc.autoSE) layers.mc.buyables[11].max(); if (hasMilestone("mc", 1) && player.mc.auto) { player.mc.clickables[11] = player.mc.clickables[11].max(player.mc.mechEn.times(tmp.mc.mechEnMult)); @@ -7596,7 +7600,6 @@ addLayer("en", { let gain = tmp.en.getResetGain.div(tmp.en.gainMult).plus(1) return Decimal.pow(2, gain.root(tmp.en.exp)).times(tmp.en.req); }, - passiveGeneration() { return hasMilestone("en", 0)?0.1:0 }, canReset() { return player.o.points.gte(tmp.en.req) && tmp.en.getResetGain.gt(0) && (hasMilestone("en", 0)?player.en.points.lt(tmp.en.getResetGain):player.en.points.eq(0)) }, @@ -7632,6 +7635,7 @@ addLayer("en", { } if (layers[resettingLayer].row > this.row) layerDataReset(this.layer, keep) }, + passiveGeneration() { return hasMilestone("en", 0)?0.1:0}, onPrestige(gain) { player.en.bestOnReset = player.en.bestOnReset.max(gain) }, layerShown(){return player.mc.unlocked }, branches: ["sb","o"],