diff --git a/src/components/modals/GlyphShowcasePanelEntry.vue b/src/components/modals/GlyphShowcasePanelEntry.vue index 0a9489084a..6d857583ed 100644 --- a/src/components/modals/GlyphShowcasePanelEntry.vue +++ b/src/components/modals/GlyphShowcasePanelEntry.vue @@ -80,10 +80,10 @@ 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) - : getRarity(this.glyph.strength)[Theme.current().isDark() ? "darkColor" : "lightColor"]; + : GlyphAppearanceHandler.getRarityColor(this.glyph.strength, this.type); return { color, "font-weight": "bold" 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..71f2f4ec5b 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); @@ -116,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 }})