profectus/TMT-Demo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make formulas unwrap persistent refs automatically

Browse source
This commit is contained in:
thepaperpilot 2023-04-18 20:55:40 -05:00
parent 632da10aca
commit a262d6fd03
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/game/formulas/formulas.ts
View file

@ -1,7 +1,8 @@
import { Resource } from "features/resources/resource"; import { Resource } from "features/resources/resource";
import { NonPersistent } from "game/persistence";
import Decimal, { DecimalSource, format } from "util/bignum"; import Decimal, { DecimalSource, format } from "util/bignum";
import { Computable, convertComputable, ProcessedComputable } from "util/computed"; import { Computable, ProcessedComputable, convertComputable } from "util/computed";
import { computed, ComputedRef, ref, unref } from "vue"; import { ComputedRef, Ref, computed, ref, unref } from "vue";
import * as ops from "./operations"; import * as ops from "./operations";
import type { import type {
EvaluateFunction, EvaluateFunction,
@ -58,7 +59,15 @@ export default class Formula<T extends [FormulaSource] | FormulaSource[]> {
constructor(options: FormulaOptions<T>) { constructor(options: FormulaOptions<T>) {
let readonlyProperties; let readonlyProperties;
if ("inputs" in options) {
options.inputs = options.inputs.map(input =>
typeof input === "object" && NonPersistent in input ? input[NonPersistent] : input
) as T | [FormulaSource];
}
if ("variable" in options) { if ("variable" in options) {
if (typeof options.variable === "object" && NonPersistent in options.variable) {
options.variable = options.variable[NonPersistent] as Ref<DecimalSource>;
}
readonlyProperties = this.setupVariable(options); readonlyProperties = this.setupVariable(options);
} else if (!("evaluate" in options)) { } else if (!("evaluate" in options)) {
readonlyProperties = this.setupConstant(options); readonlyProperties = this.setupConstant(options);