diff --git a/public/stylesheets/new-ui-styles.css b/public/stylesheets/new-ui-styles.css index e34cfaa05..0d927b336 100644 --- a/public/stylesheets/new-ui-styles.css +++ b/public/stylesheets/new-ui-styles.css @@ -12,7 +12,6 @@ --color-antimatter--bg: #df50504d; --color-infinity--bg: #b67f334d; --color-eternity--bg: #b341e04d; - --color-earth--bg: #37a4ba4d; } :root .t-s12 { @@ -38,14 +37,12 @@ --color-laitela--base: black; --color-laitela--accent: white; - - --color-earth: #37a4ba; } :root .t-metro, :root .t-inverted-metro, :root .t-s8 { - --color-antimatter--bg: rgba(117, 125, 132, 30%); + --color-antimatter--bg: rgba(33, 150, 243, 30%); } body.t-normal, @@ -269,10 +266,6 @@ body.t-s12 { border-left-color: var(--color-celestials); } -.o-tab-btn--earth::after { - border-left-color: var(--color-earth); -} - .tab-button.shop { background-color: #d9bb26; } @@ -427,16 +420,6 @@ body.t-s12 { border-top-color: var(--color-celestials); } -.o-tab-btn--earth .o-subtab__tooltip { - color: var(--color-earth); - background: var(--color-prestige--accent); - border-color: var(--color-earth); -} - -.o-tab-btn--earth .o-subtab__tooltip::after { - border-top-color: var(--color-earth); -} - .active { background-color: #2c2933; } @@ -842,9 +825,8 @@ body.t-s12 { } .c-modern-dim-tooltip-container .c-modern-dim-purchase-count-tooltip { - visibility: hidden; - width: 20rem; position: absolute; + width: 20rem; top: 50%; font-size: 1.3rem; line-height: 1.6rem; @@ -852,9 +834,10 @@ body.t-s12 { background: black; border: 0.1rem solid var(--color-text); border-radius: var(--var-border-width, 0.5rem); - padding: 0.5rem; /* Button is 25rem wide, tooltip is 20rem */ transform: translate(calc(-125% - 1rem), -50%); + padding: 0.5rem; + visibility: hidden; } .c-modern-dim-tooltip-container:hover .c-modern-dim-purchase-count-tooltip { @@ -864,11 +847,11 @@ body.t-s12 { .c-modern-dim-tooltip-container .c-modern-dim-purchase-count-tooltip::after { content: ""; position: absolute; - top: 50%; left: 100%; + top: 50%; border-top: 0.5rem solid transparent; - border-bottom: 0.5rem solid transparent; border-left: 0.5rem solid var(--color-text); + border-bottom: 0.5rem solid transparent; transform: translateY(-50%); } @@ -963,10 +946,6 @@ body.t-s12 { color: var(--color-eternity); } -.c-game-header__pp-amount { - color: var(--color-earth); -} - .t-normal .c-game-header__antimatter, .t-s12 .c-game-header__antimatter { color: var(--color-accent); diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css index 55ce034ee..36c87a8a3 100644 --- a/public/stylesheets/styles.css +++ b/public/stylesheets/styles.css @@ -104,8 +104,6 @@ html { --color-pelle--base: crimson; --color-pelle--secondary: #00bcd4; - - --color-earth: #37a4ba; } :root .t-metro, @@ -125,8 +123,6 @@ html { --color-reality: #3a823d; --color-reality-light: #d5ffd7; --color-celestials: #00bcd4; - - --color-earth: #37a4ba; } :root .t-dark { @@ -146,8 +142,6 @@ html { --color-laitela--base: black; --color-laitela--accent: white; - - --color-earth: #37a4ba; } :root .t-dark-metro { @@ -173,8 +167,6 @@ html { --color-laitela--base: black; --color-laitela--accent: white; - - --color-earth: #37a4ba; } :root .t-amoled { @@ -193,8 +185,6 @@ html { --color-laitela--base: black; --color-laitela--accent: white; - - --color-earth: #37a4ba; } :root .t-amoled-metro { @@ -217,8 +207,6 @@ html { --color-laitela--base: black; --color-laitela--accent: white; - - --color-earth: #37a4ba; } :root .t-s1 { @@ -268,8 +256,6 @@ html { --color-laitela--base: black; --color-laitela--accent: white; - - --color-earth: #37a4ba; } :root .t-s11 { @@ -286,8 +272,6 @@ html { --color-laitela--base: black; --color-laitela--accent: white; - - --color-earth: #37a4ba; } :root .s-base--metro { @@ -770,16 +754,6 @@ button:focus { background: var(--color-celestials); } -.o-tab-btn--earth { - color: var(--color-earth); - background-color: var(--color-prestige--accent); - border-color: var(--color-earth); -} - -.o-tab-btn--earth:hover { - background: var(--color-earth); -} - /* #endregion tab buttons */ #loading { @@ -2159,19 +2133,6 @@ br { /* #endregion Eternity */ -.o-planet-button { - font-weight: bold; - color: var(--color-earth); - background-color: var(--color-prestige--accent); - border-color: var(--color-earth); - cursor: pointer; -} - -.o-planet-button:hover { - color: black; - background-color: var(--color-earth); -} - /* #endregion Big Crunch */ /* #endregion o-prestige-btn */ @@ -2347,12 +2308,6 @@ br { /* #endregion EP Amount */ -/* #region PP Amount */ - -.c-game-header__pp-amount { - color: var(--color-earth); -} - /* #region c-game-header__antimatter */ .c-game-header__antimatter { @@ -2450,14 +2405,13 @@ br { } .c-dim-tooltip-container { - display: inline-block; position: relative; + display: inline-block; } .c-dim-tooltip-container .c-dim-purchase-count-tooltip { - visibility: hidden; - width: 20rem; position: absolute; + width: 20rem; top: 50%; font-size: 1.3rem; line-height: 1.6rem; @@ -2465,8 +2419,9 @@ br { background: black; border: 0.1rem solid var(--color-text); border-radius: var(--var-border-width, 0.5rem); - padding: 0.5rem; transform: translate(calc(-100% - 1.5rem), -50%); + padding: 0.5rem; + visibility: hidden; } .c-dim-tooltip-container:hover .c-dim-purchase-count-tooltip { @@ -2476,11 +2431,11 @@ br { .c-dim-tooltip-container .c-dim-purchase-count-tooltip::after { content: ""; position: absolute; - top: 50%; left: 100%; + top: 50%; border-top: 0.5rem solid transparent; - border-bottom: 0.5rem solid transparent; border-left: 0.5rem solid var(--color-text); + border-bottom: 0.5rem solid transparent; transform: translateY(-50%); } @@ -3256,6 +3211,7 @@ br { border-color: #388e3c; } + /* #endregion t-dark-metro */ /* #region t-metro t-inverted-metro t-s8 */ @@ -4625,11 +4581,11 @@ properly on certain themes. */ .l-replicanti-tab { display: flex; flex-direction: column; + color: var(--color-text); /* To prevent button jitter */ width: 100%; align-items: center; - color: var(--color-text); } /* #region c-replicanti-description */ @@ -5764,9 +5720,9 @@ kbd { } .o-notification--automator { - color: var(--color-automator-docs-font); background-color: var(--color-automator-active-line-background); border-color: var(--color-automator-active-line-outline); + color: var(--color-automator-docs-font); } .o-notification--strike { @@ -8605,8 +8561,8 @@ kbd { background: repeating-linear-gradient( -45deg, - #a2a229, - #a2a229 3rem, + #A2A229, + #A2A229 3rem, #919122 3rem, #919122 6rem ); @@ -8638,11 +8594,11 @@ kbd { .o-requirement-lock { position: absolute; font-size: 5rem; - opacity: 0.4; - color: black; padding: 0.5rem 1.8rem; - pointer-events: none; + color: black; + opacity: 0.4; user-select: none; + pointer-events: none; } .c-reality-upgrade-btn--black-hole-unlock { diff --git a/src/components/modals/prestige/PlanetsModal.vue b/src/components/modals/prestige/PlanetsModal.vue deleted file mode 100644 index bf37f054e..000000000 --- a/src/components/modals/prestige/PlanetsModal.vue +++ /dev/null @@ -1,37 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/tabs/earth/EarthTab.vue b/src/components/tabs/earth/EarthTab.vue deleted file mode 100644 index dca9f4303..000000000 --- a/src/components/tabs/earth/EarthTab.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Earth's tab - - - - \ No newline at end of file diff --git a/src/components/tabs/earth/MarsTab.vue b/src/components/tabs/earth/MarsTab.vue deleted file mode 100644 index 7868d31d9..000000000 --- a/src/components/tabs/earth/MarsTab.vue +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/components/tabs/earth/ModernSolarDimensionRow.vue b/src/components/tabs/earth/ModernSolarDimensionRow.vue deleted file mode 100644 index 5da9058f9..000000000 --- a/src/components/tabs/earth/ModernSolarDimensionRow.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - {{ buttonContents }} - - - Buy Max - - - - - - \ No newline at end of file diff --git a/src/components/tabs/earth/ModernSolarDimensionsTab.vue b/src/components/tabs/earth/ModernSolarDimensionsTab.vue deleted file mode 100644 index 2af624829..000000000 --- a/src/components/tabs/earth/ModernSolarDimensionsTab.vue +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - Max all - - - - - You have gained - {{ format(watts, 2, 1) }} Watts. - - - You are getting {{ format(wattsPerSecond, 2, 0) }} Watts per second. - - - - - - - \ No newline at end of file diff --git a/src/components/tabs/earth/VenusTab.vue b/src/components/tabs/earth/VenusTab.vue deleted file mode 100644 index 5893bfbe8..000000000 --- a/src/components/tabs/earth/VenusTab.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Venus' tab - - - - \ No newline at end of file diff --git a/src/components/tabs/index.js b/src/components/tabs/index.js index 2dfbb861e..a5c5b7b2e 100644 --- a/src/components/tabs/index.js +++ b/src/components/tabs/index.js @@ -7,7 +7,6 @@ import BlackHoleTab from "./black-hole/BlackHoleTab"; import BreakInfinityTab from "./break-infinity/BreakInfinityTab"; import CelestialNavigationTab from "./celestial-navigation/CelestialNavigationTab"; import ChallengeRecordsTab from "./challenge-records/ChallengeRecordsTab"; -import EarthTab from "./earth/EarthTab"; import EffarigTab from "./celestial-effarig/EffarigTab"; import EnslavedTab from "./celestial-enslaved/EnslavedTab"; import EternityChallengesTab from "./eternity-challenges/EternityChallengesTab"; @@ -20,7 +19,6 @@ import InfinityChallengesTab from "./infinity-challenges/InfinityChallengesTab"; import InfinityDimensionsTab from "./infinity-dimensions/InfinityDimensionsTab"; import InfinityUpgradesTab from "./infinity-upgrades/InfinityUpgradesTab"; import LaitelaTab from "./celestial-laitela/LaitelaTab"; -import MarsTab from "./earth/MarsTab"; import MultiplierBreakdownTab from "./statistics/MultiplierBreakdownTab"; import NormalAchievementsTab from "./normal-achievements/NormalAchievementsTab"; import NormalChallengesTab from "./normal-challenges/NormalChallengesTab"; @@ -42,7 +40,6 @@ import TeresaTab from "./celestial-teresa/TeresaTab"; import TimeDilationTab from "./time-dilation/TimeDilationTab"; import TimeDimensionsTab from "./time-dimensions/TimeDimensionsTab"; import TimeStudiesTab from "./time-studies/TimeStudiesTab"; -import VenusTab from "./earth/VenusTab"; import VTab from "./celestial-v/VTab"; const TabComponents = { @@ -87,10 +84,7 @@ const TabComponents = { AlchemyTab, CelestialNavigationTab, ShopTab, - MultiplierBreakdownTab, - VenusTab, - EarthTab, - MarsTab + MultiplierBreakdownTab }; export default TabComponents; diff --git a/src/components/ui-modes/classic/ClassicSubtabButton.vue b/src/components/ui-modes/classic/ClassicSubtabButton.vue index 77978512e..7f832bc73 100644 --- a/src/components/ui-modes/classic/ClassicSubtabButton.vue +++ b/src/components/ui-modes/classic/ClassicSubtabButton.vue @@ -28,8 +28,7 @@ export default { "o-tab-btn--infinity": this.parentName === "Infinity", "o-tab-btn--eternity": this.parentName === "Eternity", "o-tab-btn--reality": this.parentName === "Reality", - "o-tab-btn--celestial": this.parentName === "Celestials", - "o-tab-btn--earth": this.parentName === "Planets" + "o-tab-btn--celestial": this.parentName === "Celestials" }; }, }, diff --git a/src/components/ui-modes/modern/ModernTabButton.vue b/src/components/ui-modes/modern/ModernTabButton.vue index d204e9586..0aa649255 100644 --- a/src/components/ui-modes/modern/ModernTabButton.vue +++ b/src/components/ui-modes/modern/ModernTabButton.vue @@ -136,10 +136,6 @@ export default { background-color: var(--color-celestials); } -.o-tab-btn--earth::before { - background-color: var(--color-earth); -} - .o-subtab-btn--active { border-bottom-width: 0.5rem; } diff --git a/src/components/ui-modes/prestige-header/HeaderInfinityContainer.vue b/src/components/ui-modes/prestige-header/HeaderInfinityContainer.vue index 6ef1ea0b3..d2c8ebc25 100644 --- a/src/components/ui-modes/prestige-header/HeaderInfinityContainer.vue +++ b/src/components/ui-modes/prestige-header/HeaderInfinityContainer.vue @@ -1,18 +1,15 @@ - - - - Explore the planets for - {{ format(gainedPP, 2) }} - Planet {{ pluralize("Point", gainedPP) }} - - \ No newline at end of file diff --git a/src/core/cache.js b/src/core/cache.js index 3ec5e9f92..21a79bf0c 100644 --- a/src/core/cache.js +++ b/src/core/cache.js @@ -101,8 +101,6 @@ export const GameCache = { timeDimensionCommonMultiplier: new Lazy(() => timeDimensionCommonMultiplier()), - solarDimensionCommonMultiplier: new Lazy(() => solarDimensionCommonMultiplier()), - glyphInventorySpace: new Lazy(() => Glyphs.freeInventorySpace), glyphEffects: new Lazy(() => orderedEffectList.mapToObject(k => k, k => getAdjustedGlyphEffectUncached(k))), diff --git a/src/core/currency.js b/src/core/currency.js index bc04f983d..cb16d1ce7 100644 --- a/src/core/currency.js +++ b/src/core/currency.js @@ -477,13 +477,3 @@ Currency.galaxyGeneratorGalaxies = new class extends NumberCurrency { player.celestials.pelle.galaxyGenerator.spentGalaxies += spent; } }(); - -Currency.planetPoints = new class extends DecimalCurrency { - get value() { return player.planetPoints; } - set value(value) { player.planetPoints = value; } -}(); - -Currency.watts = new class extends DecimalCurrency { - get value() { return player.watts; } - set value(value) { player.watts = value; } -}(); \ No newline at end of file diff --git a/src/core/dimensions/solar-dimensions.js b/src/core/dimensions/solar-dimensions.js deleted file mode 100644 index d34eadfa7..000000000 --- a/src/core/dimensions/solar-dimensions.js +++ /dev/null @@ -1,183 +0,0 @@ -import { DC } from "../constants"; - -import { DimensionState } from "./dimension"; - -export function solarDimensionCommonMultiplier() { - return DC.D1; -} - -export function buySingleSolarDimension(tier) { - const dim = SolarDimension(tier); - if (Currency.planetPoints.lt(dim.cost)) return false; - - Currency.planetPoints.subtract(dim.cost); - dim.amount = dim.amount.plus(1); - dim.bought++; - dim.cost = dim.nextCost(dim.bought); - return true; -} - -export function buyMaxSolarDimension(tier, portionToSpend = 1) { - const dim = SolarDimension(tier); - const points = Currency.planetPoints.value.times(portionToSpend); - - if (points.lt(dim.cost)) return false; - - const bulk = bulkBuyBinarySearch(points, { - costFunction: bought => dim.nextCost(bought), - cumulative: true, - firstCost: dim.cost - }, dim.bought); - - if (!bulk) return false; - - Currency.planetPoints.subtract(bulk.purchasePrice); - dim.amount = dim.amount.plus(bulk.quantity); - dim.bought += bulk.quantity; - dim.cost = dim.nextCost(dim.bought); - return true; -} - -export function maxAllSolarDimensions() { - // Try to buy single from the highest affordable new dimensions - for (let i = 8; i > 0 && SolarDimension(i).bought === 0; i--) { - buySingleSolarDimension(i); - } - - // Buy everything costing less than 1% of initial EP - for (let i = 8; i > 0; i--) { - buyMaxSolarDimension(i, 0.01); - } - - // Loop buying the cheapest dimension possible; explicit infinite loops make me nervous - const unlockedDimensions = SolarDimensions.all.filter(d => d.isUnlocked); - for (let stop = 0; stop < 1000; stop++) { - const cheapestDim = unlockedDimensions.reduce((a, b) => (b.cost.gte(a.cost) ? a : b)); - if (!buySingleSolarDimension(cheapestDim.tier, true)) break; - } -} - -export function fullResetSolarDimensions() { - for (const dim of SolarDimensions.all) { - dim.cost = new Decimal(dim.baseCost); - dim.amount = DC.D0; - dim.bought = 0; - } - player.watts = new Decimal(0); -} - -class SolarDimensionState extends DimensionState { - constructor(tier) { - super(() => player.dimensions.solar, tier); - const BASE_COSTS = [null, DC.D1, DC.D5, DC.E3, DC.E10, DC.E100, DC.E1000, DC.E5000, DC.E10000]; - this._baseCost = BASE_COSTS[tier]; - const BASE_COST_MULTIPLIERS = [null, DC.D2, DC.D5, DC.E3, DC.E10, DC.E100, DC.E1000, DC.E5000, DC.E10000]; - this._baseCostMultiplier = BASE_COST_MULTIPLIERS[tier]; - } - - get cost() { return this.data.cost; } - set cost(value) { this.data.cost = value; } - - nextCost(bought) { - return Decimal.pow(this._baseCostMultiplier, bought).times(this.baseCost); - } - - get isUnlocked() { - return true; - } - - get isAffordable() { - return Currency.planetPoints.gte(this.cost); - } - - get isAvailableForPurchase() { - return this.isAffordable; - } - - get multiplier() { - const tier = this._tier; - - const dim = SolarDimension(tier); - const bought = tier === 8 ? Math.clampMax(dim.bought, 1e8) : dim.bought; - return GameCache.solarDimensionCommonMultiplier.value.times(Decimal.pow(dim.powerMultiplier, bought)); - } - - get productionPerSecond() { - return this.amount.times(this.multiplier); - } - - get rateOfChange() { - const tier = this._tier; - if (tier === 8) { - return DC.D0; - } - const toGain = SolarDimension(tier + 1).productionPerSecond; - const current = Decimal.max(this.amount, 1); - return toGain.times(10).dividedBy(current); - } - - get isProducting() { - return this.amount.gt(0); - } - - get baseCost() { - return this._baseCost; - } - - get costMultiplier() { - return this._costMultiplier; - } - - get baseAmount() { - return this.data.baseAmount; - } - - set baseAmount(value) { - this.data.baseAmount = value; - } - - get powerMultiplier() { - return DC.D4; - } -} - -export const SolarDimension = SolarDimensionState.createAccessor(); - -export const SolarDimensions = { - all: SolarDimension.index.compact(), - canBuy() { - return true; - }, - tick(diff) { - for (let tier = 8; tier > 1; tier--) { - SolarDimension(tier).produceDimensions(SolarDimension(tier - 1), diff / 10); - } - - SolarDimension(1).produceCurrency(Currency.watts, diff); - }, - buySingle() { - if (!this.isAvailableForPurchase) return false; - Currency.planetPoints.purchase(this.cost); - this.cost = dim.nextCost(dim.bought); - this.amount = this.amount.plus(1); - - return true; - }, - buyMax() { - if (!this.isAvailableForPurchase) return false; - - const costScaling = new LinearCostScaling( - Currency.planetPoints.value, - this.cost, - this.costMultiplier - ); - - if (costScaling.purchases <= 0) return false; - - Currency.planetPoints.purchase(costScaling.totalCost); - this.cost = this.cost.times(costScaling.totalCostMultiplier); - this.amount = this.amount.plus(costScaling.purchases); - - return true; - } -}; \ No newline at end of file diff --git a/src/core/globals.js b/src/core/globals.js index f4a5a8702..014784dd1 100644 --- a/src/core/globals.js +++ b/src/core/globals.js @@ -61,7 +61,6 @@ export * from "./tickspeed"; export * from "./dimensions/antimatter-dimension"; export * from "./dimensions/infinity-dimension"; export * from "./dimensions/time-dimension"; -export * from "./dimensions/solar-dimensions"; export * from "./time-studies"; @@ -74,7 +73,6 @@ export * from "./normal-challenges"; export * from "./infinity-challenges"; export * from "./eternity"; export * from "./eternity-challenge"; -export * from "./planets"; export * from "./reality"; export * from "./replicanti"; export * from "./time-theorems"; diff --git a/src/core/modal.js b/src/core/modal.js index 0bfe94f92..292f2850e 100644 --- a/src/core/modal.js +++ b/src/core/modal.js @@ -21,7 +21,6 @@ import HardResetModal from "@/components/modals/prestige/HardResetModal"; import RealityModal from "@/components/modals/prestige/RealityModal"; import ReplicantiGalaxyModal from "@/components/modals/prestige/ReplicantiGalaxyModal"; import ResetRealityModal from "@/components/modals/prestige/ResetRealityModal"; -import PlanetsModal from "@/components/modals/prestige/PlanetsModal"; import AnimationOptionsModal from "@/components/modals/options/AnimationOptionsModal"; import AwayProgressOptionsModal from "@/components/modals/options/AwayProgressOptionsModal"; @@ -218,7 +217,6 @@ Modal.enterSpeedrun = new Modal(SpeedrunModeModal); Modal.modifySeed = new Modal(ModifySeedModal); Modal.changeName = new Modal(ChangeNameModal); Modal.armageddon = new Modal(ArmageddonModal, 1); -Modal.planets = new Modal(PlanetsModal, 1); Modal.confirmationOptions = new Modal(ConfirmationOptionsModal); Modal.infoDisplayOptions = new Modal(InfoDisplayOptionsModal); diff --git a/src/core/planets.js b/src/core/planets.js deleted file mode 100644 index 1d04bf2ad..000000000 --- a/src/core/planets.js +++ /dev/null @@ -1,15 +0,0 @@ -export function planetResetRequest() { - askPlanetConfirmation(); -} - -function askPlanetConfirmation() { - if (player.options.confirmations.planets) { - Modal.planets.show(); - } else { - planetsReset(); - } -} - -export function planetsReset() { - console.log("Nice button nerd"); -} \ No newline at end of file diff --git a/src/core/player.js b/src/core/player.js index 38d38fe21..5193ed1ff 100644 --- a/src/core/player.js +++ b/src/core/player.js @@ -27,11 +27,6 @@ window.player = { cost: [DC.D1, DC.D5, DC.E2, DC.E3, DC.E2350, DC.E2650, DC.E3000, DC.E3350][tier], amount: DC.D0, bought: 0 - })), - solar: Array.range(0, 8).map(tier => ({ - cost: [DC.D1, DC.D5, DC.E3, DC.E10, DC.E100, DC.E1000, DC.E5000, DC.E10000][tier], - amount: DC.D0, - bought: 0 })) }, buyUntil10: true, @@ -764,16 +759,6 @@ window.player = { showBought: false, } }, - planetPoints: DC.D0, - watts: DC.D0, - planets: { - earth: { - unlocked: false - }, - mars: { - unlocked: false - } - }, isGameEnd: false, tabNotifications: new Set(), triggeredTabNotificationBits: 0, @@ -874,8 +859,7 @@ window.player = { antimatterGalaxy: true, dimensionBoost: true, switchAutomatorMode: true, - respecIAP: true, - planets: true, + respecIAP: true }, awayProgress: { antimatter: true, diff --git a/src/core/secret-formula/tabs.js b/src/core/secret-formula/tabs.js index a3ae01f16..376688d56 100644 --- a/src/core/secret-formula/tabs.js +++ b/src/core/secret-formula/tabs.js @@ -496,40 +496,5 @@ export const tabs = [ hidable: true } ] - }, - { - key: "planets", - name: "Planets", - hideAt: 1.9, - UIClass: "o-tab-btn--earth", - condition: () => true, - id: 11, - hidable: true, - subtabs: [ - { - key: "venus", - name: "Venus, Bringer of Peace", - symbol: "*", - component: "VenusTab", - id: 2, - hidable: true - }, - { - key: "earth", - name: "Earth", - symbol: "%", - component: "EarthTab", - id: 0, - hidable: true - }, - { - key: "mars", - name: "Mars, Bringer of War", - symbol: "?", - component: "MarsTab", - id: 1, - hidable: true - } - ] } ]; diff --git a/src/core/tabs.js b/src/core/tabs.js index 07f01f386..7e8b144cf 100644 --- a/src/core/tabs.js +++ b/src/core/tabs.js @@ -206,8 +206,7 @@ export const Tabs = (function() { Tab.eternity, Tab.reality, Tab.celestials, - Tab.shop, - Tab.planets + Tab.shop ], newUI: [ Tab.dimensions, @@ -220,8 +219,7 @@ export const Tabs = (function() { Tab.achievements, Tab.statistics, Tab.options, - Tab.shop, - Tab.planets + Tab.shop ], get currentUIFormat() { return ui.view.newUI ? this.newUI : this.oldUI; diff --git a/src/game.js b/src/game.js index bcfd0f717..791b2e092 100644 --- a/src/game.js +++ b/src/game.js @@ -170,10 +170,6 @@ export function gainedGlyphLevel() { }; } -export function gainedPlanetPoints() { - return new Decimal(1); -} - export function resetChallengeStuff() { player.chall2Pow = 1; player.chall3Pow = DC.D0_01; @@ -402,8 +398,6 @@ export function realTimeMechanics(realDiff) { DarkMatterDimensions.tick(realDiff); - SolarDimensions.tick(realDiff); - // When storing real time, skip everything else having to do with production once stats are updated if (Enslaved.isStoringRealTime) { player.records.realTimePlayed += realDiff; @@ -489,7 +483,6 @@ export function gameLoop(passDiff, options = {}) { GameCache.antimatterDimensionFinalMultipliers.invalidate(); GameCache.infinityDimensionCommonMultiplier.invalidate(); GameCache.timeDimensionCommonMultiplier.invalidate(); - GameCache.solarDimensionCommonMultiplier.invalidate(); GameCache.totalIPMult.invalidate(); const blackHoleDiff = realDiff;
- You have gained - {{ format(watts, 2, 1) }} Watts. -