@rpgjs/server 5.0.0-beta.3 → 5.0.0-beta.5

package/dist/Player/SkillManager.d.ts

@@ -3,9 +3,19 @@ import { RpgPlayer } from './Player';
 /**
  * Type for skill class constructor
  */
-type SkillClass = {
+export type SkillClass = {
     new (...args: any[]): any;
 };
+export type SkillChangeAction = "learn" | "forget";
+export interface SkillChangeOptions {
+    source?: "manual" | "level" | "class" | "studio" | string;
+    level?: number;
+}
+export interface SkillChangePayload extends SkillChangeOptions {
+    action: SkillChangeAction;
+    skill: SkillClass | SkillObject | string;
+    skillId: string;
+}
 /**
  * Interface defining the hooks that can be implemented on skill classes or objects
  *
@@ -180,7 +190,7 @@ export interface ISkillManager {
      * @returns The learned skill data
      * @throws SkillLog.alreadyLearned if the player already knows the skill
      */
-    learnSkill(skillInput: SkillClass | SkillObject | string): any;
+    learnSkill(skillInput: SkillClass | SkillObject | string, options?: SkillChangeOptions): any;
     /**
      * Forget a skill
      *
@@ -188,7 +198,7 @@ export interface ISkillManager {
      * @returns The forgotten skill data
      * @throws SkillLog.notLearned if trying to forget a skill not learned
      */
-    forgetSkill(skillInput: SkillClass | SkillObject | string): any;
+    forgetSkill(skillInput: SkillClass | SkillObject | string, options?: SkillChangeOptions): any;
     /**
      * Use a skill
      *
@@ -202,4 +212,3 @@ export interface ISkillManager {
      */
     useSkill(skillInput: SkillClass | SkillObject | string, otherPlayer?: RpgPlayer | RpgPlayer[]): any;
 }
-export {};

package/dist/RpgServer.d.ts

@@ -3,6 +3,7 @@ import { RpgPlayer, RpgEvent } from './Player/Player';
 import { RpgMap } from './rooms/map';
 import { RpgServerEngine } from './RpgServerEngine';
 import { WorldMapConfig, RpgShape, MapPhysicsInitContext, MapPhysicsEntityContext } from '../../common/src';
+import { SkillChangePayload } from './Player/SkillManager';
 type RpgClassMap<T> = new () => T;
 type RpgClassEvent<T> = RpgEvent;
 type MatchMakerOption = any;
@@ -196,6 +197,13 @@ export interface RpgPlayerHooks {
     */
     onLevelUp?: (player: RpgPlayer, nbLevel: number) => any;
     /**
+    *  When a player learns or forgets a skill
+    *
+    * @prop { (player: RpgPlayer, payload: SkillChangePayload) => any } [onSkillChange]
+    * @memberof RpgPlayerHooks
+    */
+    onSkillChange?: (player: RpgPlayer, payload: SkillChangePayload) => any;
+    /**
     *  When the player's HP drops to 0
     *
     * @prop { (player: RpgPlayer) => any } [onDead]

package/dist/index.js

@@ -7826,6 +7826,13 @@ function provideAutoSave(strategy) {
 }
 //#endregion
 //#region src/Gui/MenuGui.ts
+function readReactiveValue(value, context) {
+	return typeof value === "function" ? value.call(context) : value;
+}
+function readField(source, key, fallback) {
+	const value = source?.[key];
+	return readReactiveValue(value, source) ?? fallback;
+}
 var MenuGui = class extends Gui {
 	constructor(player) {
 		super(PrebuiltGui.MainMenu, player);
@@ -7882,7 +7889,7 @@ var MenuGui = class extends Gui {
 		}));
 		const player = this.player;
 		const databaseById = player.databaseById?.bind(player);
-		const equippedIds = new Set((player.equipments?.() || []).map((it) => it?.id?.() ?? it?.id ?? it?.name));
+		const equippedIds = new Set((player.equipments?.() || []).map((it) => readField(it, "id", readField(it, "name"))));
 		const buildStats = () => {
 			const params = player.param || {};
 			const statKeys = [
@@ -7895,29 +7902,29 @@ var MenuGui = class extends Gui {
 			];
 			const stats = {};
 			statKeys.forEach((key) => {
-				stats[key] = params[key] ?? 0;
+				stats[key] = readReactiveValue(params[key]) ?? 0;
 			});
-			stats.pdef = player.pdef ?? params.pdef ?? 0;
-			stats.sdef = player.sdef ?? params.sdef ?? 0;
-			stats.atk = player.atk ?? params.atk ?? 0;
+			stats.pdef = readReactiveValue(player.pdef ?? params.pdef) ?? 0;
+			stats.sdef = readReactiveValue(player.sdef ?? params.sdef) ?? 0;
+			stats.atk = readReactiveValue(player.atk ?? params.atk) ?? 0;
 			return stats;
 		};
 		const items = (player.items?.() || []).map((item) => {
-			const id = item.id();
+			const id = readField(item, "id");
 			const data = databaseById ? databaseById(id) : {};
-			const type = data?._type ?? "item";
-			const consumable = data?.consumable;
+			const type = readField(data, "_type", "item");
+			const consumable = readField(data, "consumable");
 			const isConsumable = consumable !== void 0 ? consumable : type === "item";
 			const usable = isConsumable === false ? false : consumable === void 0 && type !== "item" ? false : true;
 			return {
 				id,
-				name: item.name(),
-				description: item.description(),
-				quantity: item.quantity(),
-				icon: data?.icon ?? item?.icon,
-				atk: item.atk(),
-				pdef: item.pdef(),
-				sdef: item.sdef(),
+				name: readField(item, "name"),
+				description: readField(item, "description"),
+				quantity: readField(item, "quantity"),
+				icon: readField(data, "icon", readField(item, "icon")),
+				atk: readField(item, "atk"),
+				pdef: readField(item, "pdef"),
+				sdef: readField(item, "sdef"),
 				consumable: isConsumable,
 				type,
 				usable,
@@ -7929,14 +7936,14 @@ var MenuGui = class extends Gui {
 			items,
 			equips: items.filter((item) => item.type === "weapon" || item.type === "armor"),
 			skills: (player.skills?.() || []).map((skill) => ({
-				id: skill?.id() ?? skill?.name(),
-				name: skill?.name() ?? skill?.id() ?? "Skill",
-				description: skill?.description() ?? "",
-				spCost: skill?.spCost() ?? 0
+				id: readField(skill, "id", readField(skill, "name")),
+				name: readField(skill, "name", readField(skill, "id", "Skill")),
+				description: readField(skill, "description", ""),
+				spCost: readField(skill, "spCost", 0)
 			})),
 			saveLoad: this.buildSaveLoad(options),
 			playerStats: buildStats(),
-			expForNextlevel: player.expForNextlevel
+			expForNextlevel: readReactiveValue(player.expForNextlevel)
 		};
 	}
 	refreshMenu(clientActionId) {
@@ -8708,7 +8715,10 @@ function WithParameterManager(Base) {
 			if (this.finalLevel && val > this.finalLevel) val = this.finalLevel;
 			const currentClass = this._class && this._class();
 			if (currentClass && "skillsToLearn" in currentClass && Array.isArray(currentClass.skillsToLearn)) {
-				for (let i = this._level(); i <= val; i++) for (let skill of currentClass.skillsToLearn) if (skill.level == i) this["learnSkill"](skill.skill);
+				for (let i = this._level(); i <= val; i++) for (let skill of currentClass.skillsToLearn) if (skill.level == i) this["learnSkill"](skill.skill, {
+					source: skill.source ?? "level",
+					level: i
+				});
 			}
 			const hasNewLevel = val - lastLevel;
 			if (hasNewLevel > 0) this["execMethod"]("onLevelUp", [hasNewLevel]);
@@ -9763,7 +9773,7 @@ function WithSkillManager(Base) {
 		* });
 		* ```
 		*/
-		learnSkill(skillInput) {
+		learnSkill(skillInput, options = {}) {
 			const map = this._getSkillMap();
 			const { skillId, skillData, skillInstance } = this._resolveSkillInput(skillInput, map);
 			if (this._getLearnedSkillEntry(skillId)) throw SkillLog.alreadyLearned(skillData);
@@ -9771,6 +9781,13 @@ function WithSkillManager(Base) {
 			this.skills().push(instance);
 			const hookTarget = instance._skillInstance || instance;
 			this["execMethod"]("onLearn", [this], hookTarget);
+			this["execMethod"]("onSkillChange", [{
+				action: "learn",
+				skill: skillData,
+				skillId,
+				source: options.source ?? "manual",
+				level: options.level
+			}]);
 			return skillData;
 		}
 		/**
@@ -9789,7 +9806,7 @@ function WithSkillManager(Base) {
 		* player.forgetSkill(FireSkill);
 		* ```
 		*/
-		forgetSkill(skillInput) {
+		forgetSkill(skillInput, options = {}) {
 			const index = this._getSkillIndex(skillInput);
 			if (index === -1) {
 				let skillData = skillInput;
@@ -9812,6 +9829,13 @@ function WithSkillManager(Base) {
 			this.skills().splice(index, 1);
 			const hookTarget = skillEntry?._skillInstance || skillEntry?._skillData || skillData;
 			this["execMethod"]("onForget", [this], hookTarget);
+			this["execMethod"]("onSkillChange", [{
+				action: "forget",
+				skill: skillData,
+				skillId: skillData?.id ?? String(skillInput),
+				source: options.source ?? "manual",
+				level: options.level
+			}]);
 			return skillData;
 		}
 		/**
@@ -10730,7 +10754,9 @@ var RpgPlayer = class extends BasicPlayerMixins(RpgCommonPlayer) {
 				animationName,
 				graphic,
 				nbTimes: finalNbTimes,
-				object: this.id
+				object: this.id,
+				restoreAnimationName: this.animationName(),
+				restoreGraphics: [...this.graphics()]
 			}
 		});
 	}
@@ -15746,6 +15772,12 @@ var RpgMap = class RpgMap extends RpgCommonMap {
 	* ```
 	*/
 	async onInput(player, input) {
+		if (typeof player.canMove === "function" && !player.canMove()) {
+			player.pendingInputs = [];
+			player.lastProcessedInputTs = 0;
+			this.stopMovement(player);
+			return;
+		}
 		const lastAckedFrame = player._lastFramePositions?.frame ?? 0;
 		const now = Date.now();
 		const candidates = [];
@@ -16048,6 +16080,15 @@ var RpgMap = class RpgMap extends RpgCommonMap {
 				inputs: []
 			};
 		}
+		if (typeof player.canMove === "function" && !player.canMove()) {
+			player.pendingInputs = [];
+			player.lastProcessedInputTs = 0;
+			this.stopMovement(player);
+			return {
+				player,
+				inputs: []
+			};
+		}
 		const processedInputs = [];
 		const config = {
 			maxTimeDelta: 1e3,
@@ -17216,7 +17257,11 @@ var LobbyRoom = class LobbyRoom extends BaseRoom {
 	async guiInteraction(player, value) {
 		if (value.data.id === "start") {
 			player.initializeDefaultStats();
-			this.hooks.callHooks("server-player-onStart", player).subscribe();
+			try {
+				await lastValueFrom(this.hooks.callHooks("server-player-onStart", player));
+			} catch (error) {
+				console.error("[RPGJS] Error during player onStart hooks:", error);
+			}
 		}
 	}
 };