More relatively minor text fixes

This commit is contained in:
SpectralFlame 2023-02-02 05:48:36 -06:00 committed by cyip92
parent 177ef0b694
commit 6cc8f79940
6 changed files with 17 additions and 12 deletions

View File

@ -179,7 +179,7 @@ export function preProductionGenerateIP(diff) {
genCount = Math.floor(player.partInfinityPoint);
player.partInfinityPoint -= genCount;
}
let gainedPerGen = InfinityUpgrade.ipGen.effectValue;
let gainedPerGen = player.records.bestInfinity.time >= 999999999999 ? DC.D0 : InfinityUpgrade.ipGen.effectValue;
if (Laitela.isRunning) gainedPerGen = dilatedValueOf(gainedPerGen);
const gainedThisTick = new Decimal(genCount).times(gainedPerGen);
Currency.infinityPoints.add(gainedThisTick);

View File

@ -59,7 +59,7 @@ GameDatabase.eternity.upgrades = {
? "Time Dimensions are multiplied by days played in this Armageddon"
: "Time Dimensions are multiplied by days played"
),
effect: () => (Pelle.isDoomed ? 1 + Time.thisReality.totalDays : Time.totalTimePlayed.totalDays),
effect: () => (Pelle.isDoomed ? 1 + Time.thisReality.totalDays : Math.max(Time.totalTimePlayed.totalDays, 1)),
formatEffect: value => formatX(value, 2, 1)
}
};

View File

@ -165,11 +165,8 @@ GameDatabase.infinity.upgrades = {
formatEffect: value => {
if (Teresa.isRunning || V.isRunning) return "Disabled in this reality";
if (Pelle.isDoomed) return "Disabled";
const income = format(value, 2, 0);
const period = player.records.bestInfinity.time >= 999999999999
? "∞"
: Time.bestInfinity.times(10).toStringShort();
return `${income} every ${period}`;
if (player.records.bestInfinity.time >= 999999999999) return "Too slow to generate";
return `${format(value, 2)} every ${Time.bestInfinity.times(10).toStringShort()}`;
},
charged: {
description: () =>

View File

@ -262,13 +262,13 @@ export default {
/>
</template>
<StudyStringPreview
v-if="!deleting"
v-if="!deleting && inputIsValidTree"
:show-preview="inputIsValidTree"
:new-studies="!isImporting || (canEternity && respecAndLoad) ? importedTree.newStudiesArray
: combinedTree.newStudiesArray"
:disregard-current-studies="!isImporting || (canEternity && respecAndLoad)"
/>
<div v-else-if="hasInput">
<div v-else-if="!deleting && hasInput">
Not a valid tree
</div>
</div>

View File

@ -25,7 +25,8 @@ export default {
simRealities: 0,
realityMachines: new Decimal(),
shardsGained: 0,
effarigUnlocked: false
effarigUnlocked: false,
willAutoPurge: false,
};
},
computed: {
@ -89,6 +90,7 @@ export default {
const simRMGained = MachineHandler.gainedRealityMachines.times(this.simRealities);
this.realityMachines.copyFrom(simRMGained.clampMax(MachineHandler.distanceToRMCap));
this.shardsGained = Effarig.shardsGained * (simulatedRealityCount(false) + 1);
this.willAutoPurge = player.reality.autoAutoClean;
if (this.firstReality) return;
for (let i = 0; i < this.glyphs.length; ++i) {
const currentGlyph = this.glyphs[i];
@ -172,6 +174,12 @@ export default {
automatically choosing another {{ quantifyInt("Glyph", simRealities - 1) }}
based on your Glyph filter settings.
</div>
<div v-if="willAutoPurge">
<br>
Auto-purge is currently enabled; your selected Glyph
<br>
may not appear in your inventory after it triggers.
</div>
<div
v-if="!hasSpace"
class="o-warning"

View File

@ -34,8 +34,8 @@ export default {
"o-pelle-disabled-pointer": this.creditsClosed,
};
},
// Show EP/min below this threshold, color the EP number above it
rateThreshold: () => 1e20,
// Show EP/min below this threshold, color the EP number above it (1e40 is roughly when TS181 is attainable)
rateThreshold: () => 1e40,
showEPRate() {
return this.peakEPRate.lte(this.rateThreshold);
},