thepaperpilot/chromatic-lattice
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Fix some merge issues

Browse source
This commit is contained in:
thepaperpilot 2023-02-15 21:08:10 -06:00
parent 839baaf708
commit d3f5e3bed7
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/data/common.tsx
View file

@ -5,9 +5,10 @@ import type { GenericConversion } from "features/conversion";
import type { CoercableComponent, JSXFunction, OptionsFunc, Replace } from "features/feature"; import type { CoercableComponent, JSXFunction, OptionsFunc, Replace } from "features/feature";
import { jsx, setDefault } from "features/feature"; import { jsx, setDefault } from "features/feature";
import { GenericMilestone } from "features/milestones/milestone"; import { GenericMilestone } from "features/milestones/milestone";
import { displayResource } from "features/resources/resource"; import { displayResource, Resource } from "features/resources/resource";
import type { GenericTree, GenericTreeNode, TreeNode, TreeNodeOptions } from "features/trees/tree"; import type { GenericTree, GenericTreeNode, TreeNode, TreeNodeOptions } from "features/trees/tree";
import { createTreeNode } from "features/trees/tree"; import { createTreeNode } from "features/trees/tree";
import { GenericFormula } from "game/formulas";
import type { Modifier } from "game/modifiers"; import type { Modifier } from "game/modifiers";
import type { Persistent } from "game/persistence"; import type { Persistent } from "game/persistence";
import { DefaultValue, persistent } from "game/persistence"; import { DefaultValue, persistent } from "game/persistence";
@ -25,7 +26,6 @@ import { convertComputable, processComputable } from "util/computed";
import { getFirstFeature, renderColJSX, renderJSX } from "util/vue"; import { getFirstFeature, renderColJSX, renderJSX } from "util/vue";
import type { ComputedRef, Ref } from "vue"; import type { ComputedRef, Ref } from "vue";
import { computed, unref } from "vue"; import { computed, unref } from "vue";
import Formula, { GenericFormula } from "game/formulas";
import "./common.css"; import "./common.css";
/** An object that configures a {@link ResetButton} */ /** An object that configures a {@link ResetButton} */

1
src/util/vue.tsx
View file

@ -8,7 +8,6 @@ import {
jsx, jsx,
Visibility Visibility
} from "features/feature"; } from "features/feature";
import settings from "game/settings";
import type { ProcessedComputable } from "util/computed"; import type { ProcessedComputable } from "util/computed";
import { DoNotCache } from "util/computed"; import { DoNotCache } from "util/computed";
import type { Component, ComputedRef, DefineComponent, PropType, Ref, ShallowRef } from "vue"; import type { Component, ComputedRef, DefineComponent, PropType, Ref, ShallowRef } from "vue";

4
tests/game/formulas.test.ts
View file

@ -930,7 +930,7 @@ describe("Custom Formulas", () => {
new Formula({ new Formula({
inputs: [1], inputs: [1],
evaluate: () => 10, evaluate: () => 10,
integrate: val => val ?? 20 integrate: (val, v1) => val ?? 20
}).evaluateIntegral() }).evaluateIntegral()
).compare_tolerance(20)); ).compare_tolerance(20));
test("Two inputs integrates correctly", () => test("Two inputs integrates correctly", () =>
@ -958,7 +958,7 @@ describe("Custom Formulas", () => {
new Formula({ new Formula({
inputs: [1], inputs: [1],
evaluate: () => 10, evaluate: () => 10,
invertIntegral: val => 1, invertIntegral: (val, v1) => 1,
hasVariable: true hasVariable: true
}).invertIntegral(8) }).invertIntegral(8)
).compare_tolerance(1)); ).compare_tolerance(1));