Skip to content

V1.3 beta mechenergy calculation correction #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dystopia-user181 wants to merge 4 commits into
base: v1.3-Beta
Choose a base branch
from
Open

V1.3 beta mechenergy calculation correction #17

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d3d47e
made AI CONSC calculation a bit more accurate
Dystopia-user181 May 17, 2021
5546a93
mechEn testing
Dystopia-user181 May 18, 2021
7af69de
fixed bug
Dystopia-user181 May 18, 2021
47475c6
Merge branch 'v1.3-Beta' into v1.3-Beta
Dystopia-user181 May 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions js/layers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7297,7 +7297,13 @@ 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();

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));
Expand Down Expand Up @@ -7596,7 +7602,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))
},
Expand Down Expand Up @@ -7632,6 +7637,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"],
Expand Down Expand Up @@ -8506,7 +8512,7 @@ addLayer("ai", {
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",
Expand Down