I like ass

This commit is contained in:
IvarK 2017-10-08 20:13:53 +03:00
parent dd5f577e0b
commit ef900711e4
2 changed files with 8 additions and 7 deletions

View File

@ -874,7 +874,7 @@
<button id="postc4" class="challengesbtn" onclick="startChallenge('postc4', new Decimal('1e13000'))">Start</button>
<br>
<span id="postc4goal" >Goal: 1e13000</span><br>
<span>Reward: All normal dimension multipliers become multiplier^1.2</span>
<span>Reward: All normal dimension multipliers become multiplier^1.1</span>
</div>
</div>
</td>
@ -882,7 +882,7 @@
<tr>
<td>
<div class="infchallengediv" id="postc5div" style="height: 140px; display: none">
<span>When buying dimensions 1-4, everything with costs bigger or equal increases. When buying dimensions 5-8, everything with costs smaller or equal increases. When buying tickspeed, everything with the same cost increases.</span>
<span>When buying dimensions 1-4, everything with costs smaller or equal increases. When buying dimensions 5-8, everything with costs bigger or equal increases. When buying tickspeed, everything with the same cost increases.</span>
<br>
<br>
<div class="outer">

View File

@ -849,11 +849,12 @@ function getETA(cost) {
}
function ETACalc(t) {
var value = player.money + calcPerSec(player.firstAmount, player.firstPow, player.infinityUpgrades.includes("18Mult"));
var value = player.money.plus(getDimensionProductionPerSecond(1).times(t));
var div = 1;
for (let tier = 1; tier <= 8; ++tier) {
div *= (tier+1);
value += getDimensionRateOfChange(tier) / div * Decimal.pow(t,tier);
for (let tier = 2; tier <= 8; ++tier) {
var name = TIER_NAMES[tier-1]
div *= tier;
value = value.plus(getDimensionProductionPerSecond(tier).times(getDimensionProductionPerSecond(tier-1)).times(Decimal.pow(t,tier)).dividedBy(player[name+"Amount"].times(div))) ;
}
return value
}
@ -3488,7 +3489,7 @@ function startChallenge(name, target) {
}
function getDimensionProductionPerSecond(tier) {
let ret = Decimal.floor(player[TIER_NAMES[tier] + 'Amount']).times(getDimensionFinalMultiplier(tier)).times(new Decimal(1000).dividedBy(player.tickspeed))
let ret = Decimal.floor(player[TIER_NAMES[tier] + 'Amount']).times(getDimensionFinalMultiplier(tier)).times(1000).dividedBy(player.tickspeed)
if (player.currentChallenge == "challenge7") {
if (tier == 4) ret = Decimal.pow(Decimal.floor(player[TIER_NAMES[tier] + 'Amount']), 1.3).times(getDimensionFinalMultiplier(tier)).dividedBy(player.tickspeed.dividedBy(1000))
else if (tier == 2) ret = Decimal.pow(Decimal.floor(player[TIER_NAMES[tier] + 'Amount']), 1.5).times(getDimensionFinalMultiplier(tier)).dividedBy(player.tickspeed.dividedBy(1000))