mirror of
https://github.com/thepaperpilot/Planar-Pioneers.git
synced 2024-11-21 16:13:54 +00:00
Fix directSum breaking formulas
This commit is contained in:
parent
f8095a9694
commit
bbe0aaa31e
1 changed files with 3 additions and 1 deletions
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue