From 46306ee0e7ee50cea8a18e8fb97ad7f77fbcfd7e Mon Sep 17 00:00:00 2001
From: ducdat0507 <62660527+ducdat0507@users.noreply.github.com>
Date: Fri, 19 May 2023 17:12:53 +0700
Subject: [PATCH 01/33] Fix repeatables buying more than intended when
 `cumulativeCost` is `false`

---
 src/game/formulas/formulas.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/game/formulas/formulas.ts b/src/game/formulas/formulas.ts
index d9a6bed..ee0405d 100644
--- a/src/game/formulas/formulas.ts
+++ b/src/game/formulas/formulas.ts
@@ -1453,7 +1453,9 @@ export function calculateMaxAffordable(
                     formula.invertIntegral(Decimal.add(resource.value, formula.evaluateIntegral()))
                 ).sub(unref(formula.innermostVariable) ?? 0);
             } else {
-                affordable = Decimal.floor(formula.invert(resource.value));
+                affordable = Decimal.floor(
+                    formula.invert(resource.value)
+                ).add(1).sub(unref(formula.innermostVariable) ?? 0);
             }
         }
         affordable = Decimal.clampMax(affordable, maxBulkAmount);

From e896fd84cffadad1de05fe6b498b46c09926745a Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Fri, 19 May 2023 08:04:04 -0500
Subject: [PATCH 02/33] Change formula testing values to hopefully catch any
 other miscalculations

---
 tests/game/formulas.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/game/formulas.test.ts b/tests/game/formulas.test.ts
index a36d099..5209ff8 100644
--- a/tests/game/formulas.test.ts
+++ b/tests/game/formulas.test.ts
@@ -13,7 +13,7 @@ import { InvertibleIntegralFormula } from "game/formulas/types";
 
 type FormulaFunctions = keyof GenericFormula & keyof typeof Formula & keyof typeof Decimal;
 
-const testValues = [-1, "0", Decimal.dOne] as const;
+const testValues = [-2, "0", new Decimal(10.5)] as const;
 
 const invertibleZeroParamFunctionNames = [
     "neg",

From 210c2290f05c2125f70381f0c20a31b94d8ed7e1 Mon Sep 17 00:00:00 2001
From: Anthony Lawn <thepaperpilot@gmail.com>
Date: Fri, 19 May 2023 10:12:24 -0500
Subject: [PATCH 03/33] Fix #9

---
 src/game/requirements.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/requirements.tsx b/src/game/requirements.tsx
index 60f0e20..ea82a64 100644
--- a/src/game/requirements.tsx
+++ b/src/game/requirements.tsx
@@ -222,7 +222,7 @@ export function createCostRequirement<T extends CostRequirementOptions>(
                 Decimal.gte(
                     req.resource.value,
                     unref(req.cost as ProcessedComputable<DecimalSource>)
-                )
+                ) ? 1 : 0
             );
         }
 

From d6c9f95851d39c53d49f4961d0d880ee5a91b8bb Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sat, 20 May 2023 08:28:27 -0500
Subject: [PATCH 04/33] Fix error about pinnable tooltips

---
 src/data/layers/prestige.tsx     |  3 ++-
 src/features/tooltips/tooltip.ts | 12 ------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/data/layers/prestige.tsx b/src/data/layers/prestige.tsx
index 30fe99f..6e3cb69 100644
--- a/src/data/layers/prestige.tsx
+++ b/src/data/layers/prestige.tsx
@@ -37,7 +37,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         color,
         reset
     }));
-    addTooltip(treeNode, {
+    const tooltip = addTooltip(treeNode, {
         display: createResourceTooltip(points),
         pinnable: true
     });
@@ -58,6 +58,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         name,
         color,
         points,
+        tooltip,
         display: jsx(() => (
             <>
                 <MainDisplay resource={points} color={color} />
diff --git a/src/features/tooltips/tooltip.ts b/src/features/tooltips/tooltip.ts
index b5b1042..54d782c 100644
--- a/src/features/tooltips/tooltip.ts
+++ b/src/features/tooltips/tooltip.ts
@@ -95,18 +95,6 @@ export function addTooltip<T extends TooltipOptions>(
     }
 
     nextTick(() => {
-        if (options.pinnable) {
-            if ("pinned" in element) {
-                console.error(
-                    "Cannot add pinnable tooltip to element that already has a property called 'pinned'"
-                );
-                options.pinnable = false;
-                deletePersistent(options.pinned as Persistent<boolean>);
-            } else {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                (element as any).pinned = options.pinned;
-            }
-        }
         const elementComponent = element[Component];
         element[Component] = TooltipComponent as GenericComponent;
         const elementGatherProps = element[GatherProps].bind(element);

From 63dcad4c1225883f846311c025480fecd1882f09 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sat, 20 May 2023 08:30:07 -0500
Subject: [PATCH 05/33] Fix requirements tests

---
 tests/game/requirements.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/game/requirements.test.ts b/tests/game/requirements.test.ts
index f6143ca..8ee3c43 100644
--- a/tests/game/requirements.test.ts
+++ b/tests/game/requirements.test.ts
@@ -83,7 +83,7 @@ describe("Creating cost requirement", () => {
             cost: 10,
             cumulativeCost: false
         }));
-        expect(unref(requirement.requirementMet)).toBe(true);
+        expect(unref(requirement.requirementMet)).toBe(1);
     });
 
     test("Requirement not met when not meeting the cost", () => {
@@ -92,7 +92,7 @@ describe("Creating cost requirement", () => {
             cost: 100,
             cumulativeCost: false
         }));
-        expect(unref(requirement.requirementMet)).toBe(false);
+        expect(unref(requirement.requirementMet)).toBe(0);
     });
 
     describe("canMaximize works correctly", () => {

From c8ba77b89b359881a4d85551b5249e278208091f Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sat, 20 May 2023 21:24:59 -0500
Subject: [PATCH 06/33] Fix Direction.Left bars

---
 src/features/bars/Bar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/features/bars/Bar.vue b/src/features/bars/Bar.vue
index 89315bb..4d7bb16 100644
--- a/src/features/bars/Bar.vue
+++ b/src/features/bars/Bar.vue
@@ -120,7 +120,7 @@ export default defineComponent({
                     barStyle.clipPath = `inset(0% ${normalizedProgress.value}% 0% 0%)`;
                     break;
                 case Direction.Left:
-                    barStyle.clipPath = `inset(0% 0% 0% ${normalizedProgress.value} + '%)`;
+                    barStyle.clipPath = `inset(0% 0% 0% ${normalizedProgress.value}%)`;
                     break;
                 case Direction.Default:
                     barStyle.clipPath = "inset(0% 50% 0% 0%)";

From e0f1296b35f68d30805c691d995fd1d9f23872a0 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sat, 20 May 2023 21:56:46 -0500
Subject: [PATCH 07/33] Rename "The Paper Pilot Community" to "Profectus &
 Friends"

---
 src/components/Info.vue      | 2 +-
 src/components/NaNScreen.vue | 2 +-
 src/components/Nav.vue       | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/components/Info.vue b/src/components/Info.vue
index 9dd0c2d..15395bf 100644
--- a/src/components/Info.vue
+++ b/src/components/Info.vue
@@ -38,7 +38,7 @@
                         target="_blank"
                     >
                         <span class="material-icons info-modal-discord">discord</span>
-                        The Paper Pilot Community
+                        Profectus & Friends
                     </a>
                 </div>
                 <div>
diff --git a/src/components/NaNScreen.vue b/src/components/NaNScreen.vue
index de69d5b..f9c7b6f 100644
--- a/src/components/NaNScreen.vue
+++ b/src/components/NaNScreen.vue
@@ -19,7 +19,7 @@
                     class="nan-modal-discord-link"
                 >
                     <span class="material-icons nan-modal-discord">discord</span>
-                    {{ discordName || "The Paper Pilot Community" }}
+                    {{ discordName || "Profectus & Friends" }}
                 </a>
             </div>
             <br />
diff --git a/src/components/Nav.vue b/src/components/Nav.vue
index a71f15d..c5d0026 100644
--- a/src/components/Nav.vue
+++ b/src/components/Nav.vue
@@ -15,9 +15,7 @@
                     <a :href="discordLink" target="_blank">{{ discordName }}</a>
                 </li>
                 <li>
-                    <a href="https://discord.gg/yJ4fjnjU54" target="_blank"
-                        >The Paper Pilot Community</a
-                    >
+                    <a href="https://discord.gg/yJ4fjnjU54" target="_blank">Profectus & Friends</a>
                 </li>
                 <li>
                     <a href="https://discord.gg/F3xveHV" target="_blank">The Modding Tree</a>
@@ -82,9 +80,7 @@
                     <a :href="discordLink" target="_blank">{{ discordName }}</a>
                 </li>
                 <li>
-                    <a href="https://discord.gg/yJ4fjnjU54" target="_blank"
-                        >The Paper Pilot Community</a
-                    >
+                    <a href="https://discord.gg/yJ4fjnjU54" target="_blank">Profectus & Friends</a>
                 </li>
                 <li>
                     <a href="https://discord.gg/F3xveHV" target="_blank">The Modding Tree</a>

From 6ad08c405255b60c68fb80cef1c179c5c4e0d93a Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 21 May 2023 17:27:04 -0500
Subject: [PATCH 08/33] Fix camelCase props not working on links

---
 src/features/boards/BoardLink.vue | 5 ++++-
 src/features/links/Link.vue       | 5 ++++-
 src/util/common.ts                | 5 +++++
 src/util/vue.tsx                  | 8 ++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/features/boards/BoardLink.vue b/src/features/boards/BoardLink.vue
index 1f5ca17..30e5748 100644
--- a/src/features/boards/BoardLink.vue
+++ b/src/features/boards/BoardLink.vue
@@ -1,7 +1,7 @@
 <template>
     <line
         class="link"
-        v-bind="link"
+        v-bind="linkProps"
         :class="{ pulsing: link.pulsing }"
         :x1="startPosition.x"
         :y1="startPosition.y"
@@ -12,6 +12,7 @@
 
 <script setup lang="ts">
 import type { BoardNode, BoardNodeLink } from "features/boards/board";
+import { kebabifyObject } from "util/vue";
 import { computed, toRefs, unref } from "vue";
 
 const _props = defineProps<{
@@ -49,6 +50,8 @@ const endPosition = computed(() => {
     }
     return position;
 });
+
+const linkProps = computed(() => kebabifyObject(_props.link as unknown as Record<string, unknown>));
 </script>
 
 <style scoped>
diff --git a/src/features/links/Link.vue b/src/features/links/Link.vue
index f7b9580..815f511 100644
--- a/src/features/links/Link.vue
+++ b/src/features/links/Link.vue
@@ -2,7 +2,7 @@
     <line
         stroke-width="15px"
         stroke="white"
-        v-bind="link"
+        v-bind="linkProps"
         :x1="startPosition.x"
         :y1="startPosition.y"
         :x2="endPosition.x"
@@ -13,6 +13,7 @@
 <script setup lang="ts">
 import type { Link } from "features/links/links";
 import type { FeatureNode } from "game/layers";
+import { kebabifyObject } from "util/vue";
 import { computed, toRefs } from "vue";
 
 const _props = defineProps<{
@@ -54,4 +55,6 @@ const endPosition = computed(() => {
     }
     return position;
 });
+
+const linkProps = computed(() => kebabifyObject(_props.link as unknown as Record<string, unknown>));
 </script>
diff --git a/src/util/common.ts b/src/util/common.ts
index d7560dd..dbbe233 100644
--- a/src/util/common.ts
+++ b/src/util/common.ts
@@ -12,6 +12,11 @@ export function camelToTitle(camel: string): string {
     return title;
 }
 
+export function camelToKebab(camel: string) {
+    // Split off first character so function works on upper camel (pascal) case
+    return (camel[0] + camel.slice(1).replace(/[A-Z]/g, c => `-${c}`)).toLowerCase();
+}
+
 export function isFunction<T, S extends ReadonlyArray<unknown>, R>(
     functionOrValue: ((...args: S) => T) | R
 ): functionOrValue is (...args: S) => T {
diff --git a/src/util/vue.tsx b/src/util/vue.tsx
index a3897a5..3ba5f06 100644
--- a/src/util/vue.tsx
+++ b/src/util/vue.tsx
@@ -21,6 +21,7 @@ import {
     unref,
     watchEffect
 } from "vue";
+import { camelToKebab } from "./common";
 
 export function coerceComponent(
     component: CoercableComponent,
@@ -241,3 +242,10 @@ export function trackHover(element: VueFeature): Ref<boolean> {
 
     return isHovered;
 }
+
+export function kebabifyObject(object: Record<string, unknown>) {
+    return Object.keys(object).reduce((acc, curr) => {
+        acc[camelToKebab(curr)] = object[curr];
+        return acc;
+    }, {} as Record<string, unknown>);
+}

From 9edda4d957def8db36007958b387f3c278ad2b21 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Mon, 22 May 2023 21:15:55 -0500
Subject: [PATCH 09/33] Make links ignore pointer events

---
 src/features/boards/BoardLink.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/features/boards/BoardLink.vue b/src/features/boards/BoardLink.vue
index 30e5748..5dacc66 100644
--- a/src/features/boards/BoardLink.vue
+++ b/src/features/boards/BoardLink.vue
@@ -57,6 +57,7 @@ const linkProps = computed(() => kebabifyObject(_props.link as unknown as Record
 <style scoped>
 .link {
     transition-duration: 0s;
+    pointer-events: none;
 }
 
 .link.pulsing {

From eee5ac3e2de292636a982500c3822a605dfd9d09 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Tue, 30 May 2023 22:52:24 -0500
Subject: [PATCH 10/33] Fix passthroughs for inversions and make more
 operations invertible

---
 src/game/formulas/formulas.ts   | 26 +++++++++++++++++++++-----
 src/game/formulas/operations.ts | 17 ++++++++++++++++-
 tests/game/formulas.test.ts     | 24 ++++++++++++++----------
 3 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/src/game/formulas/formulas.ts b/src/game/formulas/formulas.ts
index d9a6bed..7f88d0c 100644
--- a/src/game/formulas/formulas.ts
+++ b/src/game/formulas/formulas.ts
@@ -345,19 +345,35 @@ export abstract class InternalFormula<T extends [FormulaSource] | FormulaSource[
     public static sgn = InternalFormula.sign;
 
     public static round(value: FormulaSource) {
-        return new Formula({ inputs: [value], evaluate: Decimal.round });
+        return new Formula({
+            inputs: [value],
+            evaluate: Decimal.round,
+            invert: ops.invertPassthrough
+        });
     }
 
     public static floor(value: FormulaSource) {
-        return new Formula({ inputs: [value], evaluate: Decimal.floor });
+        return new Formula({
+            inputs: [value],
+            evaluate: Decimal.floor,
+            invert: ops.invertPassthrough
+        });
     }
 
     public static ceil(value: FormulaSource) {
-        return new Formula({ inputs: [value], evaluate: Decimal.ceil });
+        return new Formula({
+            inputs: [value],
+            evaluate: Decimal.ceil,
+            invert: ops.invertPassthrough
+        });
     }
 
     public static trunc(value: FormulaSource) {
-        return new Formula({ inputs: [value], evaluate: Decimal.trunc });
+        return new Formula({
+            inputs: [value],
+            evaluate: Decimal.trunc,
+            invert: ops.invertPassthrough
+        });
     }
 
     public static add<T extends GenericFormula>(value: T, other: FormulaSource): T;
@@ -459,7 +475,7 @@ export abstract class InternalFormula<T extends [FormulaSource] | FormulaSource[
         return new Formula({
             inputs: [value, min, max],
             evaluate: Decimal.clamp,
-            invert: ops.passthrough as InvertFunction<[FormulaSource, FormulaSource, FormulaSource]>
+            invert: ops.invertPassthrough
         });
     }
 
diff --git a/src/game/formulas/operations.ts b/src/game/formulas/operations.ts
index e8bd04d..586319e 100644
--- a/src/game/formulas/operations.ts
+++ b/src/game/formulas/operations.ts
@@ -1,6 +1,12 @@
 import Decimal, { DecimalSource } from "util/bignum";
 import Formula, { hasVariable, unrefFormulaSource } from "./formulas";
-import { FormulaSource, GenericFormula, InvertFunction, SubstitutionStack } from "./types";
+import {
+    FormulaSource,
+    GenericFormula,
+    InvertFunction,
+    InvertibleFormula,
+    SubstitutionStack
+} from "./types";
 
 const ln10 = Decimal.ln(10);
 
@@ -8,6 +14,15 @@ export function passthrough<T extends GenericFormula | DecimalSource>(value: T):
     return value;
 }
 
+export function invertPassthrough(value: DecimalSource, ...inputs: FormulaSource[]) {
+    const variable = inputs.find(input => hasVariable(input)) as InvertibleFormula | undefined;
+    if (variable == null) {
+        console.error("Could not invert due to no input being a variable");
+        return 0;
+    }
+    return variable.invert(value);
+}
+
 export function invertNeg(value: DecimalSource, lhs: FormulaSource) {
     if (hasVariable(lhs)) {
         return lhs.invert(Decimal.neg(value));
diff --git a/tests/game/formulas.test.ts b/tests/game/formulas.test.ts
index 5209ff8..98bb82d 100644
--- a/tests/game/formulas.test.ts
+++ b/tests/game/formulas.test.ts
@@ -16,6 +16,10 @@ type FormulaFunctions = keyof GenericFormula & keyof typeof Formula & keyof type
 const testValues = [-2, "0", new Decimal(10.5)] as const;
 
 const invertibleZeroParamFunctionNames = [
+    "round",
+    "floor",
+    "ceil",
+    "trunc",
     "neg",
     "recip",
     "log10",
@@ -48,10 +52,6 @@ const invertibleZeroParamFunctionNames = [
 const nonInvertibleZeroParamFunctionNames = [
     "abs",
     "sign",
-    "round",
-    "floor",
-    "ceil",
-    "trunc",
     "pLog10",
     "absLog10",
     "factorial",
@@ -85,6 +85,10 @@ const integrableZeroParamFunctionNames = [
 ] as const;
 const nonIntegrableZeroParamFunctionNames = [
     ...nonInvertibleZeroParamFunctionNames,
+    "round",
+    "floor",
+    "ceil",
+    "trunc",
     "lambertw",
     "ssqrt"
 ] as const;
@@ -151,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;
@@ -246,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(() => {
@@ -270,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
@@ -488,18 +492,18 @@ describe("Inverting", () => {
     });
 
     test("Inverting nested formulas", () => {
-        const formula = Formula.add(variable, constant).times(constant);
+        const formula = Formula.add(variable, constant).times(constant).floor();
         expect(formula.invert(100)).compare_tolerance(0);
     });
 
     describe("Inverting with non-invertible sections", () => {
         test("Non-invertible constant", () => {
-            const formula = Formula.add(variable, constant.ceil());
+            const formula = Formula.add(variable, constant.sign());
             expect(formula.isInvertible()).toBe(true);
             expect(() => formula.invert(10)).not.toLogError();
         });
         test("Non-invertible variable", () => {
-            const formula = Formula.add(variable.ceil(), constant);
+            const formula = Formula.add(variable.sign(), constant);
             expect(formula.isInvertible()).toBe(false);
             expect(() => formula.invert(10)).toLogError();
         });

From 3fe03113311e738186dfa208e7a9b0923aae0e0d Mon Sep 17 00:00:00 2001
From: Anthony Lawn <thepaperpilot@gmail.com>
Date: Fri, 9 Jun 2023 15:43:25 -0500
Subject: [PATCH 11/33] Try to allow actions to be run manually

---
 .github/workflows/deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f4210ed..8293b9e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - 'main'
+  workflow_dispatch:
 jobs:
   build-and-deploy:
     if: github.repository != 'profectus-engine/Profectus' # Don't build placeholder mod on main repo

From d0fffd3b89aa6dbecf689bbb30cb0a6621afa24d Mon Sep 17 00:00:00 2001
From: Anthony Lawn <thepaperpilot@gmail.com>
Date: Fri, 9 Jun 2023 15:45:56 -0500
Subject: [PATCH 12/33] Update test.yml

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c6b970d..de6f71a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,4 +1,4 @@
-name: Build and Deploy
+name: Run Tests
 on:
   push:
     branches: [ main ]

From 0cccf7aeccdc7a922ff92d8a149ab05db8d27ffe Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Wed, 11 Oct 2023 21:39:01 -0500
Subject: [PATCH 13/33] Add isRendered utility

---
 src/data/common.tsx | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/data/common.tsx b/src/data/common.tsx
index c81fa0d..e5b1fce 100644
--- a/src/data/common.tsx
+++ b/src/data/common.tsx
@@ -9,6 +9,7 @@ import { Resource, displayResource } from "features/resources/resource";
 import type { GenericTree, GenericTreeNode, TreeNode, TreeNodeOptions } from "features/trees/tree";
 import { createTreeNode } from "features/trees/tree";
 import type { GenericFormula } from "game/formulas/types";
+import { BaseLayer } from "game/layers";
 import type { Modifier } from "game/modifiers";
 import type { Persistent } from "game/persistence";
 import { DefaultValue, persistent } from "game/persistence";
@@ -485,3 +486,16 @@ export function createFormulaPreview(
         return <>{formatSmall(formula.evaluate())}</>;
     });
 }
+
+/**
+ * Utility function for getting a computed boolean for whether or not a given feature is currently rendered in the DOM.
+ * Note it will have a true value even if the feature is off screen.
+ * @param layer The layer the feature appears within
+ * @param id The ID of the feature
+ */
+export function isRendered(layer: BaseLayer, id: string): ComputedRef<boolean>;
+export function isRendered(layer: BaseLayer, feature: { id: string }): ComputedRef<boolean>;
+export function isRendered(layer: BaseLayer, idOrFeature: string | { id: string }) {
+    const id = typeof idOrFeature === "string" ? idOrFeature : idOrFeature.id;
+    return computed(() => id in layer.nodes.value);
+}

From a5204106aa09a15709828e234ad2cd49c8803fa7 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Wed, 11 Oct 2023 21:44:02 -0500
Subject: [PATCH 14/33] Forgot to comment the other signature

---
 src/data/common.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/data/common.tsx b/src/data/common.tsx
index e5b1fce..4be7004 100644
--- a/src/data/common.tsx
+++ b/src/data/common.tsx
@@ -494,6 +494,12 @@ export function createFormulaPreview(
  * @param id The ID of the feature
  */
 export function isRendered(layer: BaseLayer, id: string): ComputedRef<boolean>;
+/**
+ * Utility function for getting a computed boolean for whether or not a given feature is currently rendered in the DOM.
+ * Note it will have a true value even if the feature is off screen.
+ * @param layer The layer the feature appears within
+ * @param feature The feature that may be rendered
+ */
 export function isRendered(layer: BaseLayer, feature: { id: string }): ComputedRef<boolean>;
 export function isRendered(layer: BaseLayer, idOrFeature: string | { id: string }) {
     const id = typeof idOrFeature === "string" ? idOrFeature : idOrFeature.id;

From 6d148da260e5d276554e1aeb441d618c68ac0736 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 5 Nov 2023 07:28:43 -0600
Subject: [PATCH 15/33] Add forgejo workflows

---
 .forgejo/workflows/deploy.yml | 26 ++++++++++++++++++++++++++
 .forgejo/workflows/test.yml   | 21 +++++++++++++++++++++
 .github/workflows/test.yml    |  2 +-
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 .forgejo/workflows/deploy.yml
 create mode 100644 .forgejo/workflows/test.yml

diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml
new file mode 100644
index 0000000..8666cbe
--- /dev/null
+++ b/.forgejo/workflows/deploy.yml
@@ -0,0 +1,26 @@
+name: Build and Deploy
+on:
+  push:
+    branches:
+      - 'main'
+  workflow_dispatch:
+jobs:
+  build-and-deploy:
+    if: github.repository != 'profectus-engine/Profectus' # Don't build placeholder mod on main repo
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
+        run: |
+          npm ci
+          npm run build
+
+      - name: Deploy 🚀
+        uses: JamesIves/github-pages-deploy-action@v4.2.5
+        with:
+          branch: pages # The branch the action should deploy to.
+          folder: dist # The folder the action should deploy.
diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml
new file mode 100644
index 0000000..c41d085
--- /dev/null
+++ b/.forgejo/workflows/test.yml
@@ -0,0 +1,21 @@
+name: Run Tests
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+      - run: npm ci
+      - run: npm run build --if-present
+      - run: npm test
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index de6f71a..c41d085 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ on:
   pull_request:
     branches: [ main ]
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
 
     steps:

From 312cab1347e5513bf563283a9346262aa4f77d05 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 5 Nov 2023 07:42:28 -0600
Subject: [PATCH 16/33] Rename workflow files

---
 .forgejo/workflows/{deploy.yml => deploy.yaml} | 0
 .forgejo/workflows/{test.yml => test.yaml}     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename .forgejo/workflows/{deploy.yml => deploy.yaml} (100%)
 rename .forgejo/workflows/{test.yml => test.yaml} (100%)

diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yaml
similarity index 100%
rename from .forgejo/workflows/deploy.yml
rename to .forgejo/workflows/deploy.yaml
diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yaml
similarity index 100%
rename from .forgejo/workflows/test.yml
rename to .forgejo/workflows/test.yaml

From d16bb55c3cb67a1ff05b44c04f8d4851e35bf10e Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 5 Nov 2023 07:46:30 -0600
Subject: [PATCH 17/33] Update runs-on

---
 .forgejo/workflows/test.yaml | 2 +-
 .github/workflows/test.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/test.yaml b/.forgejo/workflows/test.yaml
index c41d085..33df8d8 100644
--- a/.forgejo/workflows/test.yaml
+++ b/.forgejo/workflows/test.yaml
@@ -6,7 +6,7 @@ on:
     branches: [ main ]
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: docker
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c41d085..33df8d8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
     branches: [ main ]
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: docker
 
     steps:
       - uses: actions/checkout@v3

From acf1d24c150ceb82821b821f2ea4d3ae7aa01b41 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 5 Nov 2023 08:27:35 -0600
Subject: [PATCH 18/33] Changed one of the wrong runs-on

---
 .forgejo/workflows/deploy.yaml | 2 +-
 .github/workflows/test.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index 8666cbe..a0fcd36 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -7,7 +7,7 @@ on:
 jobs:
   build-and-deploy:
     if: github.repository != 'profectus-engine/Profectus' # Don't build placeholder mod on main repo
-    runs-on: ubuntu-latest
+    runs-on: docker
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v2
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 33df8d8..c41d085 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
     branches: [ main ]
 jobs:
   test:
-    runs-on: docker
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3

From 65ff440e254623045490508eb05379e60fe1fb02 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 5 Nov 2023 08:42:39 -0600
Subject: [PATCH 19/33] Fully qualify pages deploy action

---
 .forgejo/workflows/deploy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index a0fcd36..edd50aa 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -20,7 +20,7 @@ jobs:
           npm run build
 
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@v4.2.5
+        uses: https://github.com/JamesIves/github-pages-deploy-action@v4.2.5
         with:
           branch: pages # The branch the action should deploy to.
           folder: dist # The folder the action should deploy.

From 7330a6bda48b935ccc3fe343a9b1d95ffc2eddae Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 5 Nov 2023 09:09:47 -0600
Subject: [PATCH 20/33] Switch image to ubuntu:latest

---
 .forgejo/workflows/deploy.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index edd50aa..9eb9569 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -8,6 +8,7 @@ jobs:
   build-and-deploy:
     if: github.repository != 'profectus-engine/Profectus' # Don't build placeholder mod on main repo
     runs-on: docker
+    container: ubuntu:latest
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v2

From 005bf5da9a91d704d554377574440949fa93aa3b Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 5 Nov 2023 09:11:10 -0600
Subject: [PATCH 21/33] Try alpine instead

---
 .forgejo/workflows/deploy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index 9eb9569..7c86d47 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -8,7 +8,7 @@ jobs:
   build-and-deploy:
     if: github.repository != 'profectus-engine/Profectus' # Don't build placeholder mod on main repo
     runs-on: docker
-    container: ubuntu:latest
+    container: alpine:3.18
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v2

From aabb0a1bbabd07321916940e6bfd03907eb10359 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 5 Nov 2023 09:13:56 -0600
Subject: [PATCH 22/33] Setup node

---
 .forgejo/workflows/deploy.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index 7c86d47..ce8ab1b 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -10,6 +10,11 @@ jobs:
     runs-on: docker
     container: alpine:3.18
     steps:
+      - name: Setup NodeJS
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
       - name: Checkout 🛎️
         uses: actions/checkout@v2
         with:

From 52b500c9d84481efabac5fa98a37ebdd8021e3a7 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 5 Nov 2023 09:49:02 -0600
Subject: [PATCH 23/33] setup rsync

---
 .forgejo/workflows/deploy.yaml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index ce8ab1b..335e2c3 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -8,12 +8,10 @@ jobs:
   build-and-deploy:
     if: github.repository != 'profectus-engine/Profectus' # Don't build placeholder mod on main repo
     runs-on: docker
-    container: alpine:3.18
     steps:
-      - name: Setup NodeJS
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
+      - name: Setup RSync
+        uses: GuillaumeFalourd/setup-rsync@v1.1
+        run: rsync --version
 
       - name: Checkout 🛎️
         uses: actions/checkout@v2

From c1d0b7eec6fbfe33c0e8c7a2cf0d6621635bb357 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 5 Nov 2023 09:55:52 -0600
Subject: [PATCH 24/33] Fully qualify >.<

---
 .forgejo/workflows/deploy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index 335e2c3..5923533 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -10,7 +10,7 @@ jobs:
     runs-on: docker
     steps:
       - name: Setup RSync
-        uses: GuillaumeFalourd/setup-rsync@v1.1
+        uses: https://github.com/GuillaumeFalourd/setup-rsync@v1.1
         run: rsync --version
 
       - name: Checkout 🛎️

From 766c600a70619d5a0e66c2e94f311dbded83ef75 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 5 Nov 2023 09:57:05 -0600
Subject: [PATCH 25/33] Were the rsync logs wrong

---
 .forgejo/workflows/deploy.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index 5923533..1e0dc2b 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -11,7 +11,6 @@ jobs:
     steps:
       - name: Setup RSync
         uses: https://github.com/GuillaumeFalourd/setup-rsync@v1.1
-        run: rsync --version
 
       - name: Checkout 🛎️
         uses: actions/checkout@v2

From 953cd8047e118562bc0423ca455d80280cffe2e7 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 5 Nov 2023 10:06:26 -0600
Subject: [PATCH 26/33] Install rsync the normal way

---
 .forgejo/workflows/deploy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index 1e0dc2b..3cac5ed 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -10,7 +10,7 @@ jobs:
     runs-on: docker
     steps:
       - name: Setup RSync
-        uses: https://github.com/GuillaumeFalourd/setup-rsync@v1.1
+        run: apt get install rsync
 
       - name: Checkout 🛎️
         uses: actions/checkout@v2

From 2c615ea5241c64b94a7f8410e050c7d79a22aff4 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 5 Nov 2023 10:07:06 -0600
Subject: [PATCH 27/33] Typo

---
 .forgejo/workflows/deploy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index 3cac5ed..6a16ddd 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -10,7 +10,7 @@ jobs:
     runs-on: docker
     steps:
       - name: Setup RSync
-        run: apt get install rsync
+        run: apt-get install rsync
 
       - name: Checkout 🛎️
         uses: actions/checkout@v2

From e9283b5cca1ce3ed95e5748df1811d0189462e6d Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 5 Nov 2023 10:16:38 -0600
Subject: [PATCH 28/33] Update repos first

---
 .forgejo/workflows/deploy.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index 6a16ddd..233777d 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -10,7 +10,9 @@ jobs:
     runs-on: docker
     steps:
       - name: Setup RSync
-        run: apt-get install rsync
+        run: |
+          apt-get update
+          apt-get install rsync
 
       - name: Checkout 🛎️
         uses: actions/checkout@v2

From 8065f8efa4900bfb7b2beb0acebff0d1cc5deee0 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 5 Nov 2023 10:17:23 -0600
Subject: [PATCH 29/33] Approve install

---
 .forgejo/workflows/deploy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index 233777d..bc7210a 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -12,7 +12,7 @@ jobs:
       - name: Setup RSync
         run: |
           apt-get update
-          apt-get install rsync
+          apt-get install -y rsync
 
       - name: Checkout 🛎️
         uses: actions/checkout@v2

From 2495dc9783f4d6f5bce1a8cdc6b87567e7baa27d Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 5 Nov 2023 17:00:28 +0000
Subject: [PATCH 30/33] Implement forgejo actions workflows (#24)

Reviewed-on: https://code.incremental.social/profectus/Profectus/pulls/24
Co-authored-by: thepaperpilot <thepaperpilot@gmail.com>
Co-committed-by: thepaperpilot <thepaperpilot@gmail.com>
---
 .forgejo/workflows/deploy.yaml | 31 +++++++++++++++++++++++++++++++
 .forgejo/workflows/test.yaml   | 21 +++++++++++++++++++++
 .github/workflows/test.yml     |  2 +-
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 .forgejo/workflows/deploy.yaml
 create mode 100644 .forgejo/workflows/test.yaml

diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
new file mode 100644
index 0000000..bc7210a
--- /dev/null
+++ b/.forgejo/workflows/deploy.yaml
@@ -0,0 +1,31 @@
+name: Build and Deploy
+on:
+  push:
+    branches:
+      - 'main'
+  workflow_dispatch:
+jobs:
+  build-and-deploy:
+    if: github.repository != 'profectus-engine/Profectus' # Don't build placeholder mod on main repo
+    runs-on: docker
+    steps:
+      - name: Setup RSync
+        run: |
+          apt-get update
+          apt-get install -y rsync
+
+      - name: Checkout 🛎️
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
+        run: |
+          npm ci
+          npm run build
+
+      - name: Deploy 🚀
+        uses: https://github.com/JamesIves/github-pages-deploy-action@v4.2.5
+        with:
+          branch: pages # The branch the action should deploy to.
+          folder: dist # The folder the action should deploy.
diff --git a/.forgejo/workflows/test.yaml b/.forgejo/workflows/test.yaml
new file mode 100644
index 0000000..33df8d8
--- /dev/null
+++ b/.forgejo/workflows/test.yaml
@@ -0,0 +1,21 @@
+name: Run Tests
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+jobs:
+  test:
+    runs-on: docker
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+      - run: npm ci
+      - run: npm run build --if-present
+      - run: npm test
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index de6f71a..c41d085 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ on:
   pull_request:
     branches: [ main ]
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
 
     steps:

From 7750a3368d12be01f4543ee2583d985b05d228d3 Mon Sep 17 00:00:00 2001
From: Seth Posner <smartseth@hotmail.com>
Date: Mon, 13 Nov 2023 14:09:48 -0800
Subject: [PATCH 31/33] Swap logic for nextAt display

---
 src/data/common.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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<T extends ClickableOptions & ResetButtonOption
                             {unref(resetButton.conversion.buyMax) ? "Next:" : "Req:"}{" "}
                             {displayResource(
                                 resetButton.conversion.baseResource,
-                                !unref(resetButton.conversion.buyMax) ||
-                                    Decimal.lt(unref(resetButton.conversion.actualGain), 1)
+                                !unref(resetButton.conversion.buyMax) &&
+                                    Decimal.gte(unref(resetButton.conversion.actualGain), 1)
                                     ? unref(resetButton.conversion.currentAt)
                                     : unref(resetButton.conversion.nextAt)
                             )}{" "}

From 8811996f640bb208ae7df872d48ac11c10231947 Mon Sep 17 00:00:00 2001
From: Seth Posner <smartseth@hotmail.com>
Date: Mon, 13 Nov 2023 14:10:00 -0800
Subject: [PATCH 32/33] Add tests confirming low-input conversion values

---
 tests/features/conversions.test.ts | 32 ++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tests/features/conversions.test.ts b/tests/features/conversions.test.ts
index 09d6569..58e2e99 100644
--- a/tests/features/conversions.test.ts
+++ b/tests/features/conversions.test.ts
@@ -47,6 +47,10 @@ describe("Creating conversion", () => {
                 baseResource.value = Decimal.pow(100, 2).times(10).add(1);
                 expect(unref(conversion.currentGain)).compare_tolerance(100);
             });
+            test("Zero", () => {
+                baseResource.value = Decimal.dZero;
+                expect(unref(conversion.currentGain)).compare_tolerance(0);
+            });
         });
         describe("Calculates actualGain correctly", () => {
             let conversion: GenericConversion;
@@ -69,6 +73,10 @@ describe("Creating conversion", () => {
                 baseResource.value = Decimal.pow(100, 2).times(10).add(1);
                 expect(unref(conversion.actualGain)).compare_tolerance(100);
             });
+            test("Zero", () => {
+                baseResource.value = Decimal.dZero;
+                expect(unref(conversion.actualGain)).compare_tolerance(0);
+            });
         });
         describe("Calculates currentAt correctly", () => {
             let conversion: GenericConversion;
@@ -95,6 +103,10 @@ describe("Creating conversion", () => {
                     Decimal.pow(100, 2).times(10)
                 );
             });
+            test("Zero", () => {
+                baseResource.value = Decimal.dZero;
+                expect(unref(conversion.currentAt)).compare_tolerance(0);
+            });
         });
         describe("Calculates nextAt correctly", () => {
             let conversion: GenericConversion;
@@ -117,6 +129,10 @@ describe("Creating conversion", () => {
                 baseResource.value = Decimal.pow(100, 2).times(10).add(1);
                 expect(unref(conversion.nextAt)).compare_tolerance(Decimal.pow(101, 2).times(10));
             });
+            test("Zero", () => {
+                baseResource.value = Decimal.dZero;
+                expect(unref(conversion.nextAt)).compare_tolerance(Decimal.dTen);
+            });
         });
         test("Converts correctly", () => {
             const conversion = createCumulativeConversion(() => ({
@@ -193,6 +209,10 @@ describe("Creating conversion", () => {
                 baseResource.value = Decimal.pow(100, 2).times(10).add(1);
                 expect(unref(conversion.currentGain)).compare_tolerance(100);
             });
+            test("Zero", () => {
+                baseResource.value = Decimal.dZero;
+                expect(unref(conversion.currentGain)).compare_tolerance(1);
+            });
         });
         describe("Calculates actualGain correctly", () => {
             let conversion: GenericConversion;
@@ -216,6 +236,10 @@ describe("Creating conversion", () => {
                 baseResource.value = Decimal.pow(100, 2).times(10).add(1);
                 expect(unref(conversion.actualGain)).compare_tolerance(99);
             });
+            test("Zero", () => {
+                baseResource.value = Decimal.dZero;
+                expect(unref(conversion.actualGain)).compare_tolerance(0);
+            });
         });
         describe("Calculates currentAt correctly", () => {
             let conversion: GenericConversion;
@@ -243,6 +267,10 @@ describe("Creating conversion", () => {
                     Decimal.pow(100, 2).times(10)
                 );
             });
+            test("Zero", () => {
+                baseResource.value = Decimal.dZero;
+                expect(unref(conversion.currentAt)).compare_tolerance(Decimal.pow(1, 2).times(10));
+            });
         });
         describe("Calculates nextAt correctly", () => {
             let conversion: GenericConversion;
@@ -266,6 +294,10 @@ describe("Creating conversion", () => {
                 baseResource.value = Decimal.pow(100, 2).times(10).add(1);
                 expect(unref(conversion.nextAt)).compare_tolerance(Decimal.pow(101, 2).times(10));
             });
+            test("Zero", () => {
+                baseResource.value = Decimal.dZero;
+                expect(unref(conversion.nextAt)).compare_tolerance(Decimal.pow(2, 2).times(10));
+            });
         });
         test("Converts correctly", () => {
             const conversion = createIndependentConversion(() => ({

From cf6265d8ce78fcaec62f79689269a1e495c736cd Mon Sep 17 00:00:00 2001
From: Seth Posner <smartseth@hotmail.com>
Date: Mon, 12 Feb 2024 07:58:39 -0800
Subject: [PATCH 33/33] Keep disabled modifiers when making formulas

---
 src/game/modifiers.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/modifiers.tsx b/src/game/modifiers.tsx
index b65e7fc..1ee3905 100644
--- a/src/game/modifiers.tsx
+++ b/src/game/modifiers.tsx
@@ -297,9 +297,9 @@ export function createSequentialModifier<
             getFormula: modifiers.every(m => m.getFormula != null)
                 ? (gain: FormulaSource) =>
                       modifiers
-                          .filter(m => unref(m.enabled) !== false)
                           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                          .reduce((acc, curr) => curr.getFormula!(acc), gain)
+                          .reduce((acc, curr) => Formula.if(acc, curr.enabled ?? true,
+                            acc => curr.getFormula!(acc), acc => acc), gain)
                 : undefined,
             enabled: modifiers.some(m => m.enabled != null)
                 ? computed(() => modifiers.filter(m => unref(m.enabled) !== false).length > 0)