@rpgjs/server 4.0.0-beta.11 → 4.0.0-beta.13

package/src/Player/Player.ts

@@ -1,5 +1,5 @@
 import { RpgCommonPlayer, Utils, RpgPlugin, RpgCommonGame, RpgCommonMap, Direction } from '@rpgjs/common'
-import { Room } from 'simple-room'
+import { Room, WorldClass } from 'simple-room'
 import { RpgMap, EventPosOption } from '../Game/Map'
 import { Query } from '../Query'
 import merge from 'lodash.merge'
@@ -80,10 +80,11 @@ const playerSchemas = {
     hp: Number,
     sp: Number,
     gold: Number,
-    level: Number,
+    level: {
+        $effects: ['$this.expForNextlevel']
+    },
     exp: Number,
     name: String,
-    expForNextlevel: Number,
     items: [{ nb: Number, item: itemSchemas }],
     _class: { name: String, description: String, id: String },
     equipments: [itemSchemas],
@@ -182,6 +183,10 @@ export class RpgPlayer extends RpgCommonPlayer {
         return super.otherPlayersCollision as RpgPlayer[]
     }
 
+    get world(): WorldClass | undefined {
+        return this.server?.world
+    }
+
     // As soon as a teleport has been made, the value is changed to force the client to change the positions on the map without making a move.
     teleported: number = 0
 
@@ -784,12 +789,23 @@ export class RpgPlayer extends RpgCommonPlayer {
         if (this._socket) this._socket.removeAllListeners(key)
     }
 
+    disconnect() {
+        if (this._socket) this._socket.disconnect()
+    }
+
     emitToMap(key: string, value: any) {
         Query.getPlayersOfMap(this.map).forEach(player => player.emit(key, value))
     }
 
-    async execMethod(methodName: string, methodData = []) {
-        const ret = await RpgPlugin.emit(`Server.${methodName}`, [this, ...methodData], true)
+    async execMethod(methodName: string, methodData = [], target?: any) {
+        let ret
+        if (target && target[methodName]) {
+            ret = target[methodName](...methodData)
+            if (isPromise(ret)) await ret
+        }
+        else {
+            ret = await RpgPlugin.emit(`Server.${methodName}`, [this, ...methodData], true)
+        }
         this.syncChanges()
         return ret
     }
@@ -799,6 +815,21 @@ export class RpgPlayer extends RpgCommonPlayer {
         this.emit('Player.' + name, val)
     }
 
+    // @internal
+    /**
+     * Allows you to manually update a status in the rooms that will then be sent to the customer.
+     * @param path 
+     * @example
+     * ```ts
+     * player.changeRoomState('hp')
+     * ```
+     */
+    changeRoomState(path: string) {
+        this.world?.forEachUserRooms(this.id, (room) => {
+            (room as any).$setCurrentState(`users.${this.id}.${path}`)
+        })
+    }
+
     private _eventChanges() {
         if (!this._getMap(this.map)) return
         const {
@@ -928,4 +959,11 @@ export class RpgEvent extends RpgPlayer {
         }
         return ret
     }
+
+    changeRoomState(path: string) {
+        const room = this.getCurrentMap()
+        if (room) {
+            (room as any).$setCurrentState(`events.${this.id}.${path}`)
+        }
+    }
 }

package/src/Player/SkillManager.ts

@@ -17,15 +17,20 @@ const {
     applyMixins
 } = Utils
 
+type SkillClass = { new(...args: any[]) }
+
 export class SkillManager {
 
     skills: any[]
 
-    private _getSkillIndex(skillClass) {
+    private _getSkillIndex(skillClass: SkillClass | string) {
         return this.skills.findIndex(skill => {
             if (isString(skill)) {
                 return skill.id == skillClass
             }
+            if (isString(skillClass)) {
+                return skillClass == skill.id || skill
+            }
             return isInstanceOf(skill, skillClass)
         })
     }
@@ -40,11 +45,11 @@ export class SkillManager {
      * 
      * @title Get Skill
      * @method player.getSkill(skillClass)
-     * @param {SkillClass} skillClass 
+     * @param {SkillClass | string} skillClass or data id
      * @returns {instance of SkillClass | null}
      * @memberof SkillManager
      */
-    getSkill(skillClass) {
+    getSkill(skillClass: SkillClass | string) {
         const index = this._getSkillIndex(skillClass)
         return this.skills[index]
     }
@@ -62,12 +67,13 @@ export class SkillManager {
      * 
      * @title Learn Skill
      * @method player.learnSkill(skillClass)
-     * @param {SkillClass} skillClass 
+     * @param {SkillClass | string} skillClass or data id
      * @returns {instance of SkillClass}
      * @memberof SkillManager
      */
-    learnSkill(skillClass) {
-        const instance = new skillClass()
+    learnSkill(skillClass: SkillClass | string) {
+        if (isString(skillClass)) skillClass = this.databaseById(skillClass)
+        const instance = new (skillClass as SkillClass)()
         if (!instance.coefficient) instance.coefficient = {
             [INT]: 1
         }
@@ -94,7 +100,7 @@ export class SkillManager {
      * 
      * @title Forget Skill
      * @method player.learnSkill(skillClass)
-     * @param {SkillClass} skillClass 
+     * @param {SkillClass | string} skillClass or data id
      * @throws {SkillLog} notLearned 
      * If trying to forget a skill not learned
      *  ```
@@ -106,7 +112,8 @@ export class SkillManager {
      * @returns {instance of SkillClass}
      * @memberof SkillManager
      */
-    forgetSkill(skillClass) {
+    forgetSkill(skillClass: SkillClass | string) {
+        if (isString(skillClass)) skillClass = this.databaseById(skillClass)
         const index = this._getSkillIndex(skillClass)
         if (index == -1) {
             throw SkillLog.notLearned(skillClass)
@@ -151,7 +158,7 @@ export class SkillManager {
      * 
      * @title Use Skill
      * @method player.useSkill(skillClass,otherPlayer)
-     * @param {SkillClass} skillClass
+     * @param {SkillClass | string} skillClass or data id
      * @param {Array<RpgPlayer> | RpgPlayer} [otherPlayer] 
      * @throws {SkillLog} restriction 
      * If the player has the `Effect.CAN_NOT_SKILL` effect 
@@ -192,7 +199,7 @@ export class SkillManager {
      * @memberof SkillManager
      * @todo
      */
-    useSkill(skillClass, otherPlayer?: RpgPlayer | RpgPlayer[]) {
+    useSkill(skillClass: SkillClass | string, otherPlayer?: RpgPlayer | RpgPlayer[]) {
         const skill = this.getSkill(skillClass)
         if (this.hasEffect(Effect.CAN_NOT_SKILL)) {
             throw SkillLog.restriction(skillClass)
@@ -226,4 +233,6 @@ export class SkillManager {
 
 applyMixins(SkillManager, [ParameterManager, StateManager, EffectManager])
 
-export interface SkillManager extends ParameterManager, StateManager, EffectManager { }
+export interface SkillManager extends ParameterManager, StateManager, EffectManager { 
+    databaseById(skillClass: any),
+}

package/src/RpgServer.ts

@@ -136,7 +136,6 @@ export interface RpgPlayerHooks {
     *  When the player increases one level
     * 
     * @prop { (player: RpgPlayer, nbLevel: number) => any } [onLevelUp]
-    * @stability 1
     * @memberof RpgPlayerHooks
     */
     onLevelUp?: (player: RpgPlayer, nbLevel: number) => any
@@ -145,7 +144,6 @@ export interface RpgPlayerHooks {
     *  When the player's HP drops to 0
     * 
     * @prop { (player: RpgPlayer) => any } [onDead]
-    * @stability 1
     * @memberof RpgPlayerHooks
     */
     onDead?: (player: RpgPlayer) => any,

package/src/Scenes/Map.ts

@@ -293,6 +293,7 @@ export class SceneMap {
         player = World.getUser(player.id) as RpgPlayer
 
         if (player) {
+            mapInstance.loadCommonEvents(this.server.inputOptions.events, player)
             player.createDynamicEvent(<any>mapInstance._events, false)
             await player.execMethod('onJoinMap', <any>[mapInstance])
         }

package/src/express/server.ts

@@ -37,7 +37,7 @@ export function expressServer(modules: ModuleType[], options: ExpressServerOptio
 
         // @ts-ignore
         const isBuilt = !!envs.VITE_BUILT
-        
+
         // @ts-ignore
         const hasStatic = process.env.STATIC_DIRECTORY_ENABLED
         const staticDirectory = isBuilt ? '' : 'dist'
@@ -50,13 +50,15 @@ export function expressServer(modules: ModuleType[], options: ExpressServerOptio
                 limit: '50mb'
             }))
         }
-       
+
         if (staticEnabled) {
             app.use('/', express.static(path.join(dirname, '..', staticDirectory, 'client')))
         }
 
+        let rpgGame: RpgServerEngine
+
         async function start() {
-            const rpgGame = await entryPoint(modules, { io, ...options })
+            rpgGame = await entryPoint(modules, { io, ...options })
             rpgGame.app = app
             rpgGame.start()
             app.use('/api', api(rpgGame))
@@ -89,6 +91,7 @@ export function expressServer(modules: ModuleType[], options: ExpressServerOptio
                 Query.getPlayers().forEach(player => {
                     player.gameReload()
                 })
+                rpgGame.stop()
             });
         }
     })

package/src/server.ts

@@ -7,6 +7,7 @@ import { Utils, RpgPlugin, Scheduler, HookServer, RpgCommonGame, DefaultInput }
 import { Observable } from 'rxjs';
 import { Tick } from '@rpgjs/types';
 import { Actor, Armor, Class, DatabaseTypes, Item, Skill, State, Weapon } from '@rpgjs/database';
+import { RpgMap } from './Game/Map';
 
 export class RpgServerEngine {
 
@@ -360,7 +361,7 @@ export class RpgServerEngine {
         })
 
         socket.on('disconnect', () => {
-            this.onPlayerDisconnected(socket.id, playerId)
+            this.onPlayerDisconnected(playerId)
         })
 
         this.world.setUser(player, socket)
@@ -383,14 +384,13 @@ export class RpgServerEngine {
         }
     }
 
-    /**
-     * 
-     * @param {string} socketId - The socketId of the player that disconnected
-     * @param {string} playerId - The playerId of the player that disconnected 
-     */
-    private onPlayerDisconnected(socketId, playerId: string) {
+    private onPlayerDisconnected(playerId: string) {
         const player: RpgPlayer = World.getUser(playerId) as RpgPlayer
         player.execMethod('onDisconnected')
         this.world.disconnectUser(playerId)
     }
+
+    stop() {
+        this.scheduler.stop()
+    }
 }