@rpgjs/common 5.0.0-alpha.25 → 5.0.0-alpha.26

package/dist/database/Item.d.ts

@@ -1,4 +1,11 @@
 import { RpgCommonPlayer } from '../Player';
+interface ItemData {
+    name: string;
+    description: string;
+    price: number;
+    quantity: number;
+    onAdd: (player: RpgCommonPlayer) => void;
+}
 export declare class Item {
     id: import('@signe/reactive').WritableSignal<string>;
     name: import('@signe/reactive').WritableSignal<string>;
@@ -6,5 +13,6 @@ export declare class Item {
     price: import('@signe/reactive').WritableSignal<number>;
     quantity: import('@signe/reactive').WritableSignal<number>;
     onAdd: (player: RpgCommonPlayer) => void;
-    constructor(data: any);
+    constructor(data?: ItemData);
 }
+export {};

package/dist/index.js

@@ -2442,10 +2442,10 @@ class Item {
     this.quantity = signal(1);
     this.onAdd = () => {
     };
-    this.description.set(data.description);
-    this.price.set(data.price);
-    this.name.set(data.name);
-    this.onAdd = data.onAdd?.bind(this) ?? (() => {
+    this.description.set(data?.description ?? "");
+    this.price.set(data?.price ?? 0);
+    this.name.set(data?.name ?? "");
+    this.onAdd = data?.onAdd?.bind(this) ?? (() => {
     });
   }
 }
@@ -9482,6 +9482,10 @@ class RpgCommonMap {
     });
     this.moveManager = new MovementManager(() => this.physic);
     this.speedScalar = 50;
+    // Default speed scalar for movement
+    // World Maps properties
+    this.tileWidth = 32;
+    this.tileHeight = 32;
     this.physicsAccumulatorMs = 0;
     this.physicsSyncDepth = 0;
     /**
@@ -9536,6 +9540,88 @@ class RpgCommonMap {
   get isStandalone() {
     return typeof window !== "undefined";
   }
+  /**
+   * Get the width of the map in pixels
+   * 
+   * @returns The width of the map in pixels, or 0 if not loaded
+   * 
+   * @example
+   * ```ts
+   * const width = map.widthPx;
+   * console.log(`Map width: ${width}px`);
+   * ```
+   */
+  get widthPx() {
+    return this.data()?.width ?? 0;
+  }
+  /**
+   * Get the height of the map in pixels
+   * 
+   * @returns The height of the map in pixels, or 0 if not loaded
+   * 
+   * @example
+   * ```ts
+   * const height = map.heightPx;
+   * console.log(`Map height: ${height}px`);
+   * ```
+   */
+  get heightPx() {
+    return this.data()?.height ?? 0;
+  }
+  /**
+   * Get the unique identifier of the map
+   * 
+   * @returns The map ID, or empty string if not loaded
+   * 
+   * @example
+   * ```ts
+   * const mapId = map.id;
+   * console.log(`Current map: ${mapId}`);
+   * ```
+   */
+  get id() {
+    return this.data()?.id ?? "";
+  }
+  /**
+  * Get the X position of this map in the world coordinate system
+  * 
+  * This is used when maps are part of a larger world map. The world position
+  * indicates where this map is located relative to other maps.
+  * 
+  * @returns The X position in world coordinates, or 0 if not in a world
+  * 
+  * @example
+  * ```ts
+  * const worldX = map.worldX;
+  * console.log(`Map is at world position (${worldX}, ${map.worldY})`);
+  * ```
+  */
+  get worldX() {
+    const worldMaps = this.getWorldMapsManager?.();
+    if (!worldMaps) return 0;
+    const mapId = this.id.startsWith("map-") ? this.id.slice(4) : this.id;
+    return worldMaps.getMapInfo(mapId)?.worldX ?? 0;
+  }
+  /**
+   * Get the Y position of this map in the world coordinate system
+   * 
+   * This is used when maps are part of a larger world map. The world position
+   * indicates where this map is located relative to other maps.
+   * 
+   * @returns The Y position in world coordinates, or 0 if not in a world
+   * 
+   * @example
+   * ```ts
+   * const worldY = map.worldY;
+   * console.log(`Map is at world position (${map.worldX}, ${worldY})`);
+   * ```
+   */
+  get worldY() {
+    const worldMaps = this.getWorldMapsManager?.();
+    if (!worldMaps) return 0;
+    const mapId = this.id.startsWith("map-") ? this.id.slice(4) : this.id;
+    return worldMaps.getMapInfo(mapId)?.worldY ?? 0;
+  }
   /**
    * Clear all physics content and reset to initial state
    * 
@@ -10627,17 +10713,19 @@ class WorldMapsManager {
     if (typeof search === "number") {
       const src = map;
       return maps.filter((m) => {
-        const horizontallyOverlaps = Math.max(src.worldX, m.worldX) < Math.min(src.worldX + src.width, m.worldX + m.width);
-        const verticallyOverlaps = Math.max(src.worldY, m.worldY) < Math.min(src.worldY + src.height, m.worldY + m.height);
+        const horizontallyOverlapsOrTouches = Math.max(src.worldX, m.worldX) <= Math.min(src.worldX + src.widthPx, m.worldX + m.widthPx);
+        const verticallyOverlapsOrTouches = Math.max(src.worldY, m.worldY) <= Math.min(src.worldY + src.heightPx, m.worldY + m.heightPx);
+        const marginLeftRight = src.tileWidth / 2;
+        const marginTopDown = src.tileHeight / 2;
         switch (search) {
           case 0:
-            return verticallyOverlaps && m.worldY + m.height === src.worldY;
+            return verticallyOverlapsOrTouches && m.worldY + m.heightPx - marginTopDown === src.worldY;
           case 1:
-            return verticallyOverlaps && m.worldY === src.worldY + src.height;
+            return verticallyOverlapsOrTouches && m.worldY + marginTopDown === src.worldY + src.heightPx;
           case 2:
-            return horizontallyOverlaps && m.worldX + m.width === src.worldX;
+            return horizontallyOverlapsOrTouches && m.worldX + m.widthPx - marginLeftRight === src.worldX;
           case 3:
-            return horizontallyOverlaps && m.worldX === src.worldX + src.width;
+            return horizontallyOverlapsOrTouches && m.worldX + marginLeftRight === src.worldX + src.widthPx;
           default:
             return false;
         }
@@ -10645,7 +10733,7 @@ class WorldMapsManager {
     }
     if ("x" in search && "y" in search) {
       const found = maps.find(
-        (m) => search.x >= m.worldX && search.x < m.worldX + m.width && search.y >= m.worldY && search.y < m.worldY + m.height
+        (m) => search.x >= m.worldX && search.x < m.worldX + m.widthPx && search.y >= m.worldY && search.y < m.worldY + m.heightPx
       );
       return found ? [found] : [];
     }
@@ -10653,9 +10741,9 @@ class WorldMapsManager {
       const { minX, minY, maxX, maxY } = search;
       return maps.filter((m) => {
         const aLeft = m.worldX;
-        const aRight = m.worldX + m.width;
+        const aRight = m.worldX + m.widthPx;
         const aTop = m.worldY;
-        const aBottom = m.worldY + m.height;
+        const aBottom = m.worldY + m.heightPx;
         const bLeft = minX;
         const bRight = maxX;
         const bTop = minY;