@rpgjs/common 3.0.0-beta.7 → 3.0.0-rc

package/lib/Game.d.ts

@@ -1,6 +1,8 @@
 import { EventEmitter } from './EventEmitter';
 import { RpgCommonPlayer } from './Player';
 import { GameWorker } from './Worker';
+import { HitObject } from './Hit';
+import { RpgShape } from './Shape';
 export declare enum GameSide {
     Server = "server",
     Client = "client",
@@ -17,5 +19,6 @@ export declare class RpgCommonGame extends EventEmitter {
     addObject(_class: any, playerId?: string): any;
     addPlayer(playerClass: any, playerId?: string): any;
     addEvent(eventClass: any, eventId?: string): any;
+    addShape(obj: HitObject): RpgShape;
     processInput<RpgPlayer extends RpgCommonPlayer>(playerId: string): Promise<RpgPlayer>;
 }

package/lib/Game.js

@@ -16,6 +16,7 @@ const Player_1 = require("./Player");
 const Input_1 = require("./Input");
 const Plugin_1 = require("./Plugin");
 const Worker_1 = require("./Worker");
+const Shape_1 = require("./Shape");
 var GameSide;
 (function (GameSide) {
     GameSide["Server"] = "server";
@@ -57,13 +58,21 @@ class RpgCommonGame extends EventEmitter_1.EventEmitter {
         const event = this.addObject(eventClass, eventId);
         return event;
     }
+    addShape(obj) {
+        const id = obj.name = (obj.name || Utils_1.generateUID());
+        const shape = new Shape_1.RpgShape(obj);
+        shape.name = id;
+        return shape;
+    }
     processInput(playerId) {
         return __awaiter(this, void 0, void 0, function* () {
             const player = this.world.getObject(playerId);
             if (!player)
                 return player;
-            if (!player.canMove)
+            if (!player.canMove) {
+                player.pendingMove = [];
                 return player;
+            }
             const routesMove = [];
             while (player.pendingMove.length > 0) {
                 const inputData = player.pendingMove.shift();

package/lib/Game.js.map

@@ -1 +1 @@
-{"version":3,"file":"Game.js","sourceRoot":"","sources":["../src/Game.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Game.js","sourceRoot":"","sources":["../src/Game.ts"],"names":[],"mappings":"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"}

package/lib/Hit.d.ts

@@ -19,15 +19,17 @@ export interface HitObject {
     type?: string;
     name?: string;
 }
+export declare enum HitType {
+    Box = "box",
+    Circle = "circle",
+    Polygon = "polygon"
+}
 declare class HitClass {
     createObjectHitbox(x: number, y: number, z: number, w: number, h: number): SAT.Box;
     getHitbox(obj: HitObject, offset?: {
         x: number;
         y: number;
     }): {
-        properties: {
-            [key: string]: any;
-        } | undefined;
         hitbox: SAT;
         type: string;
         name: string | undefined;

package/lib/Hit.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Hit = void 0;
+exports.Hit = exports.HitType = void 0;
 const sat_1 = __importDefault(require("sat"));
 const Utils_1 = require("./Utils");
 var HitType;
@@ -11,7 +11,7 @@ var HitType;
     HitType["Box"] = "box";
     HitType["Circle"] = "circle";
     HitType["Polygon"] = "polygon";
-})(HitType || (HitType = {}));
+})(HitType = exports.HitType || (exports.HitType = {}));
 class HitClass {
     createObjectHitbox(x, y, z, w, h) {
         return new sat_1.default.Box(new sat_1.default.Vector(x, y - z), w, h);
@@ -40,7 +40,6 @@ class HitClass {
             type = obj.type;
         }
         return {
-            properties: obj.properties,
             hitbox,
             type,
             name: obj.name
@@ -48,14 +47,20 @@ class HitClass {
     }
     testPolyCollision(type, hit1, hit2) {
         let collided = false;
+        if (type == HitType.Box) {
+            if (hit1.pos.x <= hit2.pos.x + hit2.w &&
+                hit1.pos.x + hit1.w >= hit2.pos.x &&
+                hit1.pos.y <= hit2.pos.y + hit2.h &&
+                hit1.h + hit1.pos.y >= hit2.pos.y) {
+                return true;
+            }
+            return false;
+        }
         if (Utils_1.isInstanceOf(hit1, sat_1.default.Box))
             hit1 = hit1.toPolygon();
         if (Utils_1.isInstanceOf(hit2, sat_1.default.Box))
             hit2 = hit2.toPolygon();
         switch (type) {
-            case HitType.Box:
-                collided = sat_1.default.testPolygonPolygon(hit1, hit2);
-                break;
             case HitType.Circle:
                 collided = sat_1.default.testPolygonCircle(hit1, hit2);
                 break;

package/lib/Hit.js.map

@@ -1 +1 @@
-{"version":3,"file":"Hit.js","sourceRoot":"","sources":["../src/Hit.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAqB;AACrB,mCAAsC;AAoBtC,IAAK,OAIJ;AAJD,WAAK,OAAO;IACR,sBAAW,CAAA;IACX,4BAAiB,CAAA;IACjB,8BAAmB,CAAA;AACvB,CAAC,EAJI,OAAO,KAAP,OAAO,QAIX;AAED,MAAM,QAAQ;IAEV,kBAAkB,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS;QACpE,OAAO,IAAI,aAAG,CAAC,GAAG,CAAC,IAAI,aAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IACtD,CAAC;IAED,SAAS,CAAC,GAAc,EAAE,MAAiC;QAQvD,IAAI,MAAM,EAAE,IAAI,CAAA;QAChB,IAAI,CAAC,MAAM;YAAE,MAAM,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAA;QACpC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAA;QAC1B,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAA;QAC1B,IAAI,GAAG,CAAC,OAAO,EAAE;YACb,IAAI,GAAG,OAAO,CAAC,MAAM,CAAA;YACrB,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,GAAG,CAAC,CAAA;YAC5B,MAAM,GAAG,IAAI,aAAG,CAAC,MAAM,CAAC,IAAI,aAAG,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,EAAE,CAAC,GAAG,MAAM,CAAC,EAAE,MAAM,CAAC,CAAA;SAC1E;aACI,IAAI,GAAG,CAAC,OAAO,EAAE;YAClB,IAAI,GAAG,OAAO,CAAC,OAAO,CAAA;YACtB,MAAM,GAAG,IAAI,aAAG,CAAC,OAAO,CAAC,IAAI,aAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,aAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;SACzG;aACI,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;YACtD,IAAI,GAAG,OAAO,CAAC,GAAG,CAAA;YAClB,MAAM,GAAG,IAAI,aAAG,CAAC,GAAG,CAAC,IAAI,aAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;SACpE;aACI;YACD,MAAM,GAAG,IAAI,aAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YAC7B,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;SAClB;QACD,OAAO;YACH,UAAU,EAAE,GAAG,CAAC,UAAU;YAC1B,MAAM;YACN,IAAI;YACJ,IAAI,EAAE,GAAG,CAAC,IAAI;SACjB,CAAA;IACL,CAAC;IAED,iBAAiB,CAAC,IAAY,EAAE,IAAS,EAAE,IAAS;QAChD,IAAI,QAAQ,GAAG,KAAK,CAAA;QACpB,IAAI,oBAAY,CAAC,IAAI,EAAE,aAAG,CAAC,GAAG,CAAC;YAAE,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,CAAA;QACxD,IAAI,oBAAY,CAAC,IAAI,EAAE,aAAG,CAAC,GAAG,CAAC;YAAE,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,CAAA;QACxD,QAAQ,IAAI,EAAE;YACV,KAAK,OAAO,CAAC,GAAG;gBACZ,QAAQ,GAAG,aAAG,CAAC,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;gBACjD,MAAK;YACL,KAAK,OAAO,CAAC,MAAM;gBACf,QAAQ,GAAG,aAAG,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;gBAChD,MAAK;YACL,KAAK,OAAO,CAAC,OAAO;gBAChB,QAAQ,GAAG,aAAG,CAAC,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;gBACjD,MAAK;SACR;QACD,OAAO,QAAQ,CAAA;IACnB,CAAC;CACJ;AAEY,QAAA,GAAG,GAAG,IAAI,QAAQ,EAAE,CAAA"}
+{"version":3,"file":"Hit.js","sourceRoot":"","sources":["../src/Hit.ts"],"names":[],"mappings":"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"}

package/lib/Map.d.ts

@@ -1,22 +1,14 @@
 import { HitObject } from './Hit';
 import { RpgShape } from './Shape';
 import { VirtualGrid } from './VirtualGrid';
-export interface Tile {
-    id: number;
-    terrain: any[];
-    probability: any;
-    properties: any;
-    animations: any[];
-    objectGroups: any[];
-    image: any;
-    gid: number;
-}
+import { RpgCommonWorldMaps } from './WorldMaps';
+import { TiledMap, Tile, TiledObjectClass, MapClass } from '@rpgjs/tiled';
 export interface TileInfo {
     tiles: Tile[];
-    hasCollision: boolean;
-    isClimbable?: boolean;
-    isOverlay: boolean;
-    objectGroups: HitObject[];
+    hasCollision: boolean | undefined;
+    isClimbable?: boolean | undefined;
+    isOverlay: boolean | undefined;
+    objectGroups: TiledObjectClass[];
     tileIndex: number;
 }
 export interface LayerInfo {
@@ -28,43 +20,39 @@ export interface LayerInfo {
     objects: HitObject[];
     tiles: Tile[];
 }
-export default class RpgCommonMap {
-    grid: VirtualGrid;
+export declare class RpgCommonMap extends MapClass {
     /**
-     * @title Data of map
-     * @prop {object} [data]
+     * @title map id
      * @readonly
+     * @prop {string} [id]
      * @memberof Map
-     * @memberof RpgSceneMap
      * */
-    data: any;
-    width: number;
-    height: number;
+    readonly id: string;
+    grid: VirtualGrid;
+    gridShapes: VirtualGrid;
+    get tileWidth(): number;
+    get tileHeight(): number;
+    private worldMapParent;
     /**
-     * @title Width of a tile
-     * @prop {number} [tileWidth]
+     * Retrieves the X position of the map in the world (0 if no world assigned)
+     *
+     * @title World X Position
+     * @prop {number} [worldX]
      * @readonly
+     * @since 3.0.0-beta.8
      * @memberof Map
-     * @memberof RpgSceneMap
      * */
-    tileWidth: number;
-    /**
-    * @title Height of a tile
-    * @prop {number} [tileHeight]
-    * @readonly
-    * @memberof Map
-    * @memberof RpgSceneMap
-    * */
-    tileHeight: number;
+    get worldX(): number;
     /**
-     * @title Layers of map
-     * @prop {object[]} [layers]
+     * Retrieves the Y position of the map in the world (0 if no world assigned)
+     *
+     * @title World Y Position
+     * @prop {number} [worldY]
      * @readonly
+     * @since 3.0.0-beta.8
      * @memberof Map
-     * @memberof RpgSceneMap
      * */
-    layers: LayerInfo[];
-    private shapes;
+    get worldY(): number;
     /**
      * Memorize the maps so you don't have to make a new request or open a file each time you load a map
      */
@@ -73,47 +61,7 @@ export default class RpgCommonMap {
      * In RPG mode, to avoid confusion with buffer, we have a new variable to memorize the maps
      */
     static get bufferClient(): Map<any, any>;
-    load(data: any): void;
-    /**
-     * @title Width of the map in pixels
-     * @prop {number} [widthPx]
-     * @readonly
-     * @memberof Map
-     * @memberof RpgSceneMap
-     * */
-    get widthPx(): number;
-    /**
-     * @title Height of the map in pixels
-     * @prop {number} [heightPx]
-     * @readonly
-     * @memberof Map
-     * @memberof RpgSceneMap
-     * */
-    get heightPx(): number;
-    /**
-     * @title The depth of the map in pixels (this is the height of a tile ;))
-     * @prop {number} map.zTileHeight
-     * @readonly
-     * @memberof Map
-     * @memberof RpgSceneMap
-     * */
-    get zTileHeight(): number;
-    _extractShapes(): void;
-    /**
-     * Find a layer by name. Returns `undefined` is the layer is not found
-
-     * @title Get Layer by name
-     * @method map.getLayerByName(name)
-     * @param {string} name layer name
-     * @returns {LayerInfo | undefined}
-     * @example
-     *  ```ts
-     *  const tiles = map.getLayerByName(0, 0)
-     *  ```
-     * @memberof Map
-     * @memberof RpgSceneMap
-     */
-    getLayerByName(name: string): LayerInfo | undefined;
+    load(data: TiledMap): void;
     /**
      * Create a shape dynamically on the map
      *
@@ -172,85 +120,42 @@ export default class RpgCommonMap {
         y: number;
         z: number;
     } | null;
-    setTile(x: number, y: number, layerFilter: string | ((layer: any) => boolean), tileInfo: any): {
-        x: number;
-        y: number;
-        tiles: {
-            [tileIndex: number]: object;
-        };
-    };
     /**
-     * Get the tile index on the tileset
-     *
-     * @title Get index of tile
-     * @method map.getTileIndex(x,y)
-     * @param {number} x Position X
-     * @param {number} x Position Y
-     * @returns {number}
-     * @memberof Map
-     * @memberof RpgSceneMap
+     * Get tile and verify collision with hitbox
+     * @param hitbox
+     * @param x
+     * @param y
+     * @param z
+     * @returns TileInfo
      */
-    getTileIndex(x: number, y: number, [z]?: [number]): number;
+    getTile(hitbox: any, x: number, y: number, z?: [number, number]): TileInfo;
     /**
-     * Retrieves tiles according to its index
+     * Assign the map to a world
 
-     * @title Get tile by index
-     * @method map.getTileByIndex(tileIndex)
-     * @param {number} tileIndex tile index
-     * @returns {TileInfo}
-     * @example
-     *  ```ts
-     *  const index = map.getTileIndex(0, 0)
-     *  const tiles = map.getTileByIndex(index)
-     *  ```
+     * @title Assign the map to a world
+     * @method map.setInWorldMaps(name)
+     * @param {RpgWorldMaps} worldMap world maps
+     * @since 3.0.0-beta.8
      * @memberof Map
-     * @memberof RpgSceneMap
      */
-    getTileByIndex(tileIndex: number, zPlayer?: [number, number]): TileInfo;
+    setInWorldMaps(worldMap: RpgCommonWorldMaps): void;
     /**
-     * Find the point of origin (top left) of a tile. Of course, its position depends on the size of the tile
-
-     * @title Get origin position of tile
-     * @method map.getTileOriginPosition(x,y)
-     * @param {number} x Position X
-     * @param {number} x Position Y
-     * @returns { {x: number, y: number }}
-     * @example
-     *  ```ts
-     *  // If the size of a tile is 32x32px
-     *  const position = map.getTileOriginPosition(35, 12)
-     *  console.log(position) // { x: 32, y: 0 }
-     *  ```
+     * Remove this map from the world
+     * @title Remove this map from the world
+     * @method map.removeFromWorldMaps()
+     * @returns {boolean | undefined}
+     * @since 3.0.0-beta.8
      * @memberof Map
-     * @memberof RpgSceneMap
      */
-    getTileOriginPosition(x: number, y: number): {
-        x: number;
-        y: number;
-    };
+    removeFromWorldMaps(): boolean | undefined;
     /**
-     * Recover tiles according to a position
+    * Recover the world attached to this map (`undefined` if no world attached)
 
-     * @title Get tile by position
-     * @method map.getTileByPosition(x,y)
-     * @param {number} x Position X
-     * @param {number} x Position Y
-     * @returns {TileInfo}
-     * @example
-     *  ```ts
-     *  const tiles = map.getTileByPosition(0, 0)
-     *  ```
-     * @memberof Map
-     * @memberof RpgSceneMap
-     */
-    getTileByPosition(x: number, y: number, z?: [number, number]): TileInfo;
-    /**
-     * Get tile and verify collision with hitbox
-     * @param hitbox
-     * @param x
-     * @param y
-     * @param z
-     * @returns TileInfo
-     */
-    getTile(hitbox: any, x: number, y: number, z?: [number, number]): TileInfo;
+    * @title Get attached World
+    * @method map.getInWorldMaps()
+    * @return {RpgCommonWorldMaps | undefined}
+    * @since 3.0.0-beta.8
+    * @memberof Map
+    */
+    getInWorldMaps(): RpgCommonWorldMaps | undefined;
 }