profectus/Profectus
Template
1
0
Fork 4
Code Issues 38 Pull requests 5 Projects 2 Releases Packages Wiki Activity Actions

Merge pull request 'Keep disabled modifiers when making formulas' (#56) from escapee/profectus-template:main into main
Some checks failed
Build and Deploy / build-and-deploy (push) Successful in 57s
Details
Run Tests / test (push) Failing after 2m0s
Details

Browse source 
Reviewed-on: #56
This commit is contained in:
thepaperpilot 2024-02-13 05:18:01 +00:00
commit 1b809a9550
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/modifiers.tsx
View file

@ -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)