From 5f16b7bc9985954805d6857649eec4828d21caaf Mon Sep 17 00:00:00 2001 From: SpectralFlame <4493131+cyip92@users.noreply.github.com> Date: Mon, 13 Mar 2023 08:18:07 -0500 Subject: [PATCH] More text and styling improvements --- public/stylesheets/styles.css | 23 ---- .../antimatter-dimensions/TickspeedRow.vue | 8 +- src/components/tabs/celestial-v/VTab.vue | 2 + .../tabs/statistics/StatisticsTab.vue | 118 ++++++++++++------ src/core/celestials/pelle/pelle.js | 4 +- src/core/reality.js | 2 +- src/core/secret-formula/celestials/v.js | 5 +- src/core/secret-formula/news.js | 4 +- src/game.js | 8 +- 9 files changed, 99 insertions(+), 75 deletions(-) diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css index 4cc5760a4..b01a750e2 100644 --- a/public/stylesheets/styles.css +++ b/public/stylesheets/styles.css @@ -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 */ diff --git a/src/components/tabs/antimatter-dimensions/TickspeedRow.vue b/src/components/tabs/antimatter-dimensions/TickspeedRow.vue index c06551170..a1fdd132b 100644 --- a/src/components/tabs/antimatter-dimensions/TickspeedRow.vue +++ b/src/components/tabs/antimatter-dimensions/TickspeedRow.vue @@ -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 { Tickspeed Continuum: {{ continuumString }} + + Tickspeed Unpurchasable (EC 9) + Tickspeed Cost: {{ format(cost) }} diff --git a/src/components/tabs/celestial-v/VTab.vue b/src/components/tabs/celestial-v/VTab.vue index 93a07dfcf..5af11ca2f 100644 --- a/src/components/tabs/celestial-v/VTab.vue +++ b/src/components/tabs/celestial-v/VTab.vue @@ -194,6 +194,8 @@ export default {
Cursed Glyphs can be created in the Effarig tab.
+ Cursed Glyphs count as {{ formatInt(-3) }} Glyphs for the purposes of all requirements related to Glyph count. +
The Black Hole can now be used to slow down time if they are both permanent.

Each Hard V-Achievement counts as two V-Achievements and will award {{ formatInt(2) }} Space Theorems diff --git a/src/components/tabs/statistics/StatisticsTab.vue b/src/components/tabs/statistics/StatisticsTab.vue index 9619916a9..de3db0da2 100644 --- a/src/components/tabs/statistics/StatisticsTab.vue +++ b/src/components/tabs/statistics/StatisticsTab.vue @@ -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 { View Content Summary -
+
General
-
You have made a total of {{ format(totalAntimatter, 2, 1) }} antimatter.
-
You have played for {{ realTimePlayed }}. (real time)
-
- Your existence has spanned {{ reality.totalTimePlayed }} of time. (game time) -
-
- You have been doomed for {{ realTimeDoomed }}. (real time) -
-
- You have seen {{ quantifyInt("news message", totalNews) }} in total. -
-
- You have seen {{ quantifyInt("unique news message", uniqueNews) }}. -
-
- You have unlocked {{ quantifyInt("Secret Achievement", secretAchievementCount) }}. -
-
- You have {{ quantifyInt("useless paperclip", paperclips) }}. -
-
-
- - You have completed the entire game {{ quantifyInt("time", fullGameCompletions) }}. +
+
You have made a total of {{ format(totalAntimatter, 2, 1) }} antimatter.
+
You have played for {{ realTimePlayed }}. (real time)
+
+ Your existence has spanned {{ reality.totalTimePlayed }} of time. (game time) +
+
+ You have seen {{ quantifyInt("news message", totalNews) }} in total. +
+
+ You have seen {{ quantifyInt("unique news message", uniqueNews) }}. +
+
+ You have unlocked {{ quantifyInt("Secret Achievement", secretAchievementCount) }}. +
+
+ You have {{ quantifyInt("useless paperclip", paperclips) }}. +
+

- You have played for {{ fullTimePlayed }} across all playthroughs. - + + You have completed the entire game {{ quantifyInt("time", fullGameCompletions) }}. +
+ You have played for {{ fullTimePlayed }} across all playthroughs. + +

-
+
-
+
Infinity
@@ -240,9 +246,9 @@ export default {
-
+
Eternity
@@ -277,17 +283,24 @@ export default {
-
- Reality +
+ {{ isDoomed ? "Doomed Reality" : "Reality" }}
You have {{ quantifyInt("Reality", reality.count) }}.
Your fastest game-time Reality was {{ reality.best.toStringShort() }}.
Your fastest real-time Reality was {{ reality.bestReal.toStringShort() }}.
-
- You have spent - {{ reality.this.toStringShort() }} in this Reality. ({{ reality.thisReal.toStringShort() }} real time) +
+ You have spent {{ reality.this.toStringShort() }} + in this {{ isDoomed ? "Armageddon" : "Reality" }}. + ({{ reality.thisReal.toStringShort() }} real time) +
+
+ You have been Doomed for {{ realTimeDoomed.toStringShort() }} real time.
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); +} \ No newline at end of file diff --git a/src/core/celestials/pelle/pelle.js b/src/core/celestials/pelle/pelle.js index 3da6ca0d0..4cb60685a 100644 --- a/src/core/celestials/pelle/pelle.js +++ b/src/core/celestials/pelle/pelle.js @@ -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() { diff --git a/src/core/reality.js b/src/core/reality.js index 72f524b55..62469fe76 100644 --- a/src/core/reality.js +++ b/src/core/reality.js @@ -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) { diff --git a/src/core/secret-formula/celestials/v.js b/src/core/secret-formula/celestials/v.js index 176ff2296..590bac4ef 100644 --- a/src/core/secret-formula/celestials/v.js +++ b/src/core/secret-formula/celestials/v.js @@ -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. -
- -
`, + 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, diff --git a/src/core/secret-formula/news.js b/src/core/secret-formula/news.js index 63e639fd7..d60957be1 100644 --- a/src/core/secret-formula/news.js +++ b/src/core/secret-formula/news.js @@ -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", diff --git a/src/game.js b/src/game.js index 676c3e4f4..d3677ce9e 100644 --- a/src/game.js +++ b/src/game.js @@ -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() {