@rpgjs/common 3.0.0-beta.6 → 3.0.0-beta.9

package/lib/Module.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadModules = exports.RpgModule = void 0;
 const Plugin_1 = require("./Plugin");
@@ -17,69 +26,89 @@ function RpgModule(options) {
     };
 }
 exports.RpgModule = RpgModule;
-function loadModules(modules, obj) {
-    const { side, relations } = obj;
-    for (let module of modules) {
-        if (!module)
-            continue;
-        let plug = [];
-        if (!Utils_1.isArray(module)) {
-            plug = [module];
-        }
-        else {
-            plug = module;
-        }
-        const [moduleClassSides, options] = plug;
-        const moduleClass = moduleClassSides[side];
-        if (!moduleClass)
-            continue;
-        let mod;
-        if (options && side == Side.Client && options[Side.Server]) {
-            Logger_1.warning(`Data that may be sensitive (normally visible only on the server side) are made optional and visible on the client side.\nInstead, import the configuration with the server! flag into an import. Example: \n\nimport config from 'server!./config\n\n'`, options[Side.Server]);
-        }
-        if (options && !Utils_1.isClass(moduleClass) && Utils_1.isFunction(moduleClass)) {
-            mod = new (moduleClass(options[side]))();
-        }
-        else if (Utils_1.isClass(moduleClass)) {
-            mod = new moduleClass();
-        }
-        else {
-            mod = moduleClass;
-        }
-        const { imports, maps, spritesheets, sounds, gui, scenes, engine, database } = mod;
-        if (imports) {
-            loadModules(imports, obj);
-        }
-        if (maps) {
-            Plugin_1.RpgPlugin.on(Plugin_1.HookServer.AddMap, () => maps);
-        }
-        if (database) {
-            Plugin_1.RpgPlugin.on(Plugin_1.HookServer.AddDatabase, () => database);
-        }
-        if (spritesheets) {
-            Plugin_1.RpgPlugin.on(Plugin_1.HookClient.AddSpriteSheet, () => spritesheets);
-        }
-        if (sounds) {
-            Plugin_1.RpgPlugin.on(Plugin_1.HookClient.AddSound, () => sounds);
-        }
-        if (gui) {
-            Plugin_1.RpgPlugin.on(Plugin_1.HookClient.AddGui, () => gui);
-        }
-        const player = side == Side.Server ? mod.player : mod.sprite;
-        const loadRelations = (hook, relatioName) => {
-            if (hook) {
-                for (let method in relations[relatioName]) {
-                    const hookName = relations[relatioName][method];
-                    if (hook[method])
-                        Plugin_1.RpgPlugin.on(hookName, hook[method]);
+function loadModules(modules, obj, middleware) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { side, relations } = obj;
+        let playerProps = {};
+        for (let module of modules) {
+            if (!module)
+                continue;
+            let plug = [];
+            if (!Utils_1.isArray(module)) {
+                plug = [module];
+            }
+            else {
+                plug = module;
+            }
+            const [moduleClassSides, options] = plug;
+            const moduleClass = moduleClassSides[side];
+            if (!moduleClass)
+                continue;
+            let mod;
+            if (options && side == Side.Client && options[Side.Server]) {
+                Logger_1.warning(`Data that may be sensitive (normally visible only on the server side) are made optional and visible on the client side.\nInstead, import the configuration with the server! flag into an import. Example: \n\nimport config from 'server!./config\n\n'`, options[Side.Server]);
+            }
+            if (options && !Utils_1.isClass(moduleClass) && Utils_1.isFunction(moduleClass)) {
+                mod = new (moduleClass(options[side]))();
+            }
+            else if (Utils_1.isClass(moduleClass)) {
+                mod = new moduleClass();
+            }
+            else {
+                mod = moduleClass;
+            }
+            if (middleware) {
+                mod = middleware(mod);
+                if (Utils_1.isPromise(mod)) {
+                    mod = yield mod;
+                }
+            }
+            const { imports, maps, spritesheets, sounds, gui, scenes, engine, database, worldMaps, scalability } = mod;
+            if (imports) {
+                yield loadModules(imports, obj);
+            }
+            if (maps) {
+                Plugin_1.RpgPlugin.on(Plugin_1.HookServer.AddMap, () => maps);
+            }
+            if (worldMaps) {
+                Plugin_1.RpgPlugin.on(Plugin_1.HookServer.AddWorldMaps, () => worldMaps);
+            }
+            if (database) {
+                Plugin_1.RpgPlugin.on(Plugin_1.HookServer.AddDatabase, () => database);
+            }
+            if (spritesheets) {
+                Plugin_1.RpgPlugin.on(Plugin_1.HookClient.AddSpriteSheet, () => spritesheets);
+            }
+            if (sounds) {
+                Plugin_1.RpgPlugin.on(Plugin_1.HookClient.AddSound, () => sounds);
+            }
+            if (gui) {
+                Plugin_1.RpgPlugin.on(Plugin_1.HookClient.AddGui, () => gui);
+            }
+            const player = side == Side.Server ? mod.player : mod.sprite;
+            const loadRelations = (hook, relatioName) => {
+                if (hook) {
+                    for (let method in relations[relatioName]) {
+                        const hookName = relations[relatioName][method];
+                        if (hook[method])
+                            Plugin_1.RpgPlugin.on(hookName, hook[method]);
+                    }
                 }
+            };
+            loadRelations(player, 'player');
+            if (player && player.props) {
+                playerProps = Object.assign(playerProps, player.props);
             }
+            loadRelations(engine, 'engine');
+            if (scalability)
+                loadRelations(scalability._hooks, 'scalability');
+            if (scenes)
+                loadRelations(scenes.map, 'sceneMap');
+        }
+        return {
+            playerProps
         };
-        loadRelations(player, 'player');
-        loadRelations(engine, 'engine');
-        if (scenes)
-            loadRelations(scenes.map, 'sceneMap');
-    }
+    });
 }
 exports.loadModules = loadModules;
 //# sourceMappingURL=Module.js.map

package/lib/Module.js.map

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

package/lib/Player.d.ts

@@ -1,6 +1,7 @@
 import { RpgShape } from './Shape';
 import SAT from 'sat';
-import Map, { TileInfo } from './Map';
+import { TileInfo } from './Map';
+import { RpgCommonGame } from './Game';
 export declare type Position = {
     x: number;
     y: number;
@@ -16,6 +17,12 @@ export declare enum Direction {
     DownLeft = 3.5,
     UpLeft = 2.5
 }
+export declare const LiteralDirection: {
+    1: string;
+    2: string;
+    3: string;
+    4: string;
+};
 export declare enum PlayerType {
     Player = "player",
     Event = "event"
@@ -33,10 +40,10 @@ export declare class RpgCommonPlayer {
     direction: number;
     private collisionWith;
     private _collisionWithTiles;
-    data: any;
     hitbox: SAT.Box;
     pendingMove: {
         input: string;
+        frame: number;
     }[];
     /**
     * Display/Hide the GUI attached to this sprite
@@ -57,7 +64,7 @@ export declare class RpgCommonPlayer {
         RUN: number;
         ACTION: number;
     };
-    constructor(gameEngine: any, playerId: string);
+    constructor(gameEngine: RpgCommonGame, playerId: string);
     get id(): string;
     set id(str: string);
     updateInVirtualGrid(): void;
@@ -72,10 +79,11 @@ export declare class RpgCommonPlayer {
      */
     set position(val: Position);
     get position(): Position;
+    get worldPositionX(): number;
+    get worldPositionY(): number;
     set posX(val: any);
     set posY(val: any);
     set posZ(val: any);
-    get mapInstance(): Map;
     /**
     *
     * Recovers all the colliding tiles of the current player
@@ -158,16 +166,6 @@ export declare class RpgCommonPlayer {
     get wHitbox(): any;
     get hHitbox(): any;
     private directionToAngle;
-    defineNextPosition(direction: number, deltaTimeInt: number): Position;
-    setPosition({ x, y, tileX, tileY }: {
-        x: any;
-        y: any;
-        tileX: any;
-        tileY: any;
-    }, move?: boolean): void;
-    triggerCollisionWith(type?: number): void;
-    zCollision(other: any): boolean;
-    moveByDirection(direction: Direction, deltaTimeInt: number): boolean;
     /**
      * Retrieves a tile and checks if the player has a collision
      *
@@ -211,7 +209,7 @@ export declare class RpgCommonPlayer {
      * @memberof RpgSpriteLogic
      */
     getTile(x: number, y: number, z?: number, hitbox?: SAT.Box): TileInfo;
-    isCollided(nextPosition: Position): boolean;
+    isCollided(nextPosition: Position): Promise<boolean>;
     /**
      * Attach a shape to the player (and allow interaction with it)
      *
@@ -253,8 +251,6 @@ export declare class RpgCommonPlayer {
      * @memberof RpgSpriteLogic
      */
     getShapes(): RpgShape[];
-    collisionWithShape(shape: RpgShape, player: RpgCommonPlayer, nextPosition?: Position): boolean;
-    move(nextPosition: Position, testCollision?: boolean): boolean;
     /**
      * Retrieves all shapes where the player is located
      *
@@ -305,17 +301,11 @@ export declare class RpgCommonPlayer {
      * This is the ratio between the height or width of the tile and the speed of the player.
      */
     get nbPixelInTile(): any;
-    getSizeMaxShape(x?: number, y?: number): {
-        minX: number;
-        minY: number;
-        maxX: number;
-        maxY: number;
-    };
 }
 export interface RpgCommonPlayer {
     readonly type: string;
     through: boolean;
     throughOtherPlayer: boolean;
-    getVector3D(x: any, y: any, z: any): any;
+    autoChangeMap?(nextPosition: Position): Promise<boolean>;
     execMethod(methodName: string, methodData?: any, instance?: any): any;
 }