filipkopyt14/Profectus
1
0
Fork 0
forked from profectus/Profectus
Code Pull requests Releases Activity Actions

Fix cost requirement requiring spendResources

Browse source 
Also fixed it defaulting to false instead of true
This commit is contained in:
thepaperpilot 2023-04-02 21:56:43 -05:00
parent 98cb997056
commit 804d48ae80
1 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/game/requirements.tsx
View file

@ -1,5 +1,12 @@
import { isArray } from "@vue/shared"; import { isArray } from "@vue/shared";
import { CoercableComponent, isVisible, jsx, setDefault, Visibility } from "features/feature"; import {
CoercableComponent,
isVisible,
jsx,
Replace,
setDefault,
Visibility
} from "features/feature";
import { displayResource, Resource } from "features/resources/resource"; import { displayResource, Resource } from "features/resources/resource";
import Decimal, { DecimalSource } from "lib/break_eternity"; import Decimal, { DecimalSource } from "lib/break_eternity";
import { import {
@ -78,7 +85,7 @@ export interface CostRequirementOptions {
* When calculating multiple levels to be handled at once, whether it should consider resources used for each level as spent. Setting this to false causes calculations to be faster with larger numbers and supports more math functions. * When calculating multiple levels to be handled at once, whether it should consider resources used for each level as spent. Setting this to false causes calculations to be faster with larger numbers and supports more math functions.
* @see {Formula} * @see {Formula}
*/ */
spendResources: Computable<boolean>; spendResources?: Computable<boolean>;
/** /**
* Pass-through to {@link Requirement.pay}. May be required for maximizing support. * Pass-through to {@link Requirement.pay}. May be required for maximizing support.
* @see {@link cost} for restrictions on maximizing support. * @see {@link cost} for restrictions on maximizing support.
@ -86,7 +93,15 @@ export interface CostRequirementOptions {
pay?: (amount?: DecimalSource) => void; pay?: (amount?: DecimalSource) => void;
} }
export type CostRequirement = Requirement & CostRequirementOptions; export type CostRequirement = Replace<
Requirement & CostRequirementOptions,
{
cost: ProcessedComputable<DecimalSource> | GenericFormula;
visibility: ProcessedComputable<Visibility.Visible | Visibility.None | boolean>;
requiresPay: ProcessedComputable<boolean>;
spendResources: ProcessedComputable<boolean>;
}
>;
/** /**
* Lazily creates a requirement with the given options, that is based on meeting an amount of a resource. * Lazily creates a requirement with the given options, that is based on meeting an amount of a resource.
@ -109,13 +124,7 @@ export function createCostRequirement<T extends CostRequirementOptions>(
{displayResource( {displayResource(
req.resource, req.resource,
req.cost instanceof Formula req.cost instanceof Formula
? calculateCost( ? calculateCost(req.cost, amount ?? 1, unref(req.spendResources) as boolean)
req.cost,
amount ?? 1,
unref(
req.spendResources as ProcessedComputable<boolean> | undefined
) ?? true
)
: unref(req.cost as ProcessedComputable<DecimalSource>) : unref(req.cost as ProcessedComputable<DecimalSource>)
)}{" "} )}{" "}
{req.resource.displayName} {req.resource.displayName}
@ -127,13 +136,7 @@ export function createCostRequirement<T extends CostRequirementOptions>(
{displayResource( {displayResource(
req.resource, req.resource,
req.cost instanceof Formula req.cost instanceof Formula
? calculateCost( ? calculateCost(req.cost, amount ?? 1, unref(req.spendResources) as boolean)
req.cost,
amount ?? 1,
unref(
req.spendResources as ProcessedComputable<boolean> | undefined
) ?? true
)
: unref(req.cost as ProcessedComputable<DecimalSource>) : unref(req.cost as ProcessedComputable<DecimalSource>)
)}{" "} )}{" "}
{req.resource.displayName} {req.resource.displayName}
@ -146,16 +149,11 @@ export function createCostRequirement<T extends CostRequirementOptions>(
processComputable(req as T, "requiresPay"); processComputable(req as T, "requiresPay");
setDefault(req, "requiresPay", true); setDefault(req, "requiresPay", true);
processComputable(req as T, "spendResources"); processComputable(req as T, "spendResources");
setDefault(req, "spendResources", false); setDefault(req, "spendResources", true);
setDefault(req, "pay", function (amount?: DecimalSource) { setDefault(req, "pay", function (amount?: DecimalSource) {
const cost = const cost =
req.cost instanceof Formula req.cost instanceof Formula
? calculateCost( ? calculateCost(req.cost, amount ?? 1, unref(req.spendResources) as boolean)
req.cost,
amount ?? 1,
unref(req.spendResources as ProcessedComputable<boolean> | undefined) ??
true
)
: unref(req.cost as ProcessedComputable<DecimalSource>); : unref(req.cost as ProcessedComputable<DecimalSource>);
req.resource.value = Decimal.sub(req.resource.value, cost).max(0); req.resource.value = Decimal.sub(req.resource.value, cost).max(0);
}); });
@ -166,7 +164,7 @@ export function createCostRequirement<T extends CostRequirementOptions>(
req.requirementMet = calculateMaxAffordable( req.requirementMet = calculateMaxAffordable(
req.cost as InvertibleFormula, req.cost as InvertibleFormula,
req.resource, req.resource,
unref(req.spendResources as ProcessedComputable<boolean> | undefined) ?? true unref(req.spendResources) as boolean
); );
} else { } else {
req.requirementMet = computed(() => { req.requirementMet = computed(() => {