diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css index 0f46caa5e..932083926 100644 --- a/public/stylesheets/styles.css +++ b/public/stylesheets/styles.css @@ -5523,18 +5523,6 @@ properly on certain themes. */ margin-bottom: 1rem; } -.c-modal-away-progress__resources div { - min-width: 55rem; - border-bottom: 0.1rem solid var(--color-text); - margin-bottom: 0.2rem; - padding-bottom: 0.2rem; - cursor: pointer; -} - -.c-modal-away-progress__resources div:last-child { - border: none; -} - .c-modal-away-progress b { font-weight: bold; text-shadow: @@ -5544,127 +5532,6 @@ properly on certain themes. */ 0 0 0.3rem black; } -.c-modal-away-progress__dimension-boosts, -.c-modal-away-progress__antimatter-galaxies, -.c-modal-away-progress__antimatter { - color: var(--color-antimatter); -} - -.t-dark .c-modal-away-progress__antimatter, -.t-s6 .c-modal-away-progress__antimatter, -.t-s10 .c-modal-away-progress__antimatter { - animation: a-game-header__antimatter--glow 25s infinite; -} - -.c-modal-away-progress__infinities, -.c-modal-away-progress__infinity-points { - color: var(--color-infinity); -} - -.c-modal-away-progress__eternities, -.c-modal-away-progress__eternity-points { - color: var(--color-eternity); -} - -.c-modal-away-progress__tachyon-particles, -.c-modal-away-progress__tachyon-galaxies, -.c-modal-away-progress__dilated-time { - color: var(--color-dilation); - filter: brightness(0.8); -} - -.t-dark .c-modal-away-progress__tachyon-particles, -.t-dark .c-modal-away-progress__tachyon-galaxies, -.t-dark .c-modal-away-progress__dilated-time { - filter: none; -} - -.c-modal-away-progress__realities, -.c-modal-away-progress__achievement-count, -.c-modal-away-progress__reality-machines, -.c-modal-away-progress__imaginary-machines { - color: var(--color-reality); -} - -.c-modal-away-progress__dark-matter b, -.c-modal-away-progress__dark-energy b, -.c-modal-away-progress__singularities b, -.c-modal-away-progress__dark-matter, -.c-modal-away-progress__dark-energy, -.c-modal-away-progress__singularities { - color: var(--color-laitela--base); - text-shadow: - 0 0 0.2rem var(--color-laitela--accent), - 0 0 0.2rem var(--color-laitela--accent), - 0 0 0.2rem var(--color-laitela--accent), - 0 0 0.2rem var(--color-laitela--accent); -} - -.c-modal-away-progress__replicanti-galaxies, -.c-modal-away-progress__replicanti { - color: #03a9f4; -} - -.c-modal-away-progress__teresa-memories { - color: var(--color-ra-pet--teresa); -} - -.c-modal-away-progress__relic-shards, -.c-modal-away-progress__effarig-memories { - color: var(--color-ra-pet--effarig); -} - -.c-modal-away-progress__enslaved-memories { - color: var(--color-ra-pet--enslaved); -} - -.c-modal-away-progress__v-memories { - color: var(--color-ra-pet--v); -} - -.c-modal-away-progress__teresa-memories, -.c-modal-away-progress__effarig-memories, -.c-modal-away-progress__enslaved-memories, -.c-modal-away-progress__v-memories { - filter: brightness(0.8); -} - -.t-dark .c-modal-away-progress__teresa-memories, -.t-dark .c-modal-away-progress__effarig-memories, -.t-dark .c-modal-away-progress__enslaved-memories, -.t-dark .c-modal-away-progress__v-memories { - filter: none; -} - -.c-modal-away-progress__black-hole b, -.c-modal-away-progress__black-hole { - color: black; - text-shadow: - 0 0 0.2rem #e67919, - 0 0 0.3rem #e67919; -} - -.s-base--dark .c-modal-away-progress__black-hole b, -.s-base--dark .c-modal-away-progress__black-hole { - color: #de5a1d; - text-shadow: - 0 0 0.2rem black, - 0 0 0.3rem black; -} - -.c-modal-away-progress__reality-shards { - color: var(--color-pelle--base); -} - -.c-modal-away-progress__disabled b, -.c-modal-away-progress__disabled { - font-style: italic; - color: #303030; - text-shadow: 0 0 0.3rem #303030; - text-decoration: line-through; - animation: none; -} - /* #endregion c-modal-away-progress */ /* #region c-modal-import */ diff --git a/src/components/modals/AwayProgressEntry.vue b/src/components/modals/AwayProgressEntry.vue index 74796ecb6..c232c80e4 100644 --- a/src/components/modals/AwayProgressEntry.vue +++ b/src/components/modals/AwayProgressEntry.vue @@ -120,4 +120,129 @@ export default { {{ formatBefore }} to {{ formatAfter }} - \ No newline at end of file + + + diff --git a/src/components/modals/AwayProgressModal.vue b/src/components/modals/AwayProgressModal.vue index 40506191a..c951941a7 100644 --- a/src/components/modals/AwayProgressModal.vue +++ b/src/components/modals/AwayProgressModal.vue @@ -72,3 +72,17 @@ export default { Note: Click an entry to hide it in the future. + + diff --git a/src/core/player.js b/src/core/player.js index 6ffd3d5fe..181cb6fcd 100644 --- a/src/core/player.js +++ b/src/core/player.js @@ -850,6 +850,7 @@ window.player = { tachyonParticles: true, dilatedTime: true, tachyonGalaxies: true, + timeTheorems: true, achievementCount: true, realities: true, realityMachines: true, diff --git a/src/core/secret-formula/away-progress-types.js b/src/core/secret-formula/away-progress-types.js index b035ddbc8..c516f9a1b 100644 --- a/src/core/secret-formula/away-progress-types.js +++ b/src/core/secret-formula/away-progress-types.js @@ -39,6 +39,10 @@ GameDatabase.awayProgressTypes = [ name: "dilatedTime", reference: ["dilation", "dilatedTime"], isUnlocked: () => PlayerProgress.dilationUnlocked() || PlayerProgress.realityUnlocked(), + }, { + name: "timeTheorems", + reference: ["timestudy", "theorem"], + isUnlocked: () => PlayerProgress.dilationUnlocked() || PlayerProgress.realityUnlocked(), }, { name: "tachyonGalaxies", reference: ["dilation", "totalTachyonGalaxies"],