Merge pull request 'pull current changes' (#1) from profectus/Profectus:main into main

Reviewed-on: nif/Profectus-Niffix#1

.eslintrc.js

@@ -27,13 +27,6 @@ module.exports = {
                 allowNullableObject: true,
                 allowNullableBoolean: true
             }
-        ],
-        "eqeqeq": [
-            "error",
-            "always",
-            {
-                "null": "never"
-            }
         ]
     },
     globals: {

.forgejo/workflows/test.yaml

@@ -19,4 +19,3 @@ jobs:
       - run: npm ci
       - run: npm run build --if-present
       - run: npm test
-      - run: npm run lint

.github/workflows/test.yml

@@ -19,4 +19,3 @@ jobs:
       - run: npm ci
       - run: npm run build --if-present
       - run: npm test
-      - run: npm run lint

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
     "vitest.commandLine": "npx vitest",
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": "explicit"
+        "source.fixAll.eslint": true
     },
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "git.ignoreLimitWarning": true,

CHANGELOG.md

@@ -6,40 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.6.2] - 2024-04-01
-### Added
-- Export save button in error boundaries
-- isRendered utility function
-- Automatic galaxy.click cloud saves support 
-- Support for null and undefined in persistent refs
-### Changes
-- round, floor, ceil, trunc, and add now invert as no-ops
-- "The Paper Pilot Community" renamed to "Profectus & Friends"
-- Updated CI etc. to work with Forgejo
-- Improved modifier typing
-- Rename `printFormula` to `Formula.stringify`
-### Fixed
-- Hotkeys not working correctly with most combinations of modifiers
-- Reset button using `currentAt` when not gaining
-- Formulas not using modifiers that are disabled initially
-- branchedResetPropagation logic being incorrect
-- Fixed default elementsd in the main layer not updating Context when being added or removed
-- Board links props not working in camelCase
-- Board links absorbing pointer events
-- Thrown errors not appearing in console
-- Disabled elements would eat mouse events
-- Fixed cost requirement without formula counting as being able to afford infinite purchases rather than just one
-- Pinnable tooltips causing innocuous console error
-- Bars with direction as "Left" wouldn't appear correctly
-### Documentation
-- Clarified expected progress values for board nodes
-- Added CONTRIBUTING.md and enforce eslint on all PRs
-### Tests
-- Update formula test cases
-- Tree reset propagation
-
-Contributors: thepaperpilot, escapee, nif
-
 ## [0.6.1] - 2023-05-17
 ### Added
 - Error boundaries around each layer, and errors now display on the page when in development

CONTRIBUTING.md

@@ -1,31 +0,0 @@
-# Contributing to Profectus
-
-Thank you for considering contributing to Profectus! We appreciate your interest in improving our project. Please take a moment to review the following guidelines to streamline the contribution process.
-
-## Getting Started
-
-For detailed instructions on setting up local development environment, please refer to the [Setup Guide](https://moddingtree.com/guide/getting-started/setup).
-
-## Issue Reporting
-
-If you encounter a bug or have a suggestion for improvement, please open an issue on Incremental Social. Provide as much detail as possible, including an example repo or steps to reproduce the issue if applicable.
-
-## Contributing
-
-Make sure to open your PR on [Incremental Social](https://code.incremental.social/profectus/Profectus) - the GitHub repo is just a mirror!
-
-### Code Review
-
-All PRs must be reviewed and approved by at least one of the project maintainers before merging. Please be patient during the review process and be open to feedback.
-
-### Testing
-
-Ensure that your changes pass all existing tests and, if applicable, add new tests to cover the changes you've made. Run `npm run test` to run all the tests.
-
-### Code Style
-
-We use ESLint and Prettier to enforce consistent code style throughout the project. Before submitting a PR, run `npm run lint:fix` to automatically fix any linting issues.
-
-## License
-
-By contributing to Profectus, you agree that your contributions will be licensed under the project's [LICENSE](./LICENSE).

package.json

@@ -1,6 +1,6 @@
 {
   "name": "profectus",
-  "version": "0.6.2",
+  "version": "0.6.1",
   "private": true,
   "scripts": {
     "start": "vite",
@@ -9,9 +9,7 @@
     "preview": "vite preview",
     "test": "vitest run",
     "testw": "vitest",
-    "serve": "vite preview --host",
+    "serve": "vite preview --host"
-    "lint": "eslint src --max-warnings 0",
-    "lint:fix": "eslint --fix --max-warnings 0 src"
   },
   "dependencies": {
     "@fontsource/material-icons": "^4.5.4",
@@ -29,7 +27,6 @@
     "is-plain-object": "^5.0.0",
     "lz-string": "^1.4.4",
     "nanoevents": "^6.0.2",
-    "unofficial-galaxy-sdk": "git+https://code.incremental.social/thepaperpilot/unofficial-galaxy-sdk.git#1.0.1",
     "vite": "^2.9.12",
     "vite-plugin-pwa": "^0.12.0",
     "vite-tsconfig-paths": "^3.5.0",
@@ -51,7 +48,7 @@
     "jsdom": "^20.0.0",
     "prettier": "^2.5.1",
     "typescript": "^5.0.2",
-    "vitest": "^1.3.1",
+    "vitest": "^0.29.3",
     "vue-tsc": "^0.38.1"
   },
   "engines": {

src/App.vue

@@ -6,10 +6,8 @@
             <Nav v-if="useHeader" />
             <Game />
             <TPS v-if="unref(showTPS)" />
-            <AddictionWarning />
             <GameOverScreen />
             <NaNScreen />
-            <CloudSaveResolver />
             <component :is="gameComponent" />
         </div>
     </template>
@@ -18,16 +16,14 @@
 <script setup lang="tsx">
 import "@fontsource/roboto-mono";
 import Error from "components/Error.vue";
-import AddictionWarning from "components/modals/AddictionWarning.vue";
-import CloudSaveResolver from "components/modals/CloudSaveResolver.vue";
-import GameOverScreen from "components/modals/GameOverScreen.vue";
-import NaNScreen from "components/modals/NaNScreen.vue";
 import { jsx } from "features/feature";
 import state from "game/state";
 import { coerceComponent, render } from "util/vue";
-import type { CSSProperties } from "vue";
+import { CSSProperties, watch } from "vue";
 import { computed, toRef, unref } from "vue";
 import Game from "./components/Game.vue";
+import GameOverScreen from "./components/GameOverScreen.vue";
+import NaNScreen from "./components/NaNScreen.vue";
 import Nav from "./components/Nav.vue";
 import TPS from "./components/TPS.vue";
 import projInfo from "./data/projInfo.json";

src/components/GameOverScreen.vue

@@ -37,14 +37,14 @@
 </template>
 
 <script setup lang="ts">
+import Modal from "components/Modal.vue";
 import { hasWon } from "data/projEntry";
 import projInfo from "data/projInfo.json";
 import player from "game/player";
 import { formatTime } from "util/bignum";
 import { loadSave, newSave } from "util/save";
 import { computed, toRef } from "vue";
-import Toggle from "../fields/Toggle.vue";
+import Toggle from "./fields/Toggle.vue";
-import Modal from "./Modal.vue";
 
 const { title, logo, discordName, discordLink, versionNumber, versionTitle } = projInfo;
 

src/components/Info.vue

@@ -60,6 +60,7 @@
 </template>
 
 <script setup lang="tsx">
+import Modal from "components/Modal.vue";
 import type Changelog from "data/Changelog.vue";
 import projInfo from "data/projInfo.json";
 import { jsx } from "features/feature";
@@ -68,7 +69,6 @@ import { infoComponents } from "game/settings";
 import { formatTime } from "util/bignum";
 import { coerceComponent, render } from "util/vue";
 import { computed, ref, toRefs, unref } from "vue";
-import Modal from "./Modal.vue";
 
 const { title, logo, author, discordName, discordLink, versionNumber, versionTitle } = projInfo;
 

src/components/Modal.vue

@@ -4,7 +4,6 @@
             name="modal"
             @before-enter="isAnimating = true"
             @after-leave="isAnimating = false"
-            appear
         >
             <div
                 class="modal-mask"
@@ -13,7 +12,7 @@
                 v-bind="$attrs"
             >
                 <div class="modal-wrapper">
-                    <div class="modal-container" :width="width">
+                    <div class="modal-container">
                         <div class="modal-header">
                             <slot name="header" :shown="isOpen"> default header </slot>
                         </div>
@@ -42,12 +41,10 @@
 <script setup lang="ts">
 import type { FeatureNode } from "game/layers";
 import { computed, ref, toRefs, unref } from "vue";
-import Context from "../Context.vue";
+import Context from "./Context.vue";
 
 const _props = defineProps<{
     modelValue: boolean;
-    preventClosing?: boolean;
-    width?: string;
 }>();
 const props = toRefs(_props);
 const emit = defineEmits<{
@@ -56,9 +53,7 @@ const emit = defineEmits<{
 
 const isOpen = computed(() => unref(props.modelValue) || isAnimating.value);
 function close() {
-    if (unref(props.preventClosing) !== true) {
     emit("update:modelValue", false);
-    }
 }
 
 const isAnimating = ref(false);

src/components/NaNScreen.vue

@@ -46,6 +46,7 @@
 </template>
 
 <script setup lang="ts">
+import Modal from "components/Modal.vue";
 import projInfo from "data/projInfo.json";
 import player from "game/player";
 import state from "game/state";
@@ -53,8 +54,7 @@ import type { DecimalSource } from "util/bignum";
 import Decimal, { format } from "util/bignum";
 import type { ComponentPublicInstance } from "vue";
 import { computed, ref, toRef, watch } from "vue";
-import Toggle from "../fields/Toggle.vue";
+import Toggle from "./fields/Toggle.vue";
-import Modal from "./Modal.vue";
 import SavesManager from "./SavesManager.vue";
 
 const { discordName, discordLink } = projInfo;

src/components/Nav.vue

@@ -36,7 +36,7 @@
         </div>
         <div @click="savesManager?.open()">
             <Tooltip display="Saves" :direction="Direction.Down" xoffset="-20px">
-                <span class="material-icons" :class="{ needsSync }">library_books</span>
+                <span class="material-icons">library_books</span>
             </Tooltip>
         </div>
         <div @click="options?.open()">
@@ -53,7 +53,7 @@
         </div>
         <div @click="savesManager?.open()">
             <Tooltip display="Saves" :direction="Direction.Right">
-                <span class="material-icons" :class="{ needsSync }">library_books</span>
+                <span class="material-icons">library_books</span>
             </Tooltip>
         </div>
         <div @click="options?.open()">
@@ -98,14 +98,12 @@
 import Changelog from "data/Changelog.vue";
 import projInfo from "data/projInfo.json";
 import Tooltip from "features/tooltips/Tooltip.vue";
-import settings from "game/settings";
 import { Direction } from "util/common";
-import { galaxy, syncedSaves } from "util/galaxy";
 import type { ComponentPublicInstance } from "vue";
-import { computed, ref } from "vue";
+import { ref } from "vue";
-import Info from "./modals/Info.vue";
+import Info from "./Info.vue";
-import Options from "./modals/Options.vue";
+import Options from "./Options.vue";
-import SavesManager from "./modals/SavesManager.vue";
+import SavesManager from "./SavesManager.vue";
 
 const info = ref<ComponentPublicInstance<typeof Info> | null>(null);
 const savesManager = ref<ComponentPublicInstance<typeof SavesManager> | null>(null);
@@ -119,10 +117,6 @@ const { useHeader, banner, title, discordName, discordLink, versionNumber } = pr
 function openDiscord() {
     window.open(discordLink, "mywindow");
 }
-
-const needsSync = computed(
-    () => galaxy.value?.loggedIn === true && !syncedSaves.value.includes(settings.active)
-);
 </script>
 
 <style scoped>
@@ -270,32 +264,4 @@ const needsSync = computed(
     color: var(--foreground);
     text-shadow: none;
 }
-
-.needsSync {
-    color: var(--danger);
-    animation: 4s wiggle ease infinite;
-}
-
-@keyframes wiggle {
-    0% {
-        transform: rotate(-3deg);
-        box-shadow: 0 2px 2px #0003;
-    }
-    5% {
-        transform: rotate(20deg);
-    }
-    10% {
-        transform: rotate(-15deg);
-    }
-    15% {
-        transform: rotate(5deg);
-    }
-    20% {
-        transform: rotate(-1deg);
-    }
-    25% {
-        transform: rotate(0);
-        box-shadow: 0 2px 2px #0003;
-    }
-}
 </style>

src/components/Options.vue

@@ -14,7 +14,6 @@
                 <Toggle :title="unthrottledTitle" v-model="unthrottled" />
                 <Toggle v-if="projInfo.enablePausing" :title="isPausedTitle" v-model="isPaused" />
                 <Toggle :title="offlineProdTitle" v-model="offlineProd" />
-                <Toggle :title="showHealthWarningTitle" v-model="showHealthWarning" v-if="!projInfo.disableHealthWarning" />
                 <Toggle :title="autosaveTitle" v-model="autosave" />
                 <FeedbackButton v-if="!autosave" class="button save-button" @click="save()">Manually save</FeedbackButton>
             </div>
@@ -29,20 +28,20 @@
 </template>
 
 <script setup lang="tsx">
+import Modal from "components/Modal.vue";
 import projInfo from "data/projInfo.json";
+import { save } from "util/save";
 import rawThemes from "data/themes";
 import { jsx } from "features/feature";
 import Tooltip from "features/tooltips/Tooltip.vue";
 import player from "game/player";
 import settings, { settingFields } from "game/settings";
 import { camelToTitle, Direction } from "util/common";
-import { save } from "util/save";
 import { coerceComponent, render } from "util/vue";
 import { computed, ref, toRefs } from "vue";
-import FeedbackButton from "../fields/FeedbackButton.vue";
+import Select from "./fields/Select.vue";
-import Select from "../fields/Select.vue";
+import Toggle from "./fields/Toggle.vue";
-import Toggle from "../fields/Toggle.vue";
+import FeedbackButton from "./fields/FeedbackButton.vue";
-import Modal from "./Modal.vue";
 
 const isOpen = ref(false);
 const currentTab = ref("behaviour");
@@ -73,7 +72,7 @@ const settingFieldsComponent = computed(() => {
     return coerceComponent(jsx(() => (<>{settingFields.map(render)}</>)));
 });
 
-const { showTPS, theme, unthrottled, alignUnits, showHealthWarning } = toRefs(settings);
+const { showTPS, theme, unthrottled, alignUnits } = toRefs(settings);
 const { autosave, offlineProd } = toRefs(player);
 const isPaused = computed({
     get() {
@@ -92,16 +91,10 @@ const unthrottledTitle = jsx(() => (
 ));
 const offlineProdTitle = jsx(() => (
     <span class="option-title">
-        Offline production<Tooltip display="Save-specific" direction={Direction.Right}>*</Tooltip>
+        Offline Production<Tooltip display="Save-specific" direction={Direction.Right}>*</Tooltip>
         <desc>Simulate production that occurs while the game is closed.</desc>
     </span>
 ));
-const showHealthWarningTitle = jsx(() => (
-    <span class="option-title">
-        Show videogame addiction warning
-        <desc>Show a helpful warning after playing for a long time about video game addiction and encouraging you to take a break.</desc>
-    </span>
-));
 const autosaveTitle = jsx(() => (
     <span class="option-title">
         Autosave<Tooltip display="Save-specific" direction={Direction.Right}>*</Tooltip>

src/components/Save.vue

@@ -1,7 +1,7 @@
 <template>
-    <div class="save" :class="{ active: isActive, readonly }">
+    <div class="save" :class="{ active: isActive }">
-        <div class="handle material-icons" v-if="readonly !== true">drag_handle</div>
+        <div class="handle material-icons">drag_handle</div>
-        <div class="actions" v-if="!isEditing && readonly !== true">
+        <div class="actions" v-if="!isEditing">
             <FeedbackButton
                 @click="emit('export')"
                 class="button"
@@ -40,7 +40,7 @@
                 </Tooltip>
             </DangerButton>
         </div>
-        <div class="actions" v-else-if="readonly !== true">
+        <div class="actions" v-else>
             <button @click="changeName" class="button">
                 <Tooltip display="Save" :direction="Direction.Left" class="info">
                     <span class="material-icons">check</span>
@@ -53,17 +53,12 @@
             </button>
         </div>
         <div class="details" v-if="save.error == undefined && !isEditing">
-            <Tooltip display="Synced!" :direction="Direction.Right" v-if="synced"
+            <button class="button open" @click="emit('open')">
-                ><span class="material-icons synced">cloud</span></Tooltip
-            >
-            <button class="button open" @click="emit('open')" :disabled="readonly">
                 <h3>{{ save.name }}</h3>
             </button>
             <span class="save-version">v{{ save.modVersion }}</span
             ><br />
-            <div v-if="currentTime" class="time">
+            <div v-if="currentTime">Last played {{ dateFormat.format(currentTime) }}</div>
-                Last played {{ dateFormat.format(currentTime) }}
-            </div>
         </div>
         <div class="details" v-else-if="save.error == undefined && isEditing">
             <Text v-model="newName" class="editname" @submit="changeName" />
@@ -78,18 +73,16 @@
 import Tooltip from "features/tooltips/Tooltip.vue";
 import player from "game/player";
 import { Direction } from "util/common";
-import { computed, ref, toRefs, unref, watch } from "vue";
+import { computed, ref, toRefs, watch } from "vue";
-import DangerButton from "../fields/DangerButton.vue";
+import DangerButton from "./fields/DangerButton.vue";
-import FeedbackButton from "../fields/FeedbackButton.vue";
+import FeedbackButton from "./fields/FeedbackButton.vue";
-import Text from "../fields/Text.vue";
+import Text from "./fields/Text.vue";
 import type { LoadablePlayerData } from "./SavesManager.vue";
-import { galaxy, syncedSaves } from "util/galaxy";
 
 const _props = defineProps<{
     save: LoadablePlayerData;
-    readonly?: boolean;
 }>();
-const { save, readonly } = toRefs(_props);
+const { save } = toRefs(_props);
 const emit = defineEmits<{
     (e: "export"): void;
     (e: "open"): void;
@@ -113,18 +106,10 @@ const newName = ref("");
 
 watch(isEditing, () => (newName.value = save.value.name ?? ""));
 
-const isActive = computed(
+const isActive = computed(() => save.value != null && save.value.id === player.id);
-    () => save.value != null && save.value.id === player.id && !unref(readonly)
-);
 const currentTime = computed(() =>
     isActive.value ? player.time : (save.value != null && save.value.time) ?? 0
 );
-const synced = computed(
-    () =>
-        !unref(readonly) &&
-        galaxy.value?.loggedIn === true &&
-        syncedSaves.value.includes(save.value.id)
-);
 
 function changeName() {
     emit("editName", newName.value);
@@ -154,13 +139,6 @@ function changeName() {
     padding-left: 0;
 }
 
-.open:disabled {
-    cursor: inherit;
-    color: var(--foreground);
-    opacity: 1;
-    pointer-events: none;
-}
-
 .handle {
     flex-grow: 0;
     margin-right: 8px;
@@ -174,10 +152,6 @@ function changeName() {
     margin-right: 80px;
 }
 
-.save.readonly .details {
-    margin-right: 0;
-}
-
 .error {
     font-size: 0.8em;
     color: var(--danger);
@@ -202,17 +176,6 @@ function changeName() {
 .editname {
     margin: 0;
 }
-
-.time {
-    font-size: small;
-}
-
-.synced {
-    font-size: 100%;
-    margin-right: 0.5em;
-    vertical-align: middle;
-    cursor: default;
-}
 </style>
 
 <style>
@@ -238,8 +201,4 @@ function changeName() {
 .save .field {
     margin: 0;
 }
-
-.details > .tooltip-container {
-    display: inline;
-}
 </style>

src/components/SavesManager.vue

@@ -4,9 +4,6 @@
             <h2>Saves Manager</h2>
         </template>
         <template #body="{ shown }">
-            <div v-if="showNotSyncedWarning" style="color: var(--danger)">
-                Not all saves are synced! You may need to delete stale saves.
-            </div>
             <Draggable
                 :list="settings.saves"
                 handle=".handle"
@@ -60,28 +57,18 @@
 </template>
 
 <script setup lang="ts">
+import Modal from "components/Modal.vue";
 import projInfo from "data/projInfo.json";
 import type { Player } from "game/player";
 import player, { stringifySave } from "game/player";
 import settings from "game/settings";
 import LZString from "lz-string";
-import { galaxy, syncedSaves } from "util/galaxy";
+import { getUniqueID, loadSave, newSave, save } from "util/save";
-import {
-    clearCachedSave,
-    clearCachedSaves,
-    decodeSave,
-    getCachedSave,
-    getUniqueID,
-    loadSave,
-    newSave,
-    save
-} from "util/save";
 import type { ComponentPublicInstance } from "vue";
-import { computed, nextTick, ref, watch } from "vue";
+import { computed, nextTick, ref, shallowReactive, watch } from "vue";
 import Draggable from "vuedraggable";
-import Select from "../fields/Select.vue";
+import Select from "./fields/Select.vue";
-import Text from "../fields/Text.vue";
+import Text from "./fields/Text.vue";
-import Modal from "./Modal.vue";
 import Save from "./Save.vue";
 
 export type LoadablePlayerData = Omit<Partial<Player>, "id"> & { id: string; error?: unknown };
@@ -103,8 +90,16 @@ watch(saveToImport, importedSave => {
     if (importedSave) {
         nextTick(() => {
             try {
-                importedSave = decodeSave(importedSave) ?? "";
+                if (importedSave[0] === "{") {
-                if (importedSave === "") {
+                    // plaintext. No processing needed
+                } else if (importedSave[0] === "e") {
+                    // Assumed to be base64, which starts with e
+                    importedSave = decodeURIComponent(escape(atob(importedSave)));
+                } else if (importedSave[0] === "ᯡ") {
+                    // Assumed to be lz, which starts with ᯡ
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    importedSave = LZString.decompressFromUTF16(importedSave)!;
+                } else {
                     console.warn("Unable to determine preset encoding", importedSave);
                     importingFailed.value = true;
                     return;
@@ -130,7 +125,7 @@ watch(saveToImport, importedSave => {
     }
 });
 
-let bankContext = import.meta.globEager("./../../../saves/*.txt", { as: "raw" });
+let bankContext = import.meta.globEager("./../../saves/*.txt", { as: "raw" });
 let bank = ref(
     Object.keys(bankContext).reduce((acc: Array<{ label: string; value: string }>, curr) => {
         acc.push({
@@ -144,10 +139,48 @@ let bank = ref(
     }, [])
 );
 
+const cachedSaves = shallowReactive<Record<string, LoadablePlayerData | undefined>>({});
+function getCachedSave(id: string) {
+    if (cachedSaves[id] == null) {
+        let save = localStorage.getItem(id);
+        if (save == null) {
+            cachedSaves[id] = { error: `Save doesn't exist in localStorage`, id };
+        } else if (save === "dW5kZWZpbmVk") {
+            cachedSaves[id] = { error: `Save is undefined`, id };
+        } else {
+            try {
+                if (save[0] === "{") {
+                    // plaintext. No processing needed
+                } else if (save[0] === "e") {
+                    // Assumed to be base64, which starts with e
+                    save = decodeURIComponent(escape(atob(save)));
+                } else if (save[0] === "ᯡ") {
+                    // Assumed to be lz, which starts with ᯡ
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    save = LZString.decompressFromUTF16(save)!;
+                } else {
+                    console.warn("Unable to determine preset encoding", save);
+                    importingFailed.value = true;
+                    cachedSaves[id] = { error: "Unable to determine preset encoding", id };
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    return cachedSaves[id]!;
+                }
+                cachedSaves[id] = { ...JSON.parse(save), id };
+            } catch (error) {
+                cachedSaves[id] = { error, id };
+                console.warn(
+                    `SavesManager: Failed to load info about save with id ${id}:\n${error}\n${save}`
+                );
+            }
+        }
+    }
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    return cachedSaves[id]!;
+}
 // Wipe cache whenever the modal is opened
 watch(isOpen, isOpen => {
     if (isOpen) {
-        clearCachedSaves();
+        Object.keys(cachedSaves).forEach(key => delete cachedSaves[key]);
     }
 });
 
@@ -158,10 +191,6 @@ const saves = computed(() =>
     }, {})
 );
 
-const showNotSyncedWarning = computed(
-    () => galaxy.value?.loggedIn === true && settings.saves.length < syncedSaves.value.length
-);
-
 function exportSave(id: string) {
     let saveToExport;
     if (player.id === id) {
@@ -204,37 +233,20 @@ function duplicateSave(id: string) {
 }
 
 function deleteSave(id: string) {
-    if (galaxy.value?.loggedIn === true) {
-        galaxy.value.getSaveList().then(list => {
-            const slot = Object.keys(list).find(slot => {
-                const content = list[slot as unknown as number].content;
-                try {
-                    if (JSON.parse(content).id === id) {
-                        return true;
-                    }
-                } catch (e) {
-                    return false;
-                }
-            });
-            if (slot != null) {
-                galaxy.value?.save(parseInt(slot), "", "").catch(console.error);
-            }
-        });
-    }
     settings.saves = settings.saves.filter((save: string) => save !== id);
     localStorage.removeItem(id);
-    clearCachedSave(id);
+    cachedSaves[id] = undefined;
 }
 
 function openSave(id: string) {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     saves.value[player.id]!.time = player.time;
     save();
-    clearCachedSave(player.id);
+    cachedSaves[player.id] = undefined;
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     loadSave(saves.value[id]!);
     // Delete cached version in case of opening it again
-    clearCachedSave(id);
+    cachedSaves[id] = undefined;
 }
 
 function newFromPreset(preset: string) {
@@ -244,8 +256,16 @@ function newFromPreset(preset: string) {
         selectedPreset.value = null;
     });
 
-    preset = decodeSave(preset) ?? "";
+    if (preset[0] === "{") {
-    if (preset === "") {
+        // plaintext. No processing needed
+    } else if (preset[0] === "e") {
+        // Assumed to be base64, which starts with e
+        preset = decodeURIComponent(escape(atob(preset)));
+    } else if (preset[0] === "ᯡ") {
+        // Assumed to be lz, which starts with ᯡ
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        preset = LZString.decompressFromUTF16(preset)!;
+    } else {
         console.warn("Unable to determine preset encoding", preset);
         return;
     }
@@ -267,7 +287,7 @@ function editSave(id: string, newName: string) {
             save();
         } else {
             save(currSave as Player);
-            clearCachedSave(id);
+            cachedSaves[id] = undefined;
         }
     }
 }

src/components/modals/AddictionWarning.vue

@@ -1,83 +0,0 @@
-<template>
-    <Modal v-model="isOpen" v-bind="$attrs">
-        <template v-slot:header>
-            <div class="vga-modal-header">
-                <h2>Kindly consider taking a break.</h2>
-            </div>
-        </template>
-        <template v-slot:body>
-            <p>
-                You've been actively enjoying this game for awhile recently - and it's great that
-                you've been having a good time! That said, there are dangers to games like these that you should be aware of:
-            </p>
-            <p>
-                While incremental games can be fun and even healthy in certain contexts, they can
-                exacerbate video game addiction even more than other genres. If you feel like
-                playing incremental games is taking priority over other things in your life, or
-                manipulating your sleep schedule, it may be prudent to seek help.
-            </p>
-            <p>
-                <h4>Resources:</h4>
-                <span>
-                    <a style="display: inline" href="https://www.samhsa.gov/" target="_blank">
-                        SAMHSA
-                    </a>
-                    (<a style="display: inline" href="tel:1-800-662-4357">1-800-662-HELP</a>)
-                </span>
-                <br />
-                <a href="https://www.reddit.com/r/StopGaming/">r/StopGaming</a>
-            </p>
-        </template>
-        <template v-slot:footer>
-            <div class="vga-footer">
-                <button @click="neverShow" class="button">Never show this again</button>
-                <button @click="isOpen = false" class="button">Close</button>
-            </div>
-        </template>
-    </Modal>
-    <SavesManager ref="savesManager" />
-</template>
-
-<script setup lang="ts">
-import projInfo from "data/projInfo.json";
-import settings from "game/settings";
-import state from "game/state";
-import { ref, watchEffect } from "vue";
-import Modal from "./Modal.vue";
-
-const isOpen = ref(false);
-watchEffect(() => {
-    if (
-        projInfo.disableHealthWarning === false &&
-        settings.showHealthWarning &&
-        state.mouseActivity.filter(i => i).length > 6
-    ) {
-        isOpen.value = true;
-    }
-});
-
-function neverShow() {
-    settings.showHealthWarning = false;
-    isOpen.value = false;
-}
-</script>
-
-<style scoped>
-.vga-modal-header {
-    padding-top: 10px;
-    margin-left: 10px;
-}
-
-.vga-footer {
-    display: flex;
-    justify-content: flex-end;
-}
-
-.vga-footer button {
-    margin: 0 10px;
-}
-
-p {
-    margin-bottom: 10px;
-}
-</style>

src/components/modals/CloudSaveResolver.vue

@@ -1,228 +0,0 @@
-<template>
-    <Modal v-model="isOpen" width="960px" ref="modal" :prevent-closing="true">
-        <template v-slot:header>
-            <div class="cloud-saves-modal-header">
-                <h2>Cloud {{ pluralizedSave }} loaded!</h2>
-            </div>
-        </template>
-        <template v-slot:body>
-            <div>
-                Upon loading, your cloud {{ pluralizedSave }}
-                {{ conflictingSaves.length > 1 ? "appear" : "appears" }} to be out of sync with your
-                local {{ pluralizedSave }}. Which
-                {{ pluralizedSave }}
-                do you want to keep?
-            </div>
-            <br />
-            <div
-                v-for="(conflict, i) in unref(conflictingSaves)"
-                :key="conflict.id"
-                class="conflict-container"
-            >
-                <div @click="selectCloud(i)" :class="{ selected: selectedSaves[i] === 'cloud' }">
-                    <h2>
-                        Cloud
-                        <span
-                            v-if="(conflict.cloud.time ?? 0) > (conflict.local.time ?? 0)"
-                            class="note"
-                            >(more recent)</span
-                        >
-                        <span
-                            v-if="
-                                (conflict.cloud.timePlayed ?? 0) > (conflict.local.timePlayed ?? 0)
-                            "
-                            class="note"
-                            >(more playtime)</span
-                        >
-                    </h2>
-                    <Save :save="conflict.cloud" :readonly="true" />
-                </div>
-                <div @click="selectLocal(i)" :class="{ selected: selectedSaves[i] === 'local' }">
-                    <h2>
-                        Local
-                        <span
-                            v-if="(conflict.cloud.time ?? 0) <= (conflict.local.time ?? 0)"
-                            class="note"
-                            >(more recent)</span
-                        >
-                        <span
-                            v-if="
-                                (conflict.cloud.timePlayed ?? 0) <= (conflict.local.timePlayed ?? 0)
-                            "
-                            class="note"
-                            >(more playtime)</span
-                        >
-                    </h2>
-                    <Save :save="conflict.local" :readonly="true" />
-                </div>
-                <div
-                    @click="selectBoth(i)"
-                    :class="{ selected: selectedSaves[i] === 'both' }"
-                    style="flex-basis: 30%"
-                >
-                    <h2>Both</h2>
-                    <div class="save">Keep Both</div>
-                </div>
-            </div>
-        </template>
-        <template v-slot:footer>
-            <div class="cloud-saves-footer">
-                <button @click="close" class="button">Confirm</button>
-            </div>
-        </template>
-    </Modal>
-</template>
-
-<script setup lang="ts">
-import { stringifySave } from "game/player";
-import settings from "game/settings";
-import LZString from "lz-string";
-import { conflictingSaves, galaxy } from "util/galaxy";
-import { getUniqueID, save, setupInitialStore } from "util/save";
-import { ComponentPublicInstance, computed, ref, unref, watch } from "vue";
-import Modal from "./Modal.vue";
-import Save from "./Save.vue";
-
-const isOpen = ref(false);
-// True means replacing local save with cloud save
-const selectedSaves = ref<("cloud" | "local" | "both")[]>([]);
-
-const pluralizedSave = computed(() => (conflictingSaves.value.length > 1 ? "saves" : "save"));
-
-const modal = ref<ComponentPublicInstance<typeof Modal> | null>(null);
-
-watch(
-    () => conflictingSaves.value.length > 0,
-    shouldOpen => {
-        if (shouldOpen) {
-            selectedSaves.value = conflictingSaves.value.map(({ local, cloud }) => {
-                return (local.time ?? 0) < (cloud.time ?? 0) ? "cloud" : "local";
-            });
-            isOpen.value = true;
-        }
-    },
-    { immediate: true }
-);
-
-watch(
-    () => modal.value?.isOpen,
-    open => {
-        if (open === false) {
-            conflictingSaves.value = [];
-        }
-    }
-);
-
-function selectLocal(index: number) {
-    selectedSaves.value[index] = "local";
-}
-
-function selectCloud(index: number) {
-    selectedSaves.value[index] = "cloud";
-}
-
-function selectBoth(index: number) {
-    selectedSaves.value[index] = "both";
-}
-
-function close() {
-    for (let i = 0; i < selectedSaves.value.length; i++) {
-        const { slot, local, cloud } = conflictingSaves.value[i];
-        switch (selectedSaves.value[i]) {
-            case "local":
-                // Replace cloud save with local
-                galaxy.value
-                    ?.save(
-                        slot,
-                        LZString.compressToUTF16(stringifySave(setupInitialStore(local))),
-                        cloud.name
-                    )
-                    .catch(console.error);
-                break;
-            case "cloud":
-                // Replace local save with cloud
-                save(setupInitialStore(cloud));
-                break;
-            case "both":
-                // Get a new save ID for the cloud save, and sync the local one to the cloud
-                const id = getUniqueID();
-                save({ ...setupInitialStore(cloud), id });
-                settings.saves.push(id);
-                galaxy.value
-                    ?.save(
-                        slot,
-                        LZString.compressToUTF16(stringifySave(setupInitialStore(local))),
-                        cloud.name
-                    )
-                    .catch(console.error);
-                break;
-        }
-    }
-    isOpen.value = false;
-}
-</script>
-
-<style scoped>
-.cloud-saves-modal-header {
-    padding: 10px 0;
-    margin-left: 10px;
-}
-
-.cloud-saves-footer {
-    display: flex;
-    justify-content: flex-end;
-}
-
-.cloud-saves-footer button {
-    margin: 0 10px;
-}
-
-.conflict-container {
-    display: flex;
-}
-
-.conflict-container > * {
-    flex-basis: 50%;
-    display: flex;
-    flex-flow: column;
-    margin: 0;
-}
-
-.conflict-container + .conflict-container {
-    margin-top: 1em;
-}
-
-.conflict-container h2 {
-    display: flex;
-    flex-flow: column wrap;
-    height: 1.5em;
-    margin: 0;
-}
-
-.note {
-    font-size: x-small;
-    opacity: 0.7;
-    margin-right: 1em;
-}
-
-.save {
-    border: solid 4px var(--outline);
-    padding: 4px;
-    background: var(--raised-background);
-    margin: var(--feature-margin);
-    display: flex;
-    align-items: center;
-    min-height: 30px;
-    height: 100%;
-}
-</style>
-
-<style>
-.conflict-container .save {
-    cursor: pointer;
-}
-
-.conflict-container .selected .save {
-    border-color: var(--bought);
-}
-</style>

src/data/Changelog.vue

@@ -19,7 +19,7 @@
 </template>
 
 <script setup lang="ts">
-import Modal from "components/modals/Modal.vue";
+import Modal from "components/Modal.vue";
 import { ref } from "vue";
 
 const isOpen = ref(false);

src/data/projInfo-schema.json

@@ -88,10 +88,6 @@
             "type": "string",
             "enum": ["base64", "lz", "plain"],
             "description": "The encoding to use when exporting to the clipboard. Plain-text is fast to generate but is easiest for the player to manipulate and cheat with. Base 64 is slightly slower and the string will be longer but will offer a small barrier to people trying to cheat. LZ-String is the slowest method, but produces the smallest strings and still offers a small barrier to those trying to cheat. Some sharing platforms like pastebin may automatically delete base64 encoded text, and some sites might not support all the characters used in lz-string exports."
-        },
-        "disableHealthWarning": {
-            "type": "boolean",
-            "description": "Whether or not to disable the health warning that appears to the player after excessive playtime (activity during 6 of the last 8 hours). If left enabled, the player will still be able to individually turn off the health warning in settings or by clicking \"Do not show again\" in the warning itself."
         }
     }
 }

src/data/projInfo.json

@@ -22,6 +22,5 @@
 	"maxTickLength": 3600,
 	"offlineLimit": 1,
 	"enablePausing": true,
-	"exportEncoding": "base64",
+	"exportEncoding": "base64"
-	"disableHealthWarning": false
 }

src/features/achievements/achievement.tsx

@@ -208,7 +208,7 @@ export function createAchievement<T extends AchievementOptions>(
                         unref(achievement.earned) &&
                         !(
                             display != null &&
-                            typeof display === "object" &&
+                            typeof display == "object" &&
                             "optionsDisplay" in (display as Record<string, unknown>)
                         )
                     ) {

src/features/action.tsx

@@ -31,7 +31,7 @@ import { coerceComponent, isCoercableComponent, render } from "util/vue";
 import { computed, Ref, ref, unref } from "vue";
 import { BarOptions, createBar, GenericBar } from "./bars/bar";
 import { ClickableOptions } from "./clickables/clickable";
-import { GenericDecorator } from "./decorators/common";
+import { Decorator, GenericDecorator } from "./decorators/common";
 
 /** A symbol used to identify {@link Action} features. */
 export const ActionType = Symbol("Action");

src/features/feature.ts

@@ -92,7 +92,7 @@ export function setDefault<T, K extends keyof T>(
     key: K,
     value: T[K]
 ): asserts object is Exclude<T, K> & Required<Pick<T, K>> {
-    if (object[key] == null && value != null) {
+    if (object[key] === undefined && value != undefined) {
         object[key] = value;
     }
 }
@@ -135,7 +135,7 @@ export function excludeFeatures(obj: Record<string, unknown>, ...types: symbol[]
             if (value != null && typeof value === "object") {
                 if (
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    typeof (value as Record<string, any>).type === "symbol" &&
+                    typeof (value as Record<string, any>).type == "symbol" &&
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     !types.includes((value as Record<string, any>).type)
                 ) {

src/features/grids/grid.ts

@@ -128,7 +128,7 @@ function getCellHandler(id: string): ProxyHandler<GenericGrid> {
             if (isFunction(prop)) {
                 return () => prop.call(receiver, id, target.getState(id));
             }
-            if (prop != null || typeof key === "symbol") {
+            if (prop != undefined || typeof key === "symbol") {
                 return prop;
             }
 
@@ -145,7 +145,7 @@ function getCellHandler(id: string): ProxyHandler<GenericGrid> {
                     cache[key] = computed(() => prop.call(receiver, id, target.getState(id)));
                 }
                 return cache[key].value;
-            } else if (prop != null) {
+            } else if (prop != undefined) {
                 return unref(prop);
             }
 
@@ -153,7 +153,7 @@ function getCellHandler(id: string): ProxyHandler<GenericGrid> {
             prop = (target as any)[`on${key}`];
             if (isFunction(prop)) {
                 return () => prop.call(receiver, id, target.getState(id));
-            } else if (prop != null) {
+            } else if (prop != undefined) {
                 return prop;
             }
 
@@ -318,7 +318,7 @@ export function createGrid<T extends GridOptions>(
             return grid.id + "-" + cell;
         };
         grid.getState = function (this: GenericGrid, cell: string | number) {
-            if (this.cellState.value[cell] != null) {
+            if (this.cellState.value[cell] != undefined) {
                 return cellState.value[cell];
             }
             return this.cells[cell].startState;

src/features/hotkey.tsx

@@ -99,30 +99,16 @@ document.onkeydown = function (e) {
     if (hasWon.value && !player.keepGoing) {
         return;
     }
-    const keysToCheck: string[] = [e.key];
+    let key = e.key;
-    if (e.shiftKey && e.ctrlKey) {
+    if (uppercaseNumbers.includes(key)) {
-        keysToCheck.splice(0, 1);
+        key = "shift+" + uppercaseNumbers.indexOf(key);
-        keysToCheck.push("ctrl+shift+" + e.key.toUpperCase());
-        keysToCheck.push("shift+ctrl+" + e.key.toUpperCase());
-        if (uppercaseNumbers.includes(e.key)) {
-            keysToCheck.push("ctrl+shift+" + uppercaseNumbers.indexOf(e.key));
-            keysToCheck.push("shift+ctrl+" + uppercaseNumbers.indexOf(e.key));
-        } else {
-            keysToCheck.push("ctrl+shift+" + e.key.toLowerCase());
-            keysToCheck.push("shift+ctrl+" + e.key.toLowerCase());
-        }
-    } else if (uppercaseNumbers.includes(e.key)) {
-        keysToCheck.push("shift+" + e.key);
-        keysToCheck.push("shift+" + uppercaseNumbers.indexOf(e.key));
     } else if (e.shiftKey) {
-        keysToCheck.push("shift+" + e.key.toUpperCase());
+        key = "shift+" + key;
-        keysToCheck.push("shift+" + e.key.toLowerCase());
-    } else if (e.ctrlKey) {
-        // remove e.key since the key doesn't change based on ctrl being held or not
-        keysToCheck.splice(0, 1);
-        keysToCheck.push("ctrl+" + e.key);
     }
-    const hotkey = hotkeys[keysToCheck.find(key => key in hotkeys) ?? ""];
+    if (e.ctrlKey) {
+        key = "ctrl+" + key;
+    }
+    const hotkey = hotkeys[key] ?? hotkeys[key.toLowerCase()];
     if (hotkey && unref(hotkey.enabled)) {
         e.preventDefault();
         hotkey.onPress();
@@ -142,7 +128,7 @@ registerInfoComponent(
                 <div style="column-count: 2">
                     {keys.map(hotkey => (
                         <div>
-                            <Hotkey hotkey={hotkey as GenericHotkey} /> {unref(hotkey?.description)}
+                            <Hotkey hotkey={hotkey as GenericHotkey} /> {hotkey?.description}
                         </div>
                     ))}
                 </div>

src/features/links/Links.vue

@@ -36,7 +36,7 @@ onMounted(() => (boundingRect.value = resizeListener.value?.getBoundingClientRec
 const validLinks = computed(() => {
     const n = nodes.value;
     return (
-        links.value?.filter(link => n[link.startNode.id]?.rect && n[link.endNode.id]?.rect) ?? []
+        links.value?.filter(link => n[link.startNode.id]?.rect && n[link.startNode.id]?.rect) ?? []
     );
 });
 </script>

src/features/tooltips/tooltip.ts

@@ -1,6 +1,6 @@
 import type { CoercableComponent, GenericComponent, Replace, StyleValue } from "features/feature";
 import { Component, GatherProps, setDefault } from "features/feature";
-import { persistent } from "game/persistence";
+import { deletePersistent, Persistent, persistent } from "game/persistence";
 import { Direction } from "util/common";
 import type {
     Computable,

src/features/trees/tree.ts

@@ -1,4 +1,4 @@
-import { GenericDecorator } from "features/decorators/common";
+import { Decorator, GenericDecorator } from "features/decorators/common";
 import type {
     CoercableComponent,
     GenericComponent,
@@ -342,15 +342,15 @@ export const branchedResetPropagation = function (
     if (links == null) return;
     const reset: GenericTreeNode[] = [];
     let current = [resettingNode];
-    while (current.length !== 0) {
+    while (current.length != 0) {
         const next: GenericTreeNode[] = [];
         for (const node of current) {
             for (const link of links.filter(link => link.startNode === node)) {
-                if ([...reset, ...current].includes(link.endNode)) continue;
+                if ([...reset, ...current].includes(link.endNode)) continue
                 next.push(link.endNode);
                 link.endNode.reset?.reset();
             }
-        }
+        };
         reset.push(...current);
         current = next;
     }

src/game/events.ts

@@ -2,7 +2,6 @@ import type { Settings } from "game/settings";
 import { createNanoEvents } from "nanoevents";
 import type { App } from "vue";
 import type { GenericLayer } from "./layers";
-import state from "./state";
 
 /** All types of events able to be sent or emitted from the global event bus. */
 export interface GlobalEvents {
@@ -60,7 +59,3 @@ if ("fonts" in document) {
     // JSDom doesn't add document.fonts, and Object.defineProperty doesn't seem to work on document
     document.fonts.onloadingdone = () => globalBus.emit("fontsLoaded");
 }
-
-document.onmousemove = function () {
-    state.mouseActivity[state.mouseActivity.length - 1] = true;
-};

src/game/formulas/formulas.ts

@@ -56,7 +56,6 @@ export abstract class InternalFormula<T extends [FormulaSource] | FormulaSource[
     protected readonly internalIntegrate: IntegrateFunction<T> | undefined;
     protected readonly internalIntegrateInner: IntegrateFunction<T> | undefined;
     protected readonly applySubstitution: SubstitutionFunction<T> | undefined;
-    protected readonly description: string | undefined;
     protected readonly internalVariables: number;
 
     public readonly innermostVariable: ProcessedComputable<DecimalSource> | undefined;
@@ -86,7 +85,6 @@ export abstract class InternalFormula<T extends [FormulaSource] | FormulaSource[
         this.internalIntegrate = readonlyProperties.internalIntegrate;
         this.internalIntegrateInner = readonlyProperties.internalIntegrateInner;
         this.applySubstitution = readonlyProperties.applySubstitution;
-        this.description = options.description;
     }
 
     private setupVariable({
@@ -218,25 +216,6 @@ export abstract class InternalFormula<T extends [FormulaSource] | FormulaSource[
         return new Formula({ variable: value });
     }
 
-    /**
-     * Stringifies the formula so it's more easy to read in the console
-     * @param formula The formula source to print, used for mapping inputs
-     */
-    public static stringify(formula: FormulaSource): string {
-        if (formula instanceof InternalFormula) {
-            if (formula.description != null) {
-                return formula.description;
-            }
-            if (formula.internalEvaluate == null) {
-                return formula.hasVariable() ? "x" : format(formula.inputs[0] ?? 0);
-            }
-            return `${formula.internalEvaluate.name}(${formula.inputs
-                .map(Formula.stringify)
-                .join(", ")})`;
-        }
-        return format(unref(formula));
-    }
-
     // TODO add integration support to step-wise functions
     /**
      * Creates a step-wise formula. After {@link start} the formula will have an additional modifier.
@@ -277,9 +256,7 @@ export abstract class InternalFormula<T extends [FormulaSource] | FormulaSource[
         return new Formula({
             inputs: [value],
             evaluate: evalStep,
-            invert: formula.isInvertible() && formula.hasVariable() ? invertStep : undefined,
+            invert: formula.isInvertible() && formula.hasVariable() ? invertStep : undefined
-            // Can't do anything more descriptive, due to formula's input always being a variable
-            description: "indeterminate"
         });
     }
 
@@ -332,9 +309,7 @@ export abstract class InternalFormula<T extends [FormulaSource] | FormulaSource[
         return new Formula({
             inputs: [value],
             evaluate: evalStep,
-            invert: formula.isInvertible() && formula.hasVariable() ? invertStep : undefined,
+            invert: formula.isInvertible() && formula.hasVariable() ? invertStep : undefined
-            // Can't do anything more descriptive, due to formula's input always being a variable
-            description: "indeterminate"
         });
     }
     public static conditional(
@@ -903,10 +878,6 @@ export abstract class InternalFormula<T extends [FormulaSource] | FormulaSource[
         });
     }
 
-    public stringify() {
-        return Formula.stringify(this);
-    }
-
     public step(
         start: Computable<DecimalSource>,
         formulaModifier: (value: InvertibleIntegralFormula) => GenericFormula
@@ -1431,6 +1402,28 @@ export function findNonInvertible(formula: GenericFormula): GenericFormula | nul
     return null;
 }
 
+/**
+ * Stringifies a formula so it's more easy to read in the console
+ * @param formula The formula to print
+ */
+export function printFormula(formula: FormulaSource): string {
+    if (formula instanceof InternalFormula) {
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        return formula.internalEvaluate == null
+            ? formula.hasVariable()
+                ? "x"
+                : formula.inputs[0] ?? 0
+            : // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+              // @ts-ignore
+              formula.internalEvaluate.name +
+                  "(" +
+                  formula.inputs.map(printFormula).join(", ") +
+                  ")";
+    }
+    return format(unref(formula));
+}
+
 /**
  * Utility for calculating the maximum amount of purchases possible with a given formula and resource. If {@link cumulativeCost} is changed to false, the calculation will be much faster with higher numbers.
  * @param formula The formula to use for calculating buy max from

src/game/formulas/operations.ts

@@ -552,9 +552,7 @@ export function tetrate(
 export function invertTetrate(
     value: DecimalSource,
     base: FormulaSource,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     height: FormulaSource,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     payload: FormulaSource
 ) {
     if (hasVariable(base)) {
@@ -578,7 +576,6 @@ export function invertIteratedExp(
     value: DecimalSource,
     lhs: FormulaSource,
     height: FormulaSource,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     payload: FormulaSource
 ) {
     if (hasVariable(lhs)) {
@@ -629,7 +626,6 @@ export function invertLayeradd(
     value: DecimalSource,
     lhs: FormulaSource,
     diff: FormulaSource,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     base: FormulaSource
 ) {
     if (hasVariable(lhs)) {

src/game/formulas/types.d.ts

@@ -37,13 +37,9 @@ type SubstitutionFunction<T> = (
     ...inputs: T
 ) => GenericFormula;
 
-type VariableFormulaOptions = {
+type VariableFormulaOptions = { variable: ProcessedComputable<DecimalSource> };
-    variable: ProcessedComputable<DecimalSource>;
-    description?: string;
-};
 type ConstantFormulaOptions = {
     inputs: [FormulaSource];
-    description?: string;
 };
 type GeneralFormulaOptions<T extends [FormulaSource] | FormulaSource[]> = {
     inputs: T;
@@ -52,7 +48,6 @@ type GeneralFormulaOptions<T extends [FormulaSource] | FormulaSource[]> = {
     integrate?: IntegrateFunction<T>;
     integrateInner?: IntegrateFunction<T>;
     applySubstitution?: SubstitutionFunction<T>;
-    description?: string;
 };
 type FormulaOptions<T extends [FormulaSource] | FormulaSource[]> =
     | VariableFormulaOptions
@@ -68,7 +63,6 @@ type InternalFormulaProperties<T extends [FormulaSource] | FormulaSource[]> = {
     internalIntegrateInner?: IntegrateFunction<T>;
     applySubstitution?: SubstitutionFunction<T>;
     innermostVariable?: ProcessedComputable<DecimalSource>;
-    description?: string;
 };
 
 type SubstitutionStack = ((value: GenericFormula) => GenericFormula)[] | undefined;

src/game/gameLoop.ts

@@ -43,7 +43,7 @@ function update() {
     loadingSave.value = false;
 
     // Add offline time if any
-    if (player.offlineTime != null) {
+    if (player.offlineTime != undefined) {
         if (Decimal.gt(player.offlineTime, projInfo.offlineLimit * 3600)) {
             player.offlineTime = projInfo.offlineLimit * 3600;
         }
@@ -63,7 +63,7 @@ function update() {
     diff = Math.min(diff, projInfo.maxTickLength);
 
     // Apply dev speed
-    if (player.devSpeed != null) {
+    if (player.devSpeed != undefined) {
         diff *= player.devSpeed;
     }
 
@@ -107,7 +107,3 @@ export async function startGameLoop() {
         intervalID = setInterval(update, 50);
     }
 }
-
-setInterval(() => {
-    state.mouseActivity = [...state.mouseActivity.slice(-7), false];
-}, 1000 * 60 * 60);

src/game/layers.tsx

@@ -1,4 +1,4 @@
-import Modal from "components/modals/Modal.vue";
+import Modal from "components/Modal.vue";
 import type {
     CoercableComponent,
     JSXFunction,

src/game/persistence.ts

@@ -62,8 +62,6 @@ export type State =
     | number
     | boolean
     | DecimalSource
-    | null
-    | undefined
     | { [key: string]: State }
     | { [key: number]: State };
 
@@ -229,7 +227,7 @@ export function noPersist<T extends Persistent<S>, S extends State>(persistent:
                   if (key === PersistentState) {
                       return false;
                   }
-                  if (key === SkipPersistence) {
+                  if (key == SkipPersistence) {
                       return true;
                   }
                   return Reflect.has(target, key);
@@ -281,7 +279,7 @@ globalBus.on("addLayer", (layer: GenericLayer, saveData: Record<string, unknown>
                     // Handle SaveDataPath
                     const newPath = [layer.id, ...path, key];
                     if (
-                        value[SaveDataPath] != null &&
+                        value[SaveDataPath] != undefined &&
                         JSON.stringify(newPath) !== JSON.stringify(value[SaveDataPath])
                     ) {
                         console.error(

src/game/player.ts

@@ -64,8 +64,7 @@ export default window.player = player;
 
 /** Convert a player save data object into a JSON string. Unwraps refs. */
 export function stringifySave(player: Player): string {
-    // Convert undefineds into nulls for proper parsing
+    return JSON.stringify(player, (key, value) => unref(value));
-    return JSON.stringify(player, (key, value) => unref(value) ?? null);
 }
 
 declare global {

src/game/requirements.tsx

@@ -222,9 +222,7 @@ export function createCostRequirement<T extends CostRequirementOptions>(
                 Decimal.gte(
                     req.resource.value,
                     unref(req.cost as ProcessedComputable<DecimalSource>)
-                )
+                ) ? 1 : 0
-                    ? 1
-                    : 0
             );
         }
 

src/game/settings.ts

@@ -3,7 +3,7 @@ import { Themes } from "data/themes";
 import type { CoercableComponent } from "features/feature";
 import { globalBus } from "game/events";
 import LZString from "lz-string";
-import { decodeSave, hardReset } from "util/save";
+import { hardReset } from "util/save";
 import { reactive, watch } from "vue";
 
 /** The player's settings object. */
@@ -20,8 +20,6 @@ export interface Settings {
     unthrottled: boolean;
     /** Whether to align modifiers to the unit. */
     alignUnits: boolean;
-    /** Whether or not to show a video game health warning after playing excessively. */
-    showHealthWarning: boolean;
 }
 
 const state = reactive<Partial<Settings>>({
@@ -30,8 +28,7 @@ const state = reactive<Partial<Settings>>({
     showTPS: true,
     theme: Themes.Nordic,
     unthrottled: false,
-    alignUnits: false,
+    alignUnits: false
-    showHealthWarning: true
 });
 
 watch(
@@ -59,15 +56,12 @@ declare global {
 export default window.settings = state as Settings;
 /** A function that erases all player settings, including all saves. */
 export const hardResetSettings = (window.hardResetSettings = () => {
-    // Only partial because of any properties that are only added during the loadSettings event.
+    const settings = {
-    const settings: Partial<Settings> = {
         active: "",
         saves: [],
         showTPS: true,
         theme: Themes.Nordic,
-        unthrottled: false,
+        alignUnits: false
-        alignUnits: false,
-        showHealthWarning: true
     };
     globalBus.emit("loadSettings", settings);
     Object.assign(state, settings);
@@ -84,8 +78,16 @@ export function loadSettings(): void {
     try {
         let item: string | null = localStorage.getItem(projInfo.id);
         if (item != null && item !== "") {
-            item = decodeSave(item);
+            if (item[0] === "{") {
-            if (item == null) {
+                // plaintext. No processing needed
+            } else if (item[0] === "e") {
+                // Assumed to be base64, which starts with e
+                item = decodeURIComponent(escape(atob(item)));
+            } else if (item[0] === "ᯡ") {
+                // Assumed to be lz, which starts with ᯡ
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                item = LZString.decompressFromUTF16(item)!;
+            } else {
                 console.warn("Unable to determine settings encoding", item);
                 return;
             }

src/game/state.ts

@@ -6,8 +6,6 @@ import type { Persistent } from "./persistence";
 export interface Transient {
     /** A list of the duration, in ms, of the last 10 game ticks. Used for calculating TPS. */
     lastTenTicks: number[];
-    /** A list of bools represnting which of the last few hours had mouse activity. */
-    mouseActivity: boolean[];
     /** Whether or not a NaN value has been detected and undealt with. */
     hasNaN: boolean;
     /** The location within the player save data object of the NaN value. */
@@ -27,7 +25,6 @@ declare global {
 /** The global transient state object. */
 export default window.state = shallowReactive<Transient>({
     lastTenTicks: [],
-    mouseActivity: [false],
     hasNaN: false,
     NaNPath: [],
     errors: reactive([])

src/main.css

@@ -66,7 +66,3 @@ ul {
 .Vue-Toastification__toast {
 	margin: unset;
 }
-
-:disabled {
-	pointer-events: none;
-}

src/main.ts

@@ -8,7 +8,6 @@ import { useRegisterSW } from "virtual:pwa-register/vue";
 import type { App as VueApp } from "vue";
 import { createApp, nextTick } from "vue";
 import { useToast } from "vue-toastification";
-import "util/galaxy";
 
 declare global {
     /**

src/util/break_eternity.ts

@@ -26,7 +26,7 @@ export function exponentialFormat(num: DecimalSource, precision: number, mantiss
 }
 
 export function commaFormat(num: DecimalSource, precision: number): string {
-    if (num == null) {
+    if (num === null || num === undefined) {
         return "NaN";
     }
     num = new Decimal(num);
@@ -36,12 +36,12 @@ export function commaFormat(num: DecimalSource, precision: number): string {
     const init = num.toStringWithDecimalPlaces(precision);
     const portions = init.split(".");
     portions[0] = portions[0].replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1,");
-    if (portions.length === 1) return portions[0];
+    if (portions.length == 1) return portions[0];
     return portions[0] + "." + portions[1];
 }
 
 export function regularFormat(num: DecimalSource, precision: number): string {
-    if (num == null) {
+    if (num === null || num === undefined) {
         return "NaN";
     }
     num = new Decimal(num);

src/util/galaxy.ts

@@ -1,185 +0,0 @@
-import { LoadablePlayerData } from "components/modals/SavesManager.vue";
-import player, { Player, stringifySave } from "game/player";
-import settings from "game/settings";
-import LZString from "lz-string";
-import { GalaxyApi, initGalaxy } from "unofficial-galaxy-sdk";
-import { ref } from "vue";
-import { decodeSave, loadSave, save, setupInitialStore } from "./save";
-
-export const galaxy = ref<GalaxyApi>();
-export const conflictingSaves = ref<
-    { id: string; local: LoadablePlayerData; cloud: LoadablePlayerData; slot: number }[]
->([]);
-export const syncedSaves = ref<string[]>([]);
-
-export function sync() {
-    if (galaxy.value?.loggedIn !== true) {
-        return;
-    }
-    if (conflictingSaves.value.length > 0) {
-        // Pause syncing while resolving conflicted saves
-        return;
-    }
-    galaxy.value
-        .getSaveList()
-        .then(syncSaves)
-        .then(list => {
-            syncedSaves.value = list.map(s => s.content.id);
-        })
-        .catch(console.error);
-}
-
-// Setup Galaxy API
-initGalaxy({
-    supportsSaving: true,
-    supportsSaveManager: true,
-    onLoggedInChanged
-})
-    .then(g => {
-        galaxy.value = g;
-        onLoggedInChanged(g);
-    })
-    .catch(console.error);
-
-function onLoggedInChanged(g: GalaxyApi) {
-    if (g.loggedIn !== true) {
-        return;
-    }
-    if (conflictingSaves.value.length > 0) {
-        // Pause syncing while resolving conflicted saves
-        return;
-    }
-
-    g.getSaveList()
-        .then(list => {
-            const saves = syncSaves(list);
-            syncedSaves.value = saves.map(s => s.content.id);
-
-            // If our current save has under 2 minutes of playtime, load the cloud save with the most recent time.
-            if (player.timePlayed < 120 * 1000 && saves.length > 0) {
-                const longestSave = saves.reduce((acc, curr) =>
-                    acc.content.time < curr.content.time ? curr : acc
-                );
-                loadSave(longestSave.content);
-            }
-        })
-        .catch(console.error);
-
-    setInterval(sync, 60 * 1000);
-}
-
-function syncSaves(
-    list: Record<
-        number,
-        {
-            label: string;
-            content: string;
-        }
-    >
-) {
-    const savesToUpload = new Set(settings.saves.slice());
-    const availableSlots = new Set(new Array(11).fill(0).map((_, i) => i));
-    const saves = (
-        Object.keys(list)
-            .map(slot => {
-                const { label, content } = list[slot as unknown as number];
-                try {
-                    return {
-                        slot: parseInt(slot),
-                        label,
-                        content: JSON.parse(decodeSave(content) ?? "")
-                    };
-                } catch (e) {
-                    return null;
-                }
-            })
-            .filter(
-                n =>
-                    n != null &&
-                    typeof n.content.id === "string" &&
-                    typeof n.content.time === "number" &&
-                    typeof n.content.timePlayed === "number"
-            ) as {
-            slot: number;
-            label?: string;
-            content: Partial<Player> & { id: string; time: number; timePlayed: number };
-        }[]
-    ).filter(cloudSave => {
-        if (cloudSave.label != null) {
-            cloudSave.content.name = cloudSave.label;
-        }
-        availableSlots.delete(cloudSave.slot);
-        const localSaveId = settings.saves.find(id => id === cloudSave.content.id);
-        if (localSaveId == null) {
-            settings.saves.push(cloudSave.content.id);
-            save(setupInitialStore(cloudSave.content));
-        } else {
-            savesToUpload.delete(localSaveId);
-            try {
-                const localSave = JSON.parse(
-                    decodeSave(localStorage.getItem(localSaveId) ?? "") ?? ""
-                ) as Partial<Player> | null;
-                if (localSave == null) {
-                    return false;
-                }
-                localSave.id = localSaveId;
-                localSave.time = localSave.time ?? 0;
-                localSave.timePlayed = localSave.timePlayed ?? 0;
-
-                const timePlayedDiff = Math.abs(
-                    localSave.timePlayed - cloudSave.content.timePlayed
-                );
-                const timeDiff = Math.abs(localSave.time - cloudSave.content.time);
-                // If their last played time and total time played are both within 2 minutes, just use the newer save (very unlikely to be coincidence)
-                // Otherwise, ask the player
-                if (timePlayedDiff < 120 * 1000 && timeDiff < 120 * 1000) {
-                    if (localSave.time < cloudSave.content.time) {
-                        save(setupInitialStore(cloudSave.content));
-                        if (settings.active === localSaveId) {
-                            loadSave(cloudSave.content);
-                        }
-                    } else {
-                        galaxy.value
-                            ?.save(
-                                cloudSave.slot,
-                                LZString.compressToUTF16(
-                                    stringifySave(setupInitialStore(localSave))
-                                ),
-                                localSave.name ?? cloudSave.label
-                            )
-                            .catch(console.error);
-                        // Update cloud save content for the return value
-                        cloudSave.content = localSave as Player;
-                    }
-                } else {
-                    conflictingSaves.value.push({
-                        id: localSaveId,
-                        cloud: cloudSave.content,
-                        local: localSave as LoadablePlayerData,
-                        slot: cloudSave.slot
-                    });
-                }
-            } catch (e) {
-                return false;
-            }
-        }
-        return true;
-    });
-
-    savesToUpload.forEach(id => {
-        try {
-            if (availableSlots.size > 0) {
-                const localSave = localStorage.getItem(id) ?? "";
-                const parsedLocalSave = JSON.parse(decodeSave(localSave) ?? "");
-                const slot = availableSlots.values().next().value;
-                galaxy.value
-                    ?.save(slot, localSave, parsedLocalSave.name)
-                    .then(() => syncedSaves.value.push(parsedLocalSave.id))
-                    .catch(console.error);
-                availableSlots.delete(slot);
-            }
-        } catch (e) {}
-    });
-
-    return saves;
-}

src/util/save.ts

@@ -1,11 +1,10 @@
-import { LoadablePlayerData } from "components/modals/SavesManager.vue";
 import projInfo from "data/projInfo.json";
 import { globalBus } from "game/events";
 import type { Player } from "game/player";
 import player, { stringifySave } from "game/player";
 import settings, { loadSettings } from "game/settings";
 import LZString from "lz-string";
-import { ref, shallowReactive } from "vue";
+import { ref } from "vue";
 
 export function setupInitialStore(player: Partial<Player> = {}): Player {
     return Object.assign(
@@ -43,9 +42,17 @@ export async function load(): Promise<void> {
             await loadSave(newSave());
             return;
         }
-        save = decodeSave(save);
+        if (save[0] === "{") {
-        if (save == null) {
+            // plaintext. No processing needed
-            throw "Unable to determine save encoding";
+        } else if (save[0] === "e") {
+            // Assumed to be base64, which starts with e
+            save = decodeURIComponent(escape(atob(save)));
+        } else if (save[0] === "ᯡ") {
+            // Assumed to be lz, which starts with ᯡ
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            save = LZString.decompressFromUTF16(save)!;
+        } else {
+            throw `Unable to determine save encoding`;
         }
         const player = JSON.parse(save);
         if (player.modID !== projInfo.id) {
@@ -60,23 +67,6 @@ export async function load(): Promise<void> {
     }
 }
 
-export function decodeSave(save: string) {
-    if (save[0] === "{") {
-        // plaintext. No processing needed
-    } else if (save[0] === "e") {
-        // Assumed to be base64, which starts with e
-        save = decodeURIComponent(escape(atob(save)));
-    } else if (save[0] === "ᯡ") {
-        // Assumed to be lz, which starts with ᯡ
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        save = LZString.decompressFromUTF16(save)!;
-    } else {
-        console.warn("Unable to determine preset encoding", save);
-        return null;
-    }
-    return save;
-}
-
 export function newSave(): Player {
     const id = getUniqueID();
     const player = setupInitialStore({ id });
@@ -119,7 +109,7 @@ export async function loadSave(playerObj: Partial<Player>): Promise<void> {
         playerObj.time &&
         playerObj.devSpeed !== 0
     ) {
-        if (playerObj.offlineTime == null) playerObj.offlineTime = 0;
+        if (playerObj.offlineTime == undefined) playerObj.offlineTime = 0;
         playerObj.offlineTime += Math.min(
             playerObj.offlineTime + (Date.now() - playerObj.time) / 1000,
             projInfo.offlineLimit * 3600
@@ -137,40 +127,6 @@ export async function loadSave(playerObj: Partial<Player>): Promise<void> {
     globalBus.emit("onLoad");
 }
 
-const cachedSaves = shallowReactive<Record<string, LoadablePlayerData | undefined>>({});
-export function getCachedSave(id: string) {
-    if (cachedSaves[id] == null) {
-        let save = localStorage.getItem(id);
-        if (save == null) {
-            cachedSaves[id] = { error: `Save doesn't exist in localStorage`, id };
-        } else if (save === "dW5kZWZpbmVk") {
-            cachedSaves[id] = { error: `Save is undefined`, id };
-        } else {
-            try {
-                save = decodeSave(save);
-                if (save == null) {
-                    console.warn("Unable to determine preset encoding", save);
-                    cachedSaves[id] = { error: "Unable to determine preset encoding", id };
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    return cachedSaves[id]!;
-                }
-                cachedSaves[id] = { ...JSON.parse(save), id };
-            } catch (error) {
-                cachedSaves[id] = { error, id };
-                console.warn(`Failed to load info about save with id ${id}:\n${error}\n${save}`);
-            }
-        }
-    }
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    return cachedSaves[id]!;
-}
-export function clearCachedSaves() {
-    Object.keys(cachedSaves).forEach(key => delete cachedSaves[key]);
-}
-export function clearCachedSave(id: string) {
-    cachedSaves[id] = undefined;
-}
-
 setInterval(() => {
     if (player.autosave) {
         save();

src/util/vue.tsx

@@ -191,7 +191,7 @@ export function computeOptionalComponent(
     watchEffect(() => {
         const currComponent = unwrapRef(component);
         comp.value =
-            currComponent === "" || currComponent == null
+            currComponent == "" || currComponent == null
                 ? null
                 : coerceComponent(currComponent, defaultWrapper);
     });

tests/features/hotkey.test.ts

@@ -1,100 +0,0 @@
-import { createHotkey, hotkeys } from "features/hotkey";
-import { afterEach, describe, expect, onTestFailed, test } from "vitest";
-import { Ref, ref } from "vue";
-import "../utils";
-
-function createSuccessHotkey(key: string, triggered: Ref<boolean>) {
-    hotkeys[key] = createHotkey(() => ({
-        description: "",
-        key: key,
-        onPress: () => (triggered.value = true)
-    }));
-}
-
-function createFailHotkey(key: string) {
-    hotkeys[key] = createHotkey(() => ({
-        description: "Fail test",
-        key,
-        onPress: () => expect(true).toBe(false)
-    }));
-}
-
-function mockKeypress(key: string, shiftKey = false, ctrlKey = false) {
-    const event = new KeyboardEvent("keydown", { key, shiftKey, ctrlKey });
-    expect(document.dispatchEvent(event)).toBe(true);
-    return event;
-}
-
-function testHotkey(pass: string, fail: string, key: string, shiftKey = false, ctrlKey = false) {
-    const triggered = ref(false);
-    createSuccessHotkey(pass, triggered);
-    createFailHotkey(fail);
-    mockKeypress(key, shiftKey, ctrlKey);
-    expect(triggered.value).toBe(true);
-}
-
-describe("Hotkeys fire correctly", () => {
-    afterEach(() => {
-        Object.keys(hotkeys).forEach(key => delete hotkeys[key]);
-    });
-
-    test("Lower case letters", () => testHotkey("a", "A", "a"));
-
-    test.each([["A"], ["shift+a"], ["shift+A"]])("Upper case letters using %s as key", key => {
-        testHotkey(key, "a", "A", true);
-    });
-
-    describe.each([
-        [0, ")"],
-        [1, "!"],
-        [2, "@"],
-        [3, "#"],
-        [4, "$"],
-        [5, "%"],
-        [6, "^"],
-        [7, "&"],
-        [8, "*"],
-        [9, "("]
-    ])("Handle number %i and it's 'capital', %s", (number, symbol) => {
-        test("Triggering number", () =>
-            testHotkey(number.toString(), symbol, number.toString(), true));
-        test.each([symbol, `shift+${number}`, `shift+${symbol}`])(
-            "Triggering symbol using %s as key",
-            key => testHotkey(key, number.toString(), symbol, true)
-        );
-    });
-
-    test("Ctrl modifier", () => testHotkey("ctrl+a", "a", "a", false, true));
-
-    test.each(["shift+ctrl+a", "ctrl+shift+a", "shift+ctrl+A", "ctrl+shift+A"])(
-        "Shift and Ctrl modifiers using %s as key",
-        key => {
-            const triggered = ref(false);
-            createSuccessHotkey(key, triggered);
-            createFailHotkey("a");
-            createFailHotkey("A");
-            createFailHotkey("shift+A");
-            createFailHotkey("shift+a");
-            createFailHotkey("ctrl+a");
-            createFailHotkey("ctrl+A");
-            mockKeypress("a", true, true);
-            expect(triggered.value).toBe(true);
-        }
-    );
-
-    test.each(["shift+ctrl+1", "ctrl+shift+1", "shift+ctrl+!", "ctrl+shift+!"])(
-        "Shift and Ctrl modifiers using %s as key",
-        key => {
-            const triggered = ref(false);
-            createSuccessHotkey(key, triggered);
-            createFailHotkey("1");
-            createFailHotkey("!");
-            createFailHotkey("shift+1");
-            createFailHotkey("shift+!");
-            createFailHotkey("ctrl+1");
-            createFailHotkey("ctrl+!");
-            mockKeypress("!", true, true);
-            expect(triggered.value).toBe(true);
-        }
-    );
-});

tests/game/formulas.test.ts

@@ -155,7 +155,7 @@ describe("Formula Equality Checking", () => {
     describe("Formula aliases", () => {
         function testAliases<T extends FormulaFunctions>(
             aliases: T[],
-            args: Parameters<(typeof Formula)[T]>
+            args: Parameters<typeof Formula[T]>
         ) {
             describe(aliases[0], () => {
                 let formula: GenericFormula;
@@ -250,7 +250,7 @@ describe("Creating Formulas", () => {
 
     function checkFormula<T extends FormulaFunctions>(
         functionName: T,
-        args: Readonly<Parameters<(typeof Formula)[T]>>
+        args: Readonly<Parameters<typeof Formula[T]>>
     ) {
         let formula: GenericFormula;
         beforeAll(() => {
@@ -274,7 +274,7 @@ describe("Creating Formulas", () => {
     // It's a lot of tests, but I'd rather be exhaustive
     function testFormulaCall<T extends FormulaFunctions>(
         functionName: T,
-        args: Readonly<Parameters<(typeof Formula)[T]>>
+        args: Readonly<Parameters<typeof Formula[T]>>
     ) {
         if ((functionName === "slog" || functionName === "layeradd") && args[0] === -1) {
             // These cases in particular take a long time, so skip them
@@ -1275,16 +1275,3 @@ describe("Buy Max", () => {
         });
     });
 });
-
-describe("Stringifies", () => {
-    test("Nested formula", () => {
-        const variable = Formula.variable(ref(0));
-        expect(variable.add(5).pow(Formula.constant(10)).stringify()).toBe(
-            "pow(add(x, 5.00), 10.00)"
-        );
-    });
-    test("Indeterminate", () => {
-        expect(Formula.if(10, true, f => f.add(5)).stringify()).toBe("indeterminate");
-        expect(Formula.step(10, 5, f => f.add(5)).stringify()).toBe("indeterminate");
-    });
-});

tests/game/modifiers.test.ts

@@ -1,5 +1,5 @@
 import { CoercableComponent, JSXFunction } from "features/feature";
-import Formula from "game/formulas/formulas";
+import Formula, { printFormula } from "game/formulas/formulas";
 import {
     createAdditiveModifier,
     createExponentialModifier,
@@ -52,7 +52,7 @@ function testModifiers<
             expect(modifier.invert(operation(10, 5))).compare_tolerance(10));
         test("getFormula returns the right formula", () => {
             const value = ref(10);
-            expect(modifier.getFormula(Formula.variable(value)).stringify()).toBe(
+            expect(printFormula(modifier.getFormula(Formula.variable(value)))).toBe(
                 `${operation.name}(x, 5.00)`
             );
         });
@@ -156,7 +156,7 @@ describe("Sequential Modifiers", () => {
             expect(modifier.invert(Decimal.add(10, 5).times(5).pow(5))).compare_tolerance(10));
         test("getFormula returns the right formula", () => {
             const value = ref(10);
-            expect(modifier.getFormula(Formula.variable(value)).stringify()).toBe(
+            expect(printFormula(modifier.getFormula(Formula.variable(value)))).toBe(
                 `pow(mul(add(x, 5.00), 5.00), 5.00)`
             );
         });

tests/utils.ts

@@ -6,11 +6,14 @@ interface CustomMatchers<R = unknown> {
     toLogError(): R;
 }
 
-declare module "vitest" {
+declare global {
+    // eslint-disable-next-line @typescript-eslint/no-namespace
+    namespace Vi {
         // eslint-disable-next-line @typescript-eslint/no-empty-interface
         interface Assertion extends CustomMatchers {}
         // eslint-disable-next-line @typescript-eslint/no-empty-interface
         interface AsymmetricMatchersContaining extends CustomMatchers {}
+    }
 }
 
 expect.extend({