More text and styling improvements

This commit is contained in:
SpectralFlame 2023-03-13 08:18:07 -05:00 committed by cyip92
parent a5515d27eb
commit 5f16b7bc99
9 changed files with 99 additions and 75 deletions

View File

@ -2883,29 +2883,6 @@ br {
.t-s10 .c-stats-tab {
color: #e0e0e0;
}
.c-stats-tab-general {
font-size: 2rem;
font-weight: bold;
color: var(--color-text);
}
.c-stats-tab-subheader {
height: 15rem;
}
.c-stats-tab-infinity {
color: var(--color-infinity);
}
.c-stats-tab-eternity {
color: var(--color-eternity);
}
.c-stats-tab-reality {
color: var(--color-reality);
}
/* #endregion c-stats-tab */
/* #region Past Prestige Runs */

View File

@ -16,6 +16,7 @@ export default {
continuumValue: 0,
hasTutorial: false,
hasRealityButton: false,
isEC9: false,
};
},
computed: {
@ -49,8 +50,8 @@ export default {
this.hasRealityButton = PlayerProgress.realityUnlocked() || TimeStudy.reality.isBought;
this.purchasedTickspeed = player.totalTickBought;
this.freeTickspeed = FreeTickspeed.amount;
const isEC9Running = EternityChallenge(9).isRunning;
this.isVisible = Tickspeed.isUnlocked || isEC9Running;
this.isEC9 = EternityChallenge(9).isRunning;
this.isVisible = Tickspeed.isUnlocked || this.isEC9;
if (!this.isVisible) return;
this.mult.copyFrom(Tickspeed.multiplier);
this.cost.copyFrom(Tickspeed.cost);
@ -86,6 +87,9 @@ export default {
<span v-if="isContinuumActive">
Tickspeed Continuum: {{ continuumString }}
</span>
<span v-else-if="isEC9">
Tickspeed Unpurchasable (EC 9)
</span>
<span v-else>
Tickspeed Cost: {{ format(cost) }}
</span>

View File

@ -194,6 +194,8 @@ export default {
<br>
Cursed Glyphs can be created in the Effarig tab.
<br>
Cursed Glyphs count as {{ formatInt(-3) }} Glyphs for the purposes of all requirements related to Glyph count.
<br>
<span v-if="!isDoomed">The Black Hole can now be used to slow down time if they are both permanent.</span>
<br><br>
Each Hard V-Achievement counts as two V-Achievements and will award {{ formatInt(2) }} Space Theorems

View File

@ -148,6 +148,13 @@ export default {
this.matterScale = MatterScale.estimate(Currency.antimatter.value);
this.lastMatterTime = Date.now();
}
},
realityClassObject() {
return {
"c-stats-tab-title": true,
"c-stats-tab-reality": !this.isDoomed,
"c-stats-tab-doomed": this.isDoomed,
};
}
},
};
@ -159,40 +166,39 @@ export default {
<PrimaryButton onclick="Modal.catchup.show(0)">
View Content Summary
</PrimaryButton>
<div class="c-stats-tab-general">
<div class="c-stats-tab-title c-stats-tab-general">
General
</div>
<div>You have made a total of {{ format(totalAntimatter, 2, 1) }} antimatter.</div>
<div>You have played for {{ realTimePlayed }}. (real time)</div>
<div v-if="reality.isUnlocked">
Your existence has spanned {{ reality.totalTimePlayed }} of time. (game time)
</div>
<div v-if="isDoomed">
You have been doomed for {{ realTimeDoomed }}. (real time)
</div>
<div>
You have seen {{ quantifyInt("news message", totalNews) }} in total.
</div>
<div>
You have seen {{ quantifyInt("unique news message", uniqueNews) }}.
</div>
<div>
You have unlocked {{ quantifyInt("Secret Achievement", secretAchievementCount) }}.
</div>
<div v-if="paperclips">
You have {{ quantifyInt("useless paperclip", paperclips) }}.
</div>
<div v-if="fullGameCompletions">
<br>
<b>
You have completed the entire game {{ quantifyInt("time", fullGameCompletions) }}.
<div class="c-stats-tab-general">
<div>You have made a total of {{ format(totalAntimatter, 2, 1) }} antimatter.</div>
<div>You have played for {{ realTimePlayed }}. (real time)</div>
<div v-if="reality.isUnlocked">
Your existence has spanned {{ reality.totalTimePlayed }} of time. (game time)
</div>
<div>
You have seen {{ quantifyInt("news message", totalNews) }} in total.
</div>
<div>
You have seen {{ quantifyInt("unique news message", uniqueNews) }}.
</div>
<div>
You have unlocked {{ quantifyInt("Secret Achievement", secretAchievementCount) }}.
</div>
<div v-if="paperclips">
You have {{ quantifyInt("useless paperclip", paperclips) }}.
</div>
<div v-if="fullGameCompletions">
<br>
You have played for {{ fullTimePlayed }} across all playthroughs.
</b>
<b>
You have completed the entire game {{ quantifyInt("time", fullGameCompletions) }}.
<br>
You have played for {{ fullTimePlayed }} across all playthroughs.
</b>
</div>
</div>
<div>
<br>
<div class="c-matter-scale-container">
<div class="c-matter-scale-container c-stats-tab-general">
<div
v-for="(line, i) in matterScale"
:key="i"
@ -207,9 +213,9 @@ export default {
</div>
<div
v-if="infinity.isUnlocked"
class="c-stats-tab-subheader"
class="c-stats-tab-subheader c-stats-tab-general"
>
<div class="c-stats-tab-general c-stats-tab-infinity">
<div class="c-stats-tab-title c-stats-tab-infinity">
Infinity
</div>
<div>
@ -240,9 +246,9 @@ export default {
</div>
<div
v-if="eternity.isUnlocked"
class="c-stats-tab-subheader"
class="c-stats-tab-subheader c-stats-tab-general"
>
<div class="c-stats-tab-general c-stats-tab-eternity">
<div class="c-stats-tab-title c-stats-tab-eternity">
Eternity
</div>
<div>
@ -277,17 +283,24 @@ export default {
</div>
<div
v-if="reality.isUnlocked"
class="c-stats-tab-subheader"
class="c-stats-tab-subheader c-stats-tab-general"
>
<div class="c-stats-tab-general c-stats-tab-reality">
Reality
<div :class="realityClassObject()">
{{ isDoomed ? "Doomed Reality" : "Reality" }}
</div>
<div>You have {{ quantifyInt("Reality", reality.count) }}.</div>
<div>Your fastest game-time Reality was {{ reality.best.toStringShort() }}.</div>
<div>Your fastest real-time Reality was {{ reality.bestReal.toStringShort() }}.</div>
<div>
You have spent
{{ reality.this.toStringShort() }} in this Reality. ({{ reality.thisReal.toStringShort() }} real time)
<div :class="{ 'c-stats-tab-doomed' : isDoomed }">
You have spent {{ reality.this.toStringShort() }}
in this {{ isDoomed ? "Armageddon" : "Reality" }}.
({{ reality.thisReal.toStringShort() }} real time)
</div>
<div
v-if="isDoomed"
class="c-stats-tab-doomed"
>
You have been Doomed for {{ realTimeDoomed.toStringShort() }} real time.
</div>
<div>
Your best Reality Machines per minute is {{ format(reality.bestRate, 2, 2) }}.
@ -302,4 +315,33 @@ export default {
.c-matter-scale-container {
height: 5rem;
}
.c-stats-tab-general {
color: var(--color-text);
}
.c-stats-tab-title {
font-size: 2rem;
font-weight: bold;
}
.c-stats-tab-subheader {
height: 15rem;
}
.c-stats-tab-infinity {
color: var(--color-infinity);
}
.c-stats-tab-eternity {
color: var(--color-eternity);
}
.c-stats-tab-reality {
color: var(--color-reality);
}
.c-stats-tab-doomed {
color: var(--color-pelle--base);
}
</style>

View File

@ -176,7 +176,7 @@ export const Pelle = {
get disabledAchievements() {
return [164, 156, 143, 142, 141, 137, 134, 133, 132, 126, 125, 118, 117, 116, 113, 111, 104, 103, 95, 93, 92, 91,
87, 85, 78, 76, 74, 65, 55, 54, 37];
87, 85, 78, 76, 74, 65, 55, 54, 37];
},
get uselessInfinityUpgrades() {
@ -193,7 +193,7 @@ export const Pelle = {
get uselessPerks() {
return [10, 12, 13, 14, 15, 16, 17, 30, 40, 41, 42, 43, 44, 45, 46, 51, 52,
53, 60, 61, 62, 80, 81, 82, 83, 100, 103, 104, 105, 106, 201, 202, 203, 204];
53, 60, 61, 62, 80, 81, 82, 83, 100, 103, 104, 105, 106, 201, 202, 203, 204];
},
get specialGlyphEffect() {

View File

@ -285,7 +285,7 @@ function giveRealityRewards(realityProps) {
updateRealityRecords(realityProps);
addRealityTime(
player.records.thisReality.time, player.records.thisReality.realTime, gainedRM,
realityProps.gainedGlyphLevel.actualLevel, realityAndPPMultiplier);
realityProps.gainedGlyphLevel.actualLevel, realityAndPPMultiplier, multiplier);
Currency.realities.add(realityAndPPMultiplier);
Currency.perkPoints.add(realityAndPPMultiplier);
if (TeresaUnlocks.effarig.canBeApplied) {

View File

@ -147,10 +147,7 @@ GameDatabase.celestials.v = {
{
id: 6,
name: "Requiem for a Glyph",
description: value => `Unlock Reality with at most ${formatInt(-value)} Glyphs equipped for the entire Reality.
<div ach-tooltip="Each equipped Cursed Glyph counts as ${formatInt(-3)} Glyphs">
<i class="fas fa-question-circle"></i>
</div>`,
description: value => `Unlock Reality with at most ${formatInt(-value)} Glyphs equipped for the entire Reality.`,
// This achievement has internally negated values since the check is always greater than
values: [1, 4, 7, 10, 13],
condition: () => V.isRunning && TimeStudy.reality.isBought,

View File

@ -786,7 +786,7 @@ GameDatabase.news = [
{
id: "a146",
text:
`How many licks does it take to get to the center of a antimatter tootsie pop? A whole lot, because unless
`How many licks does it take to get to the center of an antimatter tootsie pop? A whole lot, because unless
you're made out of antimatter too, you'll explode every time you try to lick it.`
},
{
@ -4612,7 +4612,7 @@ GameDatabase.news = [
},
{
id: "ai324",
text: "How many tickers does it take to get to the center of a antimatter, by counting the tickspeed upgrade and the upgrade itself?"
text: "How many tickers does it take to get to the center of an antimatter, by counting the tickspeed upgrade and the upgrade itself?"
},
{
id: "ai325",

View File

@ -250,8 +250,10 @@ export function getOfflineEPGain(ms) {
return player.records.bestEternity.bestEPminReality.times(TimeSpan.fromMilliseconds(ms).totalMinutes / 4);
}
// Note: realities and ampFactor must be distinct because there are a few things farther up which only multiply
// reality count and none of the other things
// eslint-disable-next-line max-params
export function addRealityTime(time, realTime, rm, level, realities) {
export function addRealityTime(time, realTime, rm, level, realities, ampFactor) {
let reality = "";
const celestials = [Teresa, Effarig, Enslaved, V, Ra, Laitela];
for (const cel of celestials) {
@ -259,8 +261,8 @@ export function addRealityTime(time, realTime, rm, level, realities) {
}
const shards = Effarig.shardsGained;
player.records.recentRealities.pop();
player.records.recentRealities.unshift([time, realTime, rm.times(realities), realities,
reality, level, shards * realities]);
player.records.recentRealities.unshift([time, realTime, rm.times(ampFactor),
realities, reality, level, shards * ampFactor]);
}
export function gainedInfinities() {