Weight Calculation for Storage

Stuyk · Apr 4, 2023 · 6e181c5 · 6e181c5
1 parent d2642d1
commit 6e181c5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/core/plugins/core-inventory/server/src/view.ts b/src/core/plugins/core-inventory/server/src/view.ts
@@ -30,6 +30,7 @@ const offers: { [hash: string]: OfferInfo } = {};
 // Storages
 const openStorages: { [player_id: string]: Array<StoredItem> } = {};
 const openStorageSessions: { [player_id: string]: string } = {};
+const openStoragesWeight: { [player_id: string]: number } = {};
 
 // Callbacks
 const openCallbacks: Array<PlayerCallback> = [];
@@ -315,12 +316,24 @@ const Internal = {
  }
 
  if (info.startType === 'custom') {
+ const maxWeight = openStoragesWeight[player.id];
+ if (Athena.systems.inventory.weight.isWeightExceeded([complexSwap.from], maxWeight)) {
+ InventoryView.storage.resync(player);
+ return;
+ }
+
  openStorages[player.id] = complexSwap.from;
  } else {
  await Athena.document.character.set(player, info.startType, complexSwap.from);
  }
 
  if (info.endType === 'custom') {
+ const maxWeight = openStoragesWeight[player.id];
+ if (Athena.systems.inventory.weight.isWeightExceeded([complexSwap.to], maxWeight)) {
+ InventoryView.storage.resync(player);
+ return;
+ }
+
  openStorages[player.id] = complexSwap.to;
  } else {
  await Athena.document.character.set(player, info.endType, complexSwap.to);
@@ -649,6 +662,7 @@ export const InventoryView = {
  items: Array<StoredItem>,
  storageSize: number,
  forceOpenInventory = false,
+ maxWeight: number = Number.MAX_SAFE_INTEGER,
  ) {
  if (forceOpenInventory) {
  player.emit(INVENTORY_EVENTS.TO_CLIENT.OPEN);
@@ -666,6 +680,7 @@ export const InventoryView = {
 
  openStorages[player.id] = deepCloneArray<StoredItem>(items);
  openStorageSessions[player.id] = uid;
+ openStoragesWeight[player.id] = maxWeight;
  const fullStorageList = Athena.systems.inventory.manager.convertFromStored(openStorages[player.id]);
  Athena.webview.emit(player, INVENTORY_EVENTS.TO_WEBVIEW.SET_CUSTOM, fullStorageList, storageSize);
  },

diff --git a/src/core/server/systems/inventory/clothing.ts b/src/core/server/systems/inventory/clothing.ts
@@ -1,7 +1,6 @@
 import * as alt from 'alt-server';
 
 import * as Athena from '@AthenaServer/api';
-import { Appearance } from '@AthenaShared/interfaces/appearance';
 import { ClothingComponent, ClothingInfo, StoredItem } from '@AthenaShared/interfaces/item';
 import { isNullOrUndefined } from '@AthenaShared/utility/undefinedCheck';
 import { Character } from '@AthenaShared/interfaces/character';