@rpgjs/server 5.0.0-alpha.32 → 5.0.0-alpha.33

package/dist/Gui/ShopGui.d.ts

@@ -4,8 +4,12 @@ export type ShopSellList = Record<string, number> | Array<{
     id: string;
     multiplier: number;
 }>;
+export type ShopItemInput = string | {
+    id?: string;
+    [key: string]: any;
+};
 export interface ShopGuiOptions {
-    items: any[];
+    items: ShopItemInput[];
     sell?: ShopSellList;
     sellMultiplier?: number;
     message?: string;

package/dist/Player/ItemManager.d.ts

@@ -386,12 +386,13 @@ export interface IItemManager {
     /**
      * Equips a weapon or armor on a player
      *
-     * Think first to add the item in the inventory with the `addItem()` method before equipping the item.
+     * Think first to add the item in the inventory with the `addItem()` method before equipping the item,
+     * or pass `"auto"` to add the item if it is missing and equip it.
      *
      * The `onEquip()` method is called on the ItemClass when the item is equipped or unequipped.
      *
-     * @param itemClass - Item class or string identifier. If string, it's the item ID
-     * @param equip - Equip the item if `true`, unequip if `false` (default: `true`)
+     * @param itemId - Item identifier to resolve from the database
+     * @param equip - Equip the item if `true`, unequip if `false`, or `"auto"` to add then equip (default: `true`)
      * @throws {Object} ItemLog.notInInventory - If the item is not in the inventory
      *   - `id`: `ITEM_NOT_INVENTORY`
      *   - `msg`: Error message
@@ -404,19 +405,17 @@ export interface IItemManager {
      *
      * @example
      * ```ts
-     * import Sword from 'your-database/sword'
-     *
      * try {
-     *   player.addItem(Sword)
-     *   player.equip(Sword)
+     *   player.addItem('sword')
+     *   player.equip('sword')
      *   // Later, unequip it
-     *   player.equip(Sword, false)
+     *   player.equip('sword', false)
      * } catch (err) {
      *   console.log(err)
      * }
      * ```
      */
-    equip(itemClass: ItemClass | string, equip?: boolean): void;
+    equip(itemId: string, equip?: boolean | 'auto'): void;
     /**
      * Get the player's attack (sum of items equipped)
      *

package/dist/index.js

@@ -8543,9 +8543,9 @@ var Server = class {
             sessionState,
             room: this.room
           })) ?? userSnapshot;
-          load(user, hydratedSnapshot, true);
           signal2()[publicId] = user;
-          await this.room.storage.put(`${usersPropName}.${publicId}`, hydratedSnapshot);
+          load(user, hydratedSnapshot, true);
+          await this.room.storage.put(`${usersPropName}.${publicId}`, userSnapshot);
         }
       }
       const transferToken = generateShortUUID$1();
@@ -21549,13 +21549,17 @@ function WithItemManager(Base) {
       this.removeItem(itemClass);
       return inventory;
     }
-    equip(itemClass, equip = true) {
-      const itemId = isString(itemClass) ? itemClass : itemClass.name;
-      const inventory = this.getItem(itemClass);
+    equip(itemId, equip = true) {
+      const autoAdd = equip === "auto";
+      const equipState = equip === "auto" ? true : equip;
+      const data = this.databaseById(itemId);
+      let inventory = this.getItem(itemId);
+      if (!inventory && autoAdd) {
+        inventory = this.addItem(itemId, 1);
+      }
       if (!inventory) {
         throw ItemLog.notInInventory(itemId);
       }
-      const data = this.databaseById(itemId);
       if (data._type == "item") {
         throw ItemLog.invalidToEquiped(itemId);
       }
@@ -21570,18 +21574,18 @@ function WithItemManager(Base) {
         }
       }
       const item = inventory;
-      if (item.equipped && equip) {
+      if (item.equipped && equipState) {
         throw ItemLog.isAlreadyEquiped(itemId);
       }
-      item.equipped = equip;
-      if (!equip) {
+      item.equipped = equipState;
+      if (!equipState) {
         const index = this.equipments().findIndex((it) => it.id() == item.id());
         this.equipments().splice(index, 1);
       } else {
         this.equipments().push(item);
       }
       const hookTarget = item._itemInstance || item;
-      this["execMethod"]("onEquip", [this, equip], hookTarget);
+      this["execMethod"]("onEquip", [this, equipState], hookTarget);
     }
   };
 }
@@ -22180,8 +22184,11 @@ function WithClassManager(Base) {
         this.addParameter(param, actor.parameters[param]);
       }
       for (let item of actor.startingEquipment) {
-        this.addItem(item);
-        this.equip(item, true);
+        const inventory = this.addItem(item);
+        const itemId = inventory?.id?.();
+        if (itemId) {
+          this.equip(itemId, true);
+        }
       }
       if (actor.class) this.setClass(actor.class);
       this["execMethod"]("onSet", [this], actor);