spt/server
spt/server
0
0
Fork 0
mirror of https://github.com/sp-tarkov/server.git synced 2025-02-12 15:50:42 -05:00
Code

When purchasing items, server will try to prioritise non-sicc/docs cases when only money in containers can be found

Browse Source
This commit is contained in:
Chomp 2024-12-22 20:55:32 +00:00
parent e10d5d12f2
commit 572144c662
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -340,31 +340,55 @@ export class PaymentService {
* @returns sort order * @returns sort order
*/ */
protected prioritiseStashSort(a: IItem, b: IItem, inventoryItems: IItem[], playerStashId: string): number { protected prioritiseStashSort(a: IItem, b: IItem, inventoryItems: IItem[], playerStashId: string): number {
// a in stash, prioritise // a in root of stash, prioritise
if (a.slotId === "hideout" && b.slotId !== "hideout") { if (a.parentId === playerStashId && b.parentId !== playerStashId) {
return -1; return -1;
} }
// b in stash, prioritise // b in root stash, prioritise
if (a.slotId !== "hideout" && b.slotId === "hideout") { if (a.parentId !== playerStashId && b.parentId === playerStashId) {
return 1; return 1;
} }
// both in containers // both in containers
if (a.slotId === "main" && b.slotId === "main") { if (a.slotId === "main" && b.slotId === "main") {
// Item is in inventory, not stash, deprioritise // Both items are in containers
const aInStash = this.isInStash(a.parentId, inventoryItems, playerStashId); const aInStash = this.isInStash(a.parentId, inventoryItems, playerStashId);
const bInStash = this.isInStash(b.parentId, inventoryItems, playerStashId); const bInStash = this.isInStash(b.parentId, inventoryItems, playerStashId);
// a in stash, prioritise // a in stash in container, prioritise
if (aInStash && !bInStash) { if (aInStash && !bInStash) {
return -1; return -1;
} }
// b in stash, prioritise // b in stash in container, prioritise
if (!aInStash && bInStash) { if (!aInStash && bInStash) {
return 1; return 1;
} }
// Both in stash in containers
if (aInStash && bInStash) {
// Containers where taking money from would inconvinence player
const deprioritisedContainers = ["590c60fc86f77412b13fddcf", "5d235bb686f77443f4331278"];
const aImmediateParent = inventoryItems.find((item) => item._id === a.parentId);
const bImmediateParent = inventoryItems.find((item) => item._id === b.parentId);
// A is not a deprioritised container, B is
if (
!deprioritisedContainers.includes(aImmediateParent._tpl) &&
deprioritisedContainers.includes(bImmediateParent._tpl)
) {
return -1;
}
// B is not a deprioritised container, A is
if (
deprioritisedContainers.includes(aImmediateParent._tpl) &&
!deprioritisedContainers.includes(bImmediateParent._tpl)
) {
return 1;
}
}
} }
// they match // they match
@ -379,7 +403,7 @@ export class PaymentService {
* @returns true if its in inventory * @returns true if its in inventory
*/ */
protected isInStash(itemId: string | undefined, inventoryItems: IItem[], playerStashId: string): boolean { protected isInStash(itemId: string | undefined, inventoryItems: IItem[], playerStashId: string): boolean {
const itemParent = inventoryItems.find((x) => x._id === itemId); const itemParent = inventoryItems.find((item) => item._id === itemId);
if (itemParent) { if (itemParent) {
if (itemParent.slotId === "hideout") { if (itemParent.slotId === "hideout") {