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

Fix directSum breaking formulas

Browse source
This commit is contained in:
thepaperpilot 2023-05-13 15:23:53 -05:00
parent f8095a9694
commit bbe0aaa31e
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1447,6 +1447,7 @@ export function calculateMaxAffordable(
} }
affordable = Decimal.clampMax(affordable, maxBulkAmount); affordable = Decimal.clampMax(affordable, maxBulkAmount);
if (directSum > 0) { if (directSum > 0) {
const preSumAffordable = affordable;
affordable = Decimal.sub(affordable, directSum).clampMin(0); affordable = Decimal.sub(affordable, directSum).clampMin(0);
let summedCost; let summedCost;
if (cumulativeCost) { if (cumulativeCost) {
@ -1458,7 +1459,8 @@ export function calculateMaxAffordable(
} }
while ( while (
Decimal.lt(affordable, maxBulkAmount) && Decimal.lt(affordable, maxBulkAmount) &&
Decimal.lt(affordable, Number.MAX_SAFE_INTEGER) Decimal.lt(affordable, Number.MAX_SAFE_INTEGER) &&
Decimal.add(preSumAffordable, 1).gte(affordable)
) { ) {
const nextCost = formula.evaluate( const nextCost = formula.evaluate(
affordable.add(unref(formula.innermostVariable) ?? 0) affordable.add(unref(formula.innermostVariable) ?? 0)