From f9763a93f1391432c475206e38beede0b2e87ecf Mon Sep 17 00:00:00 2001 From: HexaVault <44529573+HexaVault@users.noreply.github.com> Date: Thu, 31 Oct 2024 21:49:30 +0000 Subject: [PATCH 01/37] guess which dumbass forgot to test his code (me) --- .../tabs/antimatter-dimensions/ClassicAntimatterGalaxyRow.vue | 4 ++-- .../antimatter-dimensions/ModernAntimatterDimensionsTab.vue | 3 ++- .../tabs/antimatter-dimensions/ModernAntimatterGalaxyRow.vue | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/tabs/antimatter-dimensions/ClassicAntimatterGalaxyRow.vue b/src/components/tabs/antimatter-dimensions/ClassicAntimatterGalaxyRow.vue index e0d72c6bad..a2700b090a 100644 --- a/src/components/tabs/antimatter-dimensions/ClassicAntimatterGalaxyRow.vue +++ b/src/components/tabs/antimatter-dimensions/ClassicAntimatterGalaxyRow.vue @@ -39,8 +39,8 @@ export default { buttonText() { if (this.lockText !== null) return this.lockText; const reset = []; - if (!Achievement(111).isUnlocked) reset.push("Dimensions"); - if (!Achievement(143).isUnlocked) reset.push("Dimension Boosts"); + if (!Achievement(111).isEffectActive) reset.push("Dimensions"); + if (!Achievement(143).isEffectActive) reset.push("Dimension Boosts"); return reset.length === 0 ? `Increase the power of Tickspeed upgrades` : `Reset your ${makeEnumeration(reset)} to increase the power of Tickspeed upgrades`; diff --git a/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionsTab.vue b/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionsTab.vue index a39f8d89ee..36912318bf 100644 --- a/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionsTab.vue +++ b/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionsTab.vue @@ -86,7 +86,8 @@ export default { this.multiplierText = `Buy 10 Dimension purchase multiplier: ${formatX(this.buy10Mult, 2, 2)}`; if (!isSacrificeUnlocked) return; - this.isFullyAutomated = Autobuyer.sacrifice.isActive && Achievement(118).isUnlocked; + this.isFullyAutomated = Autobuyer.sacrifice.isActive && Achievement(118).isEffectActive && + (Sacrifice.canSacrifice || Sacrifice.disabledText === `${formatX(1)} multiplier`); this.isSacrificeAffordable = Sacrifice.canSacrifice && !this.isFullyAutomated; this.currentSacrifice.copyFrom(Sacrifice.totalBoost); this.sacrificeBoost.copyFrom(Sacrifice.nextBoost); diff --git a/src/components/tabs/antimatter-dimensions/ModernAntimatterGalaxyRow.vue b/src/components/tabs/antimatter-dimensions/ModernAntimatterGalaxyRow.vue index 8c53294b03..593b141fa5 100644 --- a/src/components/tabs/antimatter-dimensions/ModernAntimatterGalaxyRow.vue +++ b/src/components/tabs/antimatter-dimensions/ModernAntimatterGalaxyRow.vue @@ -34,8 +34,8 @@ export default { buttonText() { if (this.lockText !== null) return this.lockText; const reset = []; - if (!Achievement(111).isUnlocked) reset.push("Dimensions"); - if (!Achievement(143).isUnlocked) reset.push("Dimension Boosts"); + if (!Achievement(111).isEffectActive) reset.push("Dimensions"); + if (!Achievement(143).isEffectActive) reset.push("Dimension Boosts"); return reset.length === 0 ? `Increase the power of Tickspeed upgrades` : `Reset your ${makeEnumeration(reset)} to increase the power of Tickspeed upgrades`; From 10d31b4ffae675de533e7d46b698402adedafd3d Mon Sep 17 00:00:00 2001 From: HexaVault <44529573+HexaVault@users.noreply.github.com> Date: Sat, 2 Nov 2024 15:07:08 +0000 Subject: [PATCH 02/37] fix r143 reward desc --- src/core/secret-formula/achievements/normal-achievements.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/secret-formula/achievements/normal-achievements.js b/src/core/secret-formula/achievements/normal-achievements.js index 6e7b033ad2..624e762101 100644 --- a/src/core/secret-formula/achievements/normal-achievements.js +++ b/src/core/secret-formula/achievements/normal-achievements.js @@ -1059,7 +1059,7 @@ export const normalAchievements = [ return true; }, checkEvent: GAME_EVENT.ETERNITY_RESET_AFTER, - reward: "Galaxies no longer reset Dimension Boosts." + reward: "Antimatter Galaxies no longer reset Dimension Boosts." }, { id: 144, From 710f195c8127dd778ce482f8965a3cc11a56369b Mon Sep 17 00:00:00 2001 From: HexaVault <44529573+HexaVault@users.noreply.github.com> Date: Sun, 16 Mar 2025 11:11:24 +0000 Subject: [PATCH 03/37] Fix 2x IP not quite being right If you manually purchase, you can only get 1 shy of 3.3 million purchases. This means you don't trigger the ee6 and miss out on about e7000x to IP, which isn't much but still --- src/core/secret-formula/infinity/infinity-upgrades.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/secret-formula/infinity/infinity-upgrades.js b/src/core/secret-formula/infinity/infinity-upgrades.js index 74341c10fb..0fac2da79d 100644 --- a/src/core/secret-formula/infinity/infinity-upgrades.js +++ b/src/core/secret-formula/infinity/infinity-upgrades.js @@ -225,7 +225,7 @@ export const infinityUpgrades = { description: () => `Multiply Infinity Points from all sources by ${formatX(2)}`, // Normally the multiplier caps at e993k or so with 3300000 purchases, but if the cost is capped then we just give // an extra e7k to make the multiplier look nice - effect: () => (player.IPMultPurchases >= 3300000 ? DC.E1E6 : DC.D2.pow(player.IPMultPurchases)), + effect: () => (player.IPMultPurchases >= 3299999 ? DC.E1E6 : DC.D2.pow(player.IPMultPurchases)), cap: () => Effarig.eternityCap ?? DC.E1E6, formatEffect: value => formatX(value, 2, 2), } From 06f69513100ceefe19ab97c7ab4dc71efb456a81 Mon Sep 17 00:00:00 2001 From: HexaVault <44529573+HexaVault@users.noreply.github.com> Date: Sun, 16 Mar 2025 11:23:06 +0000 Subject: [PATCH 04/37] Fix prestige runs container changes 2e404 -> 2.00e404 and 1 Realities -> 1.1 Realities (yes we were doing 0 decimal places idk why) --- .../tabs/past-prestige-runs/PastPrestigeRunsContainer.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/tabs/past-prestige-runs/PastPrestigeRunsContainer.vue b/src/components/tabs/past-prestige-runs/PastPrestigeRunsContainer.vue index 51bbefdb78..b392ef8cd1 100644 --- a/src/components/tabs/past-prestige-runs/PastPrestigeRunsContainer.vue +++ b/src/components/tabs/past-prestige-runs/PastPrestigeRunsContainer.vue @@ -169,7 +169,7 @@ export default { return `${format(run[2], 2)} ${this.points}`; }, prestigeCountGain(run) { - return quantify(this.singular, run[3]); + return quantify(this.singular, run[3], 2, 1); }, prestigeCurrencyRate(run) { if (this.hasIM && this.layer.name === "Reality") return "N/A"; @@ -302,4 +302,4 @@ export default { .l-no-records { height: 5.4rem; } - \ No newline at end of file + From d97f8d271dfaf97fb067354ddfa076bd4047044f Mon Sep 17 00:00:00 2001 From: HexaVault <44529573+HexaVault@users.noreply.github.com> Date: Sun, 16 Mar 2025 11:28:39 +0000 Subject: [PATCH 05/37] Fix contrast colors not working sometimes On potential glyphs, the x% uses (what i presume is) the old color code, and so wont swap with contrast colors. --- src/components/modals/GlyphShowcasePanelEntry.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/modals/GlyphShowcasePanelEntry.vue b/src/components/modals/GlyphShowcasePanelEntry.vue index 0a9489084a..2bc94c3766 100644 --- a/src/components/modals/GlyphShowcasePanelEntry.vue +++ b/src/components/modals/GlyphShowcasePanelEntry.vue @@ -83,7 +83,7 @@ export default { // Rarity is handled differently here than usual because this is in contrast with the theme BG, not the glyph BG const color = CosmeticGlyphTypes[this.glyph.type].ignoreRarityColor ? GlyphAppearanceHandler.getBorderColor(this.type) - : getRarity(this.glyph.strength)[Theme.current().isDark() ? "darkColor" : "lightColor"]; + : GlyphAppearanceHandler.getRarityColor(this.glyph.strength, this.type); return { color, "font-weight": "bold" From 902e87c36771b5fe126dce02d9c1073560988def Mon Sep 17 00:00:00 2001 From: HexaVault <44529573+HexaVault@users.noreply.github.com> Date: Sun, 16 Mar 2025 11:32:09 +0000 Subject: [PATCH 06/37] add comment Add comment as to why we dont contrast (tl;dr pointless) --- src/components/modals/GlyphShowcasePanelEntry.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/modals/GlyphShowcasePanelEntry.vue b/src/components/modals/GlyphShowcasePanelEntry.vue index 2bc94c3766..6d857583ed 100644 --- a/src/components/modals/GlyphShowcasePanelEntry.vue +++ b/src/components/modals/GlyphShowcasePanelEntry.vue @@ -80,7 +80,7 @@ export default { }; }, rarityStyle() { - // Rarity is handled differently here than usual because this is in contrast with the theme BG, not the glyph BG + // Glyph colors were dealt to contrast the background, but that should never be an issue const color = CosmeticGlyphTypes[this.glyph.type].ignoreRarityColor ? GlyphAppearanceHandler.getBorderColor(this.type) : GlyphAppearanceHandler.getRarityColor(this.glyph.strength, this.type); From e32a3dfbad6851218bc82d240acb3fadcf27f67b Mon Sep 17 00:00:00 2001 From: HexaVault <44529573+HexaVault@users.noreply.github.com> Date: Mon, 5 May 2025 14:25:26 +0100 Subject: [PATCH 07/37] swap two conditions around --- .../antimatter-dimensions/ModernAntimatterDimensionsTab.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionsTab.vue b/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionsTab.vue index 36912318bf..78dff20aad 100644 --- a/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionsTab.vue +++ b/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionsTab.vue @@ -117,10 +117,10 @@ export default { class="o-primary-btn--sacrifice" @click="sacrifice" > - Dimensional Sacrifice ({{ formatX(sacrificeBoost, 2, 2) }}) - + Dimensional Sacrifice is Automated (Achievement 118) + Dimensional Sacrifice ({{ formatX(sacrificeBoost, 2, 2) }}) Dimensional Sacrifice Disabled ({{ disabledCondition }})