From 5e361f956a12052ab21ae46894afb89ca45490ac Mon Sep 17 00:00:00 2001 From: SpectralFlame <4493131+cyip92@users.noreply.github.com> Date: Mon, 28 Aug 2023 14:31:48 -0500 Subject: [PATCH] Fix poor/inconsistent text and styling --- public/stylesheets/theme-AMOLED Metro.css | 1 + public/stylesheets/theme-AMOLED.css | 1 + src/components/tabs/replicanti/ReplicantiTab.vue | 2 +- src/core/secret-formula/discord-rich-presence.js | 12 ++++++++---- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/public/stylesheets/theme-AMOLED Metro.css b/public/stylesheets/theme-AMOLED Metro.css index 2640f1a58..eb34c9a30 100644 --- a/public/stylesheets/theme-AMOLED Metro.css +++ b/public/stylesheets/theme-AMOLED Metro.css @@ -31,6 +31,7 @@ input.t-amoled-metro { } .t-amoled-metro .c-tt-buy-button--locked:hover { + color: black; background: var(--color-bad); border: 0.1rem solid var(--color-bad); } diff --git a/public/stylesheets/theme-AMOLED.css b/public/stylesheets/theme-AMOLED.css index c26d87463..86e4ea041 100644 --- a/public/stylesheets/theme-AMOLED.css +++ b/public/stylesheets/theme-AMOLED.css @@ -31,6 +31,7 @@ input.t-amoled { } .t-amoled .c-tt-buy-button--locked:hover { + color: black; background: var(--color-bad); border: 0.1rem solid var(--color-bad); } diff --git a/src/components/tabs/replicanti/ReplicantiTab.vue b/src/components/tabs/replicanti/ReplicantiTab.vue index 660b4e976..ae66cb3f7 100644 --- a/src/components/tabs/replicanti/ReplicantiTab.vue +++ b/src/components/tabs/replicanti/ReplicantiTab.vue @@ -120,7 +120,7 @@ export default { toMaxTooltip() { if (this.amount.lte(this.replicantiCap)) return null; return this.estimateToMax.lt(0.01) - ? "Currently increasing" + ? "Currently Increasing" : TimeSpan.fromSeconds(this.estimateToMax.toNumber()).toStringShort(); } }, diff --git a/src/core/secret-formula/discord-rich-presence.js b/src/core/secret-formula/discord-rich-presence.js index 7383f71ad..ac0fa7bce 100644 --- a/src/core/secret-formula/discord-rich-presence.js +++ b/src/core/secret-formula/discord-rich-presence.js @@ -164,7 +164,8 @@ export const discordRichPresence = { hasReached: () => player.eternityChalls.eterc1 > 0, mainResource: () => `${format(player.eternityPoints, 2)} EP`, resourceList: [ - () => quantify("EC completion", Object.values(player.eternityChalls).reduce((sum, c) => sum + c, 0), 0, 0, formatInt) + () => quantify("EC completion", + Object.values(player.eternityChalls).reduce((sum, c) => sum + c, 0), 0, 0, formatInt) ] }, { @@ -230,7 +231,8 @@ export const discordRichPresence = { // Imaginary Machines unlocked name: () => Ra.displayName, hasReached: () => MachineHandler.isIMUnlocked, - mainResource: () => `${formatMachines(player.reality.realityMachines, player.reality.imaginaryMachines)} RM`, + mainResource: () => + `${format(player.reality.realityMachines)} RM + ${format(player.reality.imaginaryMachines, 2)} iM`, resourceList: [ () => `Best GL: ${formatInt(player.records.bestReality.glyphLevel)}`, () => `Ra Levels: ${Ra.pets.all.map(p => formatInt(p.level)).join("/")}` @@ -239,13 +241,15 @@ export const discordRichPresence = { { name: () => Laitela.displayName, hasReached: () => Laitela.isUnlocked, - mainResource: () => `${formatMachines(player.reality.realityMachines, player.reality.imaginaryMachines)} RM`, + mainResource: () => + `${format(player.reality.realityMachines)} RM + ${format(player.reality.imaginaryMachines, 2)} iM`, resourceList: [ () => `Best GL: ${formatInt(player.records.bestReality.glyphLevel)}`, () => quantify("Singularity", player.celestials.laitela.singularities, 2, 0, format)], }, { - // We can't use celestial displayName here like the others because that will cause the text scramble to get put on DRP + // We can't use celestial displayName here like the others because that will cause + // the text scramble to get put on DRP name: "Pelle", hasReached: () => Pelle.isDoomed, mainResource: () => quantify("Reality Shard", player.celestials.pelle.realityShards, 2),