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

Made calculateMaxAffordable, calculateCost, and cost requirements interface a bit cleaner #17

Merged
thepaperpilot merged 6 commits from feature/requirements-refactor into main 2023-05-17 23:52:28 +00:00
Conversation 0 Commits 6 Files changed 18 +3 -1
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit bbe0aaa31e - Show all commits

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)