Fix repeatables buying more than intended when cumulativeCost is false

.forgejo/workflows/deploy.yaml

@@ -1,31 +0,0 @@
-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.

.forgejo/workflows/test.yaml

@@ -1,21 +0,0 @@
-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

.github/workflows/deploy.yml

@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - 'main'
-  workflow_dispatch:
 jobs:
   build-and-deploy:
     if: github.repository != 'profectus-engine/Profectus' # Don't build placeholder mod on main repo

.github/workflows/test.yml

@@ -1,11 +1,11 @@
-name: Run Tests
+name: Build and Deploy
 on:
   push:
     branches: [ main ]
   pull_request:
     branches: [ main ]
 jobs:
-  test:
+  build:
     runs-on: ubuntu-latest
 
     steps:

src/components/Info.vue

@@ -38,7 +38,7 @@
                         target="_blank"
                     >
                         <span class="material-icons info-modal-discord">discord</span>
-                        Profectus & Friends
+                        The Paper Pilot Community
                     </a>
                 </div>
                 <div>

src/components/NaNScreen.vue

@@ -19,7 +19,7 @@
                     class="nan-modal-discord-link"
                 >
                     <span class="material-icons nan-modal-discord">discord</span>
-                    {{ discordName || "Profectus & Friends" }}
+                    {{ discordName || "The Paper Pilot Community" }}
                 </a>
             </div>
             <br />

src/components/Nav.vue

@@ -15,7 +15,9 @@
                     <a :href="discordLink" target="_blank">{{ discordName }}</a>
                 </li>
                 <li>
-                    <a href="https://discord.gg/yJ4fjnjU54" target="_blank">Profectus & Friends</a>
+                    <a href="https://discord.gg/yJ4fjnjU54" target="_blank"
+                        >The Paper Pilot Community</a
+                    >
                 </li>
                 <li>
                     <a href="https://discord.gg/F3xveHV" target="_blank">The Modding Tree</a>
@@ -80,7 +82,9 @@
                     <a :href="discordLink" target="_blank">{{ discordName }}</a>
                 </li>
                 <li>
-                    <a href="https://discord.gg/yJ4fjnjU54" target="_blank">Profectus & Friends</a>
+                    <a href="https://discord.gg/yJ4fjnjU54" target="_blank"
+                        >The Paper Pilot Community</a
+                    >
                 </li>
                 <li>
                     <a href="https://discord.gg/F3xveHV" target="_blank">The Modding Tree</a>

src/data/common.tsx

@@ -9,7 +9,6 @@ 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";
@@ -134,8 +133,8 @@ export function createResetButton<T extends ClickableOptions & ResetButtonOption
                             {unref(resetButton.conversion.buyMax) ? "Next:" : "Req:"}{" "}
                             {displayResource(
                                 resetButton.conversion.baseResource,
-                                !unref(resetButton.conversion.buyMax) &&
-                                    Decimal.gte(unref(resetButton.conversion.actualGain), 1)
+                                !unref(resetButton.conversion.buyMax) ||
+                                    Decimal.lt(unref(resetButton.conversion.actualGain), 1)
                                     ? unref(resetButton.conversion.currentAt)
                                     : unref(resetButton.conversion.nextAt)
                             )}{" "}
@@ -486,22 +485,3 @@ 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>;
-/**
- * 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;
-    return computed(() => id in layer.nodes.value);
-}

src/data/layers/prestige.tsx

@@ -37,7 +37,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
         color,
         reset
     }));
-    const tooltip = addTooltip(treeNode, {
+    addTooltip(treeNode, {
         display: createResourceTooltip(points),
         pinnable: true
     });
@@ -58,7 +58,6 @@ const layer = createLayer(id, function (this: BaseLayer) {
         name,
         color,
         points,
-        tooltip,
         display: jsx(() => (
             <>
                 <MainDisplay resource={points} color={color} />

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%)";

src/features/boards/BoardLink.vue

@@ -1,7 +1,7 @@
 <template>
     <line
         class="link"
-        v-bind="linkProps"
+        v-bind="link"
         :class="{ pulsing: link.pulsing }"
         :x1="startPosition.x"
         :y1="startPosition.y"
@@ -12,7 +12,6 @@
 
 <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<{
@@ -50,14 +49,11 @@ const endPosition = computed(() => {
     }
     return position;
 });
-
-const linkProps = computed(() => kebabifyObject(_props.link as unknown as Record<string, unknown>));
 </script>
 
 <style scoped>
 .link {
     transition-duration: 0s;
-    pointer-events: none;
 }
 
 .link.pulsing {

src/features/links/Link.vue

@@ -2,7 +2,7 @@
     <line
         stroke-width="15px"
         stroke="white"
-        v-bind="linkProps"
+        v-bind="link"
         :x1="startPosition.x"
         :y1="startPosition.y"
         :x2="endPosition.x"
@@ -13,7 +13,6 @@
 <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<{
@@ -55,6 +54,4 @@ const endPosition = computed(() => {
     }
     return position;
 });
-
-const linkProps = computed(() => kebabifyObject(_props.link as unknown as Record<string, unknown>));
 </script>

src/features/tooltips/tooltip.ts

@@ -95,6 +95,18 @@ 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);

src/game/formulas/formulas.ts

@@ -345,35 +345,19 @@ 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,
-            invert: ops.invertPassthrough
-        });
+        return new Formula({ inputs: [value], evaluate: Decimal.round });
     }
 
     public static floor(value: FormulaSource) {
-        return new Formula({
-            inputs: [value],
-            evaluate: Decimal.floor,
-            invert: ops.invertPassthrough
-        });
+        return new Formula({ inputs: [value], evaluate: Decimal.floor });
     }
 
     public static ceil(value: FormulaSource) {
-        return new Formula({
-            inputs: [value],
-            evaluate: Decimal.ceil,
-            invert: ops.invertPassthrough
-        });
+        return new Formula({ inputs: [value], evaluate: Decimal.ceil });
     }
 
     public static trunc(value: FormulaSource) {
-        return new Formula({
-            inputs: [value],
-            evaluate: Decimal.trunc,
-            invert: ops.invertPassthrough
-        });
+        return new Formula({ inputs: [value], evaluate: Decimal.trunc });
     }
 
     public static add<T extends GenericFormula>(value: T, other: FormulaSource): T;
@@ -475,7 +459,7 @@ export abstract class InternalFormula<T extends [FormulaSource] | FormulaSource[
         return new Formula({
             inputs: [value, min, max],
             evaluate: Decimal.clamp,
-            invert: ops.invertPassthrough
+            invert: ops.passthrough as InvertFunction<[FormulaSource, FormulaSource, FormulaSource]>
         });
     }
 
@@ -1469,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);

src/game/formulas/operations.ts

@@ -1,12 +1,6 @@
 import Decimal, { DecimalSource } from "util/bignum";
 import Formula, { hasVariable, unrefFormulaSource } from "./formulas";
-import {
-    FormulaSource,
-    GenericFormula,
-    InvertFunction,
-    InvertibleFormula,
-    SubstitutionStack
-} from "./types";
+import { FormulaSource, GenericFormula, InvertFunction, SubstitutionStack } from "./types";
 
 const ln10 = Decimal.ln(10);
 
@@ -14,15 +8,6 @@ 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));

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) => Formula.if(acc, curr.enabled ?? true,
-                            acc => curr.getFormula!(acc), acc => acc), gain)
+                          .reduce((acc, curr) => curr.getFormula!(acc), gain)
                 : undefined,
             enabled: modifiers.some(m => m.enabled != null)
                 ? computed(() => modifiers.filter(m => unref(m.enabled) !== false).length > 0)

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
+                )
             );
         }
 

src/util/common.ts

@@ -12,11 +12,6 @@ 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 {

src/util/vue.tsx

@@ -21,7 +21,6 @@ import {
     unref,
     watchEffect
 } from "vue";
-import { camelToKebab } from "./common";
 
 export function coerceComponent(
     component: CoercableComponent,
@@ -242,10 +241,3 @@ 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>);
-}

tests/features/conversions.test.ts

@@ -47,10 +47,6 @@ 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;
@@ -73,10 +69,6 @@ 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;
@@ -103,10 +95,6 @@ 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;
@@ -129,10 +117,6 @@ 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(() => ({
@@ -209,10 +193,6 @@ 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;
@@ -236,10 +216,6 @@ 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;
@@ -267,10 +243,6 @@ 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;
@@ -294,10 +266,6 @@ 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(() => ({

tests/game/formulas.test.ts

@@ -13,13 +13,9 @@ import { InvertibleIntegralFormula } from "game/formulas/types";
 
 type FormulaFunctions = keyof GenericFormula & keyof typeof Formula & keyof typeof Decimal;
 
-const testValues = [-2, "0", new Decimal(10.5)] as const;
+const testValues = [-1, "0", Decimal.dOne] as const;
 
 const invertibleZeroParamFunctionNames = [
-    "round",
-    "floor",
-    "ceil",
-    "trunc",
     "neg",
     "recip",
     "log10",
@@ -52,6 +48,10 @@ const invertibleZeroParamFunctionNames = [
 const nonInvertibleZeroParamFunctionNames = [
     "abs",
     "sign",
+    "round",
+    "floor",
+    "ceil",
+    "trunc",
     "pLog10",
     "absLog10",
     "factorial",
@@ -85,10 +85,6 @@ const integrableZeroParamFunctionNames = [
 ] as const;
 const nonIntegrableZeroParamFunctionNames = [
     ...nonInvertibleZeroParamFunctionNames,
-    "round",
-    "floor",
-    "ceil",
-    "trunc",
     "lambertw",
     "ssqrt"
 ] as const;
@@ -155,7 +151,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 +246,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 +270,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
@@ -492,18 +488,18 @@ describe("Inverting", () => {
     });
 
     test("Inverting nested formulas", () => {
-        const formula = Formula.add(variable, constant).times(constant).floor();
+        const formula = Formula.add(variable, constant).times(constant);
         expect(formula.invert(100)).compare_tolerance(0);
     });
 
     describe("Inverting with non-invertible sections", () => {
         test("Non-invertible constant", () => {
-            const formula = Formula.add(variable, constant.sign());
+            const formula = Formula.add(variable, constant.ceil());
             expect(formula.isInvertible()).toBe(true);
             expect(() => formula.invert(10)).not.toLogError();
         });
         test("Non-invertible variable", () => {
-            const formula = Formula.add(variable.sign(), constant);
+            const formula = Formula.add(variable.ceil(), constant);
             expect(formula.isInvertible()).toBe(false);
             expect(() => formula.invert(10)).toLogError();
         });

tests/game/requirements.test.ts

@@ -83,7 +83,7 @@ describe("Creating cost requirement", () => {
             cost: 10,
             cumulativeCost: false
         }));
-        expect(unref(requirement.requirementMet)).toBe(1);
+        expect(unref(requirement.requirementMet)).toBe(true);
     });
 
     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(0);
+        expect(unref(requirement.requirementMet)).toBe(false);
     });
 
     describe("canMaximize works correctly", () => {