@rpgjs/server 5.0.0-alpha.31 → 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/RpgServer.d.ts

@@ -659,10 +659,10 @@ export interface RpgServer {
      * })
      * ```
      *
-     * @prop { { [dataName]: data } } [database]
+     * @prop { { [dataName]: data } | (engine: RpgMap) => { [dataName]: data } | Promise<{ [dataName]: data }> } [database]
      * @memberof RpgServer
      * */
-    database?: object | any[];
+    database?: object | any[] | ((engine: RpgMap) => object | any[] | Promise<object | any[]>);
     /**
      * Array of all maps. Each element can be either a class (decorated with `@MapData` or not) or a `MapOptions` object
      *

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();
@@ -19476,6 +19476,9 @@ function WithMoveManager(Base) {
             this.waitingForPromise = false;
             this.promiseStartTime = 0;
             this.promiseDuration = 0;
+            this.remainingDistance = 0;
+            this.segmentDirection = null;
+            this.segmentStep = 0;
             // Frequency wait state
             this.waitingForFrequency = false;
             this.frequencyWaitStartTime = 0;
@@ -19502,6 +19505,9 @@ function WithMoveManager(Base) {
           processNextRoute() {
             this.waitingForFrequency = false;
             this.frequencyWaitStartTime = 0;
+            this.remainingDistance = 0;
+            this.segmentDirection = null;
+            this.segmentStep = 0;
             if (this.routeIndex >= this.routes.length) {
               this.debugLog("COMPLETE all routes finished");
               this.finished = true;
@@ -19578,41 +19584,13 @@ function WithMoveManager(Base) {
                     break;
                   }
                 }
-                let targetTopLeftX = currentTopLeftX;
-                let targetTopLeftY = currentTopLeftY;
-                switch (moveDirection) {
-                  case Direction.Right:
-                  case "right":
-                    targetTopLeftX = currentTopLeftX + distance;
-                    break;
-                  case Direction.Left:
-                  case "left":
-                    targetTopLeftX = currentTopLeftX - distance;
-                    break;
-                  case Direction.Down:
-                  case "down":
-                    targetTopLeftY = currentTopLeftY + distance;
-                    break;
-                  case Direction.Up:
-                  case "up":
-                    targetTopLeftY = currentTopLeftY - distance;
-                    break;
+                this.remainingDistance = distance;
+                this.segmentDirection = moveDirection;
+                this.segmentStep = this.getTileStepDistance(playerSpeed);
+                this.setNextSegmentTarget(currentTopLeftX, currentTopLeftY);
+                if (this.currentTargetTopLeft) {
+                  this.debugLog(`MOVE direction=${moveDirection} from=(${currentTopLeftX.toFixed(1)}, ${currentTopLeftY.toFixed(1)}) to=(${this.currentTargetTopLeft.x.toFixed(1)}, ${this.currentTargetTopLeft.y.toFixed(1)}) dist=${distance.toFixed(1)}`);
                 }
-                const entity = map.physic.getEntityByUUID(this.player.id);
-                if (!entity) {
-                  this.finished = true;
-                  this.onComplete(false);
-                  return;
-                }
-                const hitbox = this.player.hitbox();
-                const hitboxWidth = hitbox?.w ?? 32;
-                const hitboxHeight = hitbox?.h ?? 32;
-                const targetX = targetTopLeftX + hitboxWidth / 2;
-                const targetY = targetTopLeftY + hitboxHeight / 2;
-                this.currentTarget = { x: targetX, y: targetY };
-                this.currentTargetTopLeft = { x: targetTopLeftX, y: targetTopLeftY };
-                this.currentDirection = { x: 0, y: 0 };
-                this.debugLog(`MOVE direction=${moveDirection} from=(${currentTopLeftX.toFixed(1)}, ${currentTopLeftY.toFixed(1)}) to=(${targetTopLeftX.toFixed(1)}, ${targetTopLeftY.toFixed(1)}) dist=${distance.toFixed(1)}`);
                 this.lastPosition = null;
                 this.isCurrentlyStuck = false;
                 this.stuckCheckStartTime = 0;
@@ -19648,7 +19626,13 @@ function WithMoveManager(Base) {
               const frequencyMs = playerFrequency || 0;
               if (frequencyMs > 0 && Date.now() - this.frequencyWaitStartTime >= frequencyMs * this.ratioFrequency) {
                 this.waitingForFrequency = false;
-                this.processNextRoute();
+                if (this.remainingDistance > 0) {
+                  const currentTopLeftX2 = this.player.x();
+                  const currentTopLeftY2 = this.player.y();
+                  this.setNextSegmentTarget(currentTopLeftX2, currentTopLeftY2);
+                } else {
+                  this.processNextRoute();
+                }
               }
               return;
             }
@@ -19696,6 +19680,10 @@ function WithMoveManager(Base) {
                   if (playerFrequency && playerFrequency > 0) {
                     this.waitingForFrequency = true;
                     this.frequencyWaitStartTime = Date.now();
+                  } else if (this.remainingDistance > 0) {
+                    const nextTopLeftX = this.player.x();
+                    const nextTopLeftY = this.player.y();
+                    this.setNextSegmentTarget(nextTopLeftX, nextTopLeftY);
                   } else {
                     this.processNextRoute();
                   }
@@ -19720,6 +19708,10 @@ function WithMoveManager(Base) {
                   if (playerFrequency && playerFrequency > 0) {
                     this.waitingForFrequency = true;
                     this.frequencyWaitStartTime = Date.now();
+                  } else if (this.remainingDistance > 0) {
+                    const nextTopLeftX = this.player.x();
+                    const nextTopLeftY = this.player.y();
+                    this.setNextSegmentTarget(nextTopLeftX, nextTopLeftY);
                   } else {
                     this.processNextRoute();
                   }
@@ -19794,6 +19786,10 @@ function WithMoveManager(Base) {
                 if (playerFrequency && playerFrequency > 0) {
                   this.waitingForFrequency = true;
                   this.frequencyWaitStartTime = Date.now();
+                } else if (this.remainingDistance > 0) {
+                  const nextTopLeftX = this.player.x();
+                  const nextTopLeftY = this.player.y();
+                  this.setNextSegmentTarget(nextTopLeftX, nextTopLeftY);
                 } else {
                   this.processNextRoute();
                 }
@@ -19816,6 +19812,60 @@ function WithMoveManager(Base) {
           onFinished() {
             this.onComplete(true);
           }
+          getTileStepDistance(playerSpeed) {
+            if (!Number.isFinite(playerSpeed) || playerSpeed <= 0) {
+              return this.tileSize;
+            }
+            const stepsPerTile = Math.max(1, Math.floor(this.tileSize / playerSpeed));
+            return stepsPerTile * playerSpeed;
+          }
+          setNextSegmentTarget(currentTopLeftX, currentTopLeftY) {
+            if (!this.segmentDirection || this.remainingDistance <= 0) {
+              return;
+            }
+            const map = this.player.getCurrentMap();
+            if (!map) {
+              this.finished = true;
+              this.onComplete(false);
+              return;
+            }
+            const entity = map.physic.getEntityByUUID(this.player.id);
+            if (!entity) {
+              this.finished = true;
+              this.onComplete(false);
+              return;
+            }
+            const segmentDistance = Math.min(this.segmentStep || this.remainingDistance, this.remainingDistance);
+            let targetTopLeftX = currentTopLeftX;
+            let targetTopLeftY = currentTopLeftY;
+            switch (this.segmentDirection) {
+              case Direction.Right:
+              case "right":
+                targetTopLeftX = currentTopLeftX + segmentDistance;
+                break;
+              case Direction.Left:
+              case "left":
+                targetTopLeftX = currentTopLeftX - segmentDistance;
+                break;
+              case Direction.Down:
+              case "down":
+                targetTopLeftY = currentTopLeftY + segmentDistance;
+                break;
+              case Direction.Up:
+              case "up":
+                targetTopLeftY = currentTopLeftY - segmentDistance;
+                break;
+            }
+            const hitbox = this.player.hitbox();
+            const hitboxWidth = hitbox?.w ?? 32;
+            const hitboxHeight = hitbox?.h ?? 32;
+            const targetX = targetTopLeftX + hitboxWidth / 2;
+            const targetY = targetTopLeftY + hitboxHeight / 2;
+            this.currentTarget = { x: targetX, y: targetY };
+            this.currentTargetTopLeft = { x: targetTopLeftX, y: targetTopLeftY };
+            this.currentDirection = { x: 0, y: 0 };
+            this.remainingDistance -= segmentDistance;
+          }
         }
         const routeStrategy = new RouteMovementStrategy(
           finalRoutes,
@@ -20178,7 +20228,7 @@ class MenuGui extends Gui {
       spCost: skill?.spCost() ?? 0
     }));
     const saveLoad = this.buildSaveLoad(options);
-    return { menus, items, equips: menuEquips, skills, saveLoad, playerStats: buildStats() };
+    return { menus, items, equips: menuEquips, skills, saveLoad, playerStats: buildStats(), expForNextlevel: player2.expForNextlevel };
   }
   refreshMenu(clientActionId) {
     const data = this.buildMenuData(this.menuOptions);
@@ -20667,10 +20717,10 @@ function WithParameterManager(Base) {
       this._param = type(computed(() => {
         const obj = {};
         const parameters = this._parametersSignal();
+        const allModifiers = this._getAggregatedModifiers();
         const level = this._level();
         for (const [name, paramConfig] of Object.entries(parameters)) {
           let curveVal = Math.floor((paramConfig.end - paramConfig.start) * ((level - 1) / (this.finalLevel - this.initialLevel))) + paramConfig.start;
-          const allModifiers = this._getAggregatedModifiers();
           const modifier = allModifiers[name];
           if (modifier) {
             if (modifier.rate) curveVal *= modifier.rate;
@@ -21499,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);
       }
@@ -21520,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);
     }
   };
 }
@@ -22130,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);
@@ -29874,14 +29931,18 @@ function provideServerModules(modules) {
           }
         };
       }
-      if (module.database && typeof module.database === "object") {
-        const database = { ...module.database };
+      if (module.database) {
+        const database = module.database;
         module = {
           ...module,
           databaseHooks: {
-            load: (engine) => {
-              for (const key in database) {
-                engine.addInDatabase(key, database[key]);
+            load: async (engine) => {
+              const data = typeof database === "function" ? await database(engine) : database;
+              if (!data || typeof data !== "object") {
+                return;
+              }
+              for (const key in data) {
+                engine.addInDatabase(key, data[key]);
               }
             }
           }