470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor addPaymentToOutput()

Browse Source
This commit is contained in:
Dev 2023-04-24 13:23:50 +01:00
parent cbf06fcece
commit b563dd3f78
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
project/src/services/PaymentService.ts
View File

@ -210,14 +210,10 @@ export class PaymentService
*/ */
public addPaymentToOutput(pmcData: IPmcData, currencyTpl: string, amountToPay: number, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse public addPaymentToOutput(pmcData: IPmcData, currencyTpl: string, amountToPay: number, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse
{ {
const moneyItemsInInventory = this.itemHelper.findBarterItems("tpl", pmcData, currencyTpl); const moneyItemsInInventory = this.getSortedMoneyItemsInInventory(pmcData, currencyTpl);
// Move items in stash to top of array
moneyItemsInInventory.sort((a, b) => this.prioritiseStashSort(a, b, pmcData.Inventory.items));
const amountAvailable = moneyItemsInInventory.reduce((accumulator, item) => accumulator + item.upd.StackObjectsCount, 0); const amountAvailable = moneyItemsInInventory.reduce((accumulator, item) => accumulator + item.upd.StackObjectsCount, 0);
// if no money in inventory or amount is not enough we return false // If no money in inventory or amount is not enough we return false
if (moneyItemsInInventory.length <= 0 || amountAvailable < amountToPay) if (moneyItemsInInventory.length <= 0 || amountAvailable < amountToPay)
{ {
this.logger.error(this.localisationService.getText("payment-not_enough_money_to_complete_transation", {amountToPay: amountToPay, amountAvailable: amountAvailable})); this.logger.error(this.localisationService.getText("payment-not_enough_money_to_complete_transation", {amountToPay: amountToPay, amountAvailable: amountAvailable}));
@ -251,6 +247,22 @@ export class PaymentService
return output; return output;
} }
/**
* Get all money stacks in inventory and prioritse items in stash
* @param pmcData
* @param currencyTpl
* @returns Sorting money items
*/
protected getSortedMoneyItemsInInventory(pmcData: IPmcData, currencyTpl: string): Item[]
{
const moneyItemsInInventory = this.itemHelper.findBarterItems("tpl", pmcData, currencyTpl);
// Prioritise items in stash to top of array
moneyItemsInInventory.sort((a, b) => this.prioritiseStashSort(a, b, pmcData.Inventory.items));
return moneyItemsInInventory;
}
/** /**
* Prioritise player stash first over player inventory * Prioritise player stash first over player inventory
* Post-raid healing would often take money out of the players pockets/secure container * Post-raid healing would often take money out of the players pockets/secure container