diff --git a/src/components/Layer.vue b/src/components/Layer.vue index a546150..c2232a8 100644 --- a/src/components/Layer.vue +++ b/src/components/Layer.vue @@ -24,7 +24,7 @@ import projInfo from "data/projInfo.json"; import { CoercableComponent, StyleValue } from "features/feature"; import { FeatureNode } from "game/layers"; -import { PersistentRef } from "game/persistence"; +import { Persistent } from "game/persistence"; import player from "game/player"; import { computeComponent, processedPropType, wrapRef } from "util/vue"; import { computed, defineComponent, nextTick, PropType, Ref, ref, toRefs, unref, watch } from "vue"; @@ -46,7 +46,7 @@ export default defineComponent({ required: true }, minimized: { - type: Object as PropType>, + type: Object as PropType>, required: true }, minWidth: { diff --git a/src/features/reset.ts b/src/features/reset.ts index 082c7ca..cc3687e 100644 --- a/src/features/reset.ts +++ b/src/features/reset.ts @@ -1,13 +1,7 @@ import { getUniqueID, Replace } from "features/feature"; import { globalBus } from "game/events"; import { GenericLayer } from "game/layers"; -import { - DefaultValue, - Persistent, - persistent, - PersistentRef, - PersistentState -} from "game/persistence"; +import { DefaultValue, Persistent, persistent, PersistentState } from "game/persistence"; import Decimal from "util/bignum"; import { Computable, GetComputableType, processComputable } from "util/computed"; import { createLazyProxy } from "util/proxies"; @@ -70,7 +64,7 @@ export function createReset( } const listeners: Record = {}; -export function trackResetTime(layer: GenericLayer, reset: GenericReset): PersistentRef { +export function trackResetTime(layer: GenericLayer, reset: GenericReset): Persistent { const resetTime = persistent(new Decimal(0)); listeners[layer.id] = layer.on("preUpdate", diff => { resetTime.value = Decimal.add(resetTime.value, diff);