@@ -73,16 +78,18 @@
import Tooltip from "features/tooltips/Tooltip.vue";
import player from "game/player";
import { Direction } from "util/common";
-import { computed, ref, toRefs, watch } from "vue";
-import DangerButton from "./fields/DangerButton.vue";
-import FeedbackButton from "./fields/FeedbackButton.vue";
-import Text from "./fields/Text.vue";
+import { computed, ref, toRefs, unref, watch } from "vue";
+import DangerButton from "../fields/DangerButton.vue";
+import FeedbackButton from "../fields/FeedbackButton.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 } = toRefs(_props);
+const { save, readonly } = toRefs(_props);
const emit = defineEmits<{
(e: "export"): void;
(e: "open"): void;
@@ -106,10 +113,18 @@ const newName = ref("");
watch(isEditing, () => (newName.value = save.value.name ?? ""));
-const isActive = computed(() => save.value != null && save.value.id === player.id);
+const isActive = computed(
+ () => 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);
@@ -139,6 +154,13 @@ function changeName() {
padding-left: 0;
}
+.open:disabled {
+ cursor: inherit;
+ color: var(--foreground);
+ opacity: 1;
+ pointer-events: none;
+}
+
.handle {
flex-grow: 0;
margin-right: 8px;
@@ -152,6 +174,10 @@ function changeName() {
margin-right: 80px;
}
+.save.readonly .details {
+ margin-right: 0;
+}
+
.error {
font-size: 0.8em;
color: var(--danger);
@@ -176,6 +202,17 @@ function changeName() {
.editname {
margin: 0;
}
+
+.time {
+ font-size: small;
+}
+
+.synced {
+ font-size: 100%;
+ margin-right: 0.5em;
+ vertical-align: middle;
+ cursor: default;
+}
diff --git a/src/components/SavesManager.vue b/src/components/saves/SavesManager.vue
similarity index 70%
rename from src/components/SavesManager.vue
rename to src/components/saves/SavesManager.vue
index b1bf7e0..4edb2e0 100644
--- a/src/components/SavesManager.vue
+++ b/src/components/saves/SavesManager.vue
@@ -4,6 +4,9 @@
Saves Manager
+
+ Not all saves are synced! You may need to delete stale saves.
+
, "id"> & { id: string; error?: unknown };
@@ -90,16 +103,8 @@ watch(saveToImport, importedSave => {
if (importedSave) {
nextTick(() => {
try {
- if (importedSave[0] === "{") {
- // 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 {
+ importedSave = decodeSave(importedSave) ?? "";
+ if (importedSave === "") {
console.warn("Unable to determine preset encoding", importedSave);
importingFailed.value = true;
return;
@@ -139,48 +144,10 @@ let bank = ref(
}, [])
);
-const cachedSaves = shallowReactive>({});
-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) {
- Object.keys(cachedSaves).forEach(key => delete cachedSaves[key]);
+ clearCachedSaves();
}
});
@@ -191,6 +158,10 @@ 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) {
@@ -233,20 +204,37 @@ 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);
- cachedSaves[id] = undefined;
+ clearCachedSave(id);
}
function openSave(id: string) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
saves.value[player.id]!.time = player.time;
save();
- cachedSaves[player.id] = undefined;
+ clearCachedSave(player.id);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
loadSave(saves.value[id]!);
// Delete cached version in case of opening it again
- cachedSaves[id] = undefined;
+ clearCachedSave(id);
}
function newFromPreset(preset: string) {
@@ -256,16 +244,8 @@ function newFromPreset(preset: string) {
selectedPreset.value = null;
});
- if (preset[0] === "{") {
- // 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 {
+ preset = decodeSave(preset) ?? "";
+ if (preset === "") {
console.warn("Unable to determine preset encoding", preset);
return;
}
@@ -287,7 +267,7 @@ function editSave(id: string, newName: string) {
save();
} else {
save(currSave as Player);
- cachedSaves[id] = undefined;
+ clearCachedSave(id);
}
}
}
diff --git a/src/data/common.tsx b/src/data/common.tsx
index 4be7004..c1286a2 100644
--- a/src/data/common.tsx
+++ b/src/data/common.tsx
@@ -134,8 +134,8 @@ export function createResetButton (
<>
- {player.devSpeed === 0 ? Game Paused
: null}
+ {player.devSpeed === 0 ? (
+
+ Game Paused
+
+
+ ) : null}
{player.devSpeed != null && player.devSpeed !== 0 && player.devSpeed !== 1 ? (
- Dev Speed: {format(player.devSpeed)}x
+
+ Dev Speed: {format(player.devSpeed)}x
+
+
) : null}
{player.offlineTime != null && player.offlineTime !== 0 ? (
- Offline Time: {formatTime(player.offlineTime)}
+
+ Offline Time: {formatTime(player.offlineTime)}
+
+
) : null}
{Decimal.lt(points.value, "1e1000") ? You have : null}
{format(points.value)}
{Decimal.lt(points.value, "1e1e6") ? points : null}
- {Decimal.gt(pointGain.value, 0) ? ({oomps.value})
: null}
+ {Decimal.gt(pointGain.value, 0) ? (
+
+ ({oomps.value})
+
+
+ ) : null}
{render(tree)}
diff --git a/src/features/action.tsx b/src/features/action.tsx
index 1fbb8d3..2919a9e 100644
--- a/src/features/action.tsx
+++ b/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 { Decorator, GenericDecorator } from "./decorators/common";
+import { GenericDecorator } from "./decorators/common";
/** A symbol used to identify {@link Action} features. */
export const ActionType = Symbol("Action");
diff --git a/src/features/hotkey.tsx b/src/features/hotkey.tsx
index 51fafbb..80eebbd 100644
--- a/src/features/hotkey.tsx
+++ b/src/features/hotkey.tsx
@@ -108,7 +108,7 @@ document.onkeydown = function (e) {
if (e.ctrlKey) {
key = "ctrl+" + key;
}
- const hotkey = hotkeys[key];
+ const hotkey = hotkeys[key] ?? hotkeys[key.toLowerCase()];
if (hotkey && unref(hotkey.enabled)) {
e.preventDefault();
hotkey.onPress();
diff --git a/src/features/tooltips/tooltip.ts b/src/features/tooltips/tooltip.ts
index 54d782c..8d65efd 100644
--- a/src/features/tooltips/tooltip.ts
+++ b/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 { deletePersistent, Persistent, persistent } from "game/persistence";
+import { persistent } from "game/persistence";
import { Direction } from "util/common";
import type {
Computable,
diff --git a/src/features/trees/tree.ts b/src/features/trees/tree.ts
index da77f60..5a03189 100644
--- a/src/features/trees/tree.ts
+++ b/src/features/trees/tree.ts
@@ -1,4 +1,4 @@
-import { Decorator, GenericDecorator } from "features/decorators/common";
+import { GenericDecorator } from "features/decorators/common";
import type {
CoercableComponent,
GenericComponent,
@@ -224,7 +224,7 @@ export interface BaseTree {
id: string;
/** The link objects for each of the branches of the tree. */
links: Ref;
- /** Cause a reset on this node and propagate it through the tree according to {@link resetPropagation}. */
+ /** Cause a reset on this node and propagate it through the tree according to {@link TreeOptions.resetPropagation}. */
reset: (node: GenericTreeNode) => void;
/** A flag that is true while the reset is still propagating through the tree. */
isResetting: Ref;
@@ -338,34 +338,21 @@ export const branchedResetPropagation = function (
tree: GenericTree,
resettingNode: GenericTreeNode
): void {
- const visitedNodes = [resettingNode];
- let currentNodes = [resettingNode];
- if (tree.branches != null) {
- const branches = unref(tree.branches);
- while (currentNodes.length > 0) {
- const nextNodes: GenericTreeNode[] = [];
- currentNodes.forEach(node => {
- branches
- .filter(branch => branch.startNode === node || branch.endNode === node)
- .map(branch => {
- if (branch.startNode === node) {
- return branch.endNode;
- }
- return branch.startNode;
- })
- .filter(node => !visitedNodes.includes(node))
- .forEach(node => {
- // Check here instead of in the filter because this check's results may
- // change as we go through each node
- if (!nextNodes.includes(node)) {
- nextNodes.push(node);
- node.reset?.reset();
- }
- });
- });
- currentNodes = nextNodes;
- visitedNodes.push(...currentNodes);
+ const links = unref(tree.branches);
+ if (links == null) return;
+ const reset: GenericTreeNode[] = [];
+ let current = [resettingNode];
+ 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;
+ next.push(link.endNode);
+ link.endNode.reset?.reset();
+ }
}
+ reset.push(...current);
+ current = next;
}
};
diff --git a/src/game/formulas/operations.ts b/src/game/formulas/operations.ts
index 586319e..7210cfb 100644
--- a/src/game/formulas/operations.ts
+++ b/src/game/formulas/operations.ts
@@ -552,7 +552,9 @@ 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)) {
@@ -576,6 +578,7 @@ export function invertIteratedExp(
value: DecimalSource,
lhs: FormulaSource,
height: FormulaSource,
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
payload: FormulaSource
) {
if (hasVariable(lhs)) {
@@ -626,6 +629,7 @@ export function invertLayeradd(
value: DecimalSource,
lhs: FormulaSource,
diff: FormulaSource,
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
base: FormulaSource
) {
if (hasVariable(lhs)) {
diff --git a/src/game/modifiers.tsx b/src/game/modifiers.tsx
index b65e7fc..55efccb 100644
--- a/src/game/modifiers.tsx
+++ b/src/game/modifiers.tsx
@@ -4,7 +4,7 @@ import { jsx } from "features/feature";
import settings from "game/settings";
import type { DecimalSource } from "util/bignum";
import Decimal, { formatSmall } from "util/bignum";
-import type { WithRequired } from "util/common";
+import type { RequiredKeys, WithRequired } from "util/common";
import type { Computable, ProcessedComputable } from "util/computed";
import { convertComputable } from "util/computed";
import { createLazyProxy } from "util/proxies";
@@ -38,16 +38,11 @@ export interface Modifier {
description?: ProcessedComputable;
}
-/**
- * Utility type used to narrow down a modifier type that will have a description and/or enabled property based on optional parameters, T and S (respectively).
- */
-export type ModifierFromOptionalParams = undefined extends T
- ? undefined extends S
- ? Omit, "description" | "enabled">
- : Omit, "description">
- : undefined extends S
- ? Omit, "enabled">
- : WithRequired;
+/** Utility type that represents the output of all modifiers that represent a single operation. */
+export type OperationModifier = WithRequired<
+ Modifier,
+ "invert" | "getFormula" | Extract, keyof Modifier>
+>;
/** An object that configures an additive modifier via {@link createAdditiveModifier}. */
export interface AdditiveModifierOptions {
@@ -65,9 +60,9 @@ export interface AdditiveModifierOptions {
* Create a modifier that adds some value to the input value.
* @param optionsFunc Additive modifier options.
*/
-export function createAdditiveModifier(
+export function createAdditiveModifier>(
optionsFunc: OptionsFunc
-): ModifierFromOptionalParams {
+) {
return createLazyProxy(feature => {
const { addend, description, enabled, smallerIsBetter } = optionsFunc.call(
feature,
@@ -111,7 +106,7 @@ export function createAdditiveModifier(
))
};
- }) as unknown as ModifierFromOptionalParams