Added text on dil1-3 and 225/226, fixed infinite loop on EP mult autobuyer

This commit is contained in:
SpectralFlame 2018-10-06 15:06:23 -05:00
parent b3f1d8106d
commit 3601d55d82
3 changed files with 22 additions and 13 deletions

View File

@ -276,8 +276,8 @@
<td><button class="timestudy lightstudy" style="margin: 1px; width: 120px; font-size: 0.55rem; padding: 3px;" id="222" onclick="buyTimeStudy(222, 900)">Dimensional boost costs scale by another 2 less.<span>Cost: 900 Time Theorems</button></td>
<td><button class="timestudy darkstudy" style="margin: 1px; width: 120px; font-size: 0.55rem; padding: 3px;" id="223" onclick="buyTimeStudy(223, 900)">Galaxy cost scaling starts 7 galaxies later.<span>Cost: 900 Time Theorems</button></td>
<td><button class="timestudy lightstudy" style="margin: 1px; width: 120px; font-size: 0.55rem; padding: 3px;" id="224" onclick="buyTimeStudy(224, 900)">Galaxy cost scaling starts 1 galaxy later for every 2000 dimensional boosts.<span>Cost: 900 Time Theorems</button></td>
<td><button class="timestudy darkstudy" style="margin: 1px; width: 120px; font-size: 0.55rem; padding: 3px;" id="225" onclick="buyTimeStudy(225, 900)">You gain extra RGs based on how high above infinity your replicanti are.<span>Cost: 900 Time Theorems</button></td>
<td><button class="timestudy lightstudy" style="margin: 1px; width: 120px; font-size: 0.55rem; padding: 3px;" id="226" onclick="buyTimeStudy(226, 900)">You gain extra RGs based on your max RGs.<span>Cost: 900 Time Theorems</button></td>
<td><button class="timestudy darkstudy" style="margin: 1px; width: 120px; font-size: 0.55rem; padding: 3px;" id="225" onclick="buyTimeStudy(225, 900)">You gain extra RGs based on how high your replicanti are.<span id="225desc">Currently: </span><span>Cost: 900 Time Theorems</button></td>
<td><button class="timestudy lightstudy" style="margin: 1px; width: 120px; font-size: 0.55rem; padding: 3px;" id="226" onclick="buyTimeStudy(226, 900)">You gain extra RGs based on your max RGs.<span id="226desc">Currently: </span><span>Cost: 900 Time Theorems</button></td>
<td><button class="timestudy darkstudy" style="margin: 1px; width: 120px; font-size: 0.55rem; padding: 3px;" id="227" onclick="buyTimeStudy(227, 900)">Sacrifice affects the 4th Time Dimension with reduced effect.<span>Cost: 900 Time Theorems</button></td>
<td><button class="timestudy lightstudy" style="margin: 1px; width: 120px; font-size: 0.55rem; padding: 3px;" id="228" onclick="buyTimeStudy(228, 900)">Sacrifice scales better.<span>Cost: 900 Time Theorems</button></td>
</tr>
@ -457,13 +457,13 @@
<table>
<tr>
<td>
<button class="timestudy" id="dil1" onclick="buyDilationUpgrade(1)">Double time dilation gain.<br><span id="dil1cost">Cost: 1e5 dilated time</span></button>
<button class="timestudy" id="dil1" onclick="buyDilationUpgrade(1)">Double time dilation gain.<br><span id="dil1mult">Currently: x</span><br><span id="dil1cost">Cost: 1e5 dilated time</span></button>
</td>
<td>
<button class="timestudy" id="dil2" onclick="buyDilationUpgrade(2)">Decrease the free galaxy threshold multiplier, but resets free galaxies and dilated time.<br><span id="dil2cost">Cost: 1e6 dilated time</span></button>
<button class="timestudy" id="dil2" onclick="buyDilationUpgrade(2)">Free galaxy threshold is lowered, but reset them and dilated time.<br><span id="dil2mult">Currently: x</span><br><span id="dil2cost">Cost: 1e6 dilated time</span></button>
</td>
<td>
<button class="timestudy" id="dil3" onclick="buyDilationUpgrade(3)">Triple the amount of Tachyon Particles gained.<br><span id="dil3cost">Cost: 1e7 dilated time</span></button>
<button class="timestudy" id="dil3" onclick="buyDilationUpgrade(3)">Triple the amount of Tachyon Particles gained.<br><span id="dil3mult">Currently: x</span><br><span id="dil3cost">Cost: 1e7 dilated time</span></button>
</td>
</tr>
<tr>

View File

@ -111,8 +111,21 @@ function updateDilationUpgradeCosts() {
document.getElementById("dil10cost").textContent = "Cost: " + shortenCosts(DIL_UPG_COSTS[10]) + " dilated time"
if (player.reality.perks.includes(11))
document.getElementById("dil2").innerHTML = document.getElementById("dil2").innerHTML.replace(" and dilated time", "");
document.getElementById("dil1mult").textContent = "Currently: " + shortenDimensions(new Decimal(2).pow(player.dilation.rebuyables[1])) + "x";
document.getElementById("dil2mult").textContent = "Currently: " + getFreeGalaxyMult().toFixed(4) + "x";
document.getElementById("dil3mult").textContent = "Currently: " + shortenDimensions(new Decimal(3).pow(player.dilation.rebuyables[3])) + "x";
}
function getFreeGalaxyMult() {
let thresholdMult = 3.65 * Math.pow(0.8, player.dilation.rebuyables[2])
for (i in player.reality.glyphs.active) {
var glyph = player.reality.glyphs.active[i]
if (glyph.type == "dilation" && glyph.effects.galaxyThreshold !== undefined) thresholdMult *= glyph.effects.galaxyThreshold
}
thresholdMult += 1.35;
return thresholdMult;
}
function getDilationGainPerSecond() {
var ret = new Decimal(player.dilation.tachyonParticles*Math.pow(2, player.dilation.rebuyables[1]))

View File

@ -589,7 +589,7 @@ function buyEPMult(upd, threshold) {
function buyMaxEPMult(threshold) {
if (threshold == undefined) threshold = 1
while (player.eternityPoints.gte(player.epmultCost)) {
while (player.eternityPoints.gte(player.epmultCost.times(1/threshold))) {
buyEPMult(false, threshold)
}
}
@ -784,7 +784,8 @@ function updateInfCosts() {
document.getElementById("193desc").textContent = "Currently: "+shortenMoney(Decimal.pow(1.03, player.eternities).min("1e13000"))+"x"
document.getElementById("212desc").textContent = "Currently: "+((Math.pow(player.timeShards.max(2).log2(), 0.005)-1)*100).toFixed(2)+"%"
document.getElementById("214desc").textContent = "Currently: "+shortenMoney(((calcTotalSacrificeBoost().pow(8)).min("1e46000").times(calcTotalSacrificeBoost().pow(1.1)).div(calcTotalSacrificeBoost())).max(1).min(new Decimal("1e125000")))+"x"
document.getElementById("225desc").textContent = "Currently: +" + Math.floor(player.replicanti.amount.exponent / 1000) + " RG"
document.getElementById("226desc").textContent = "Currently: +" + Math.floor(player.replicanti.gal / 15) + " RG"
// Text for EC unlock studies
var ECUnlockQuantity = [0, player.eternities, player.totalTickGained, player.eightAmount, player.infinitied + player.infinitiedBank, player.galaxies, player.replicanti.galaxies, player.money, player.infinityPoints, player.infinityPower, player.eternityPoints];
@ -2841,12 +2842,7 @@ function gameLoop(diff) {
freeGalaxyMult = 2;
if (player.dilation.baseFreeGalaxies == undefined)
player.dilation.baseFreeGalaxies = player.dilation.freeGalaxies / freeGalaxyMult;
let thresholdMult = 3.65 * Math.pow(0.8, player.dilation.rebuyables[2])
for (i in player.reality.glyphs.active) {
var glyph = player.reality.glyphs.active[i]
if (glyph.type == "dilation" && glyph.effects.galaxyThreshold !== undefined) thresholdMult *= glyph.effects.galaxyThreshold
}
thresholdMult += 1.35;
let thresholdMult = getFreeGalaxyMult();
player.dilation.baseFreeGalaxies = Math.max(player.dilation.baseFreeGalaxies, 1 + Math.floor(Decimal.log(player.dilation.dilatedTime.dividedBy(1000), new Decimal(thresholdMult))));
player.dilation.nextThreshold = new Decimal(1000).times(new Decimal(thresholdMult).pow(player.dilation.baseFreeGalaxies));
player.dilation.freeGalaxies = Math.min(player.dilation.baseFreeGalaxies * freeGalaxyMult, 1000) + Math.max(player.dilation.baseFreeGalaxies * freeGalaxyMult - 1000, 0) / freeGalaxyMult;