@rpgjs/action-battle 5.0.0-beta.3 → 5.0.0-beta.5

package/dist/server/index7.js

@@ -0,0 +1,37 @@
+//#region src/targeting.ts
+var normalizeMaskRows = (mask) => {
+	if (!mask) return ["#"];
+	if (Array.isArray(mask)) return mask;
+	return mask.trim().split("\n").map((row) => row.replace(/\r/g, ""));
+};
+var parseAoeMask = (mask) => {
+	const rows = normalizeMaskRows(mask);
+	const height = rows.length;
+	const width = rows.reduce((max, row) => Math.max(max, row.length), 0);
+	const centerX = Math.floor(width / 2);
+	const centerY = Math.floor(height / 2);
+	const cells = [];
+	rows.forEach((row, y) => {
+		for (let x = 0; x < row.length; x++) {
+			const char = row[x];
+			if (char && char !== "." && char !== " ") cells.push({
+				dx: x - centerX,
+				dy: y - centerY
+			});
+		}
+	});
+	if (cells.length === 0) cells.push({
+		dx: 0,
+		dy: 0
+	});
+	return {
+		width,
+		height,
+		centerX,
+		centerY,
+		cells
+	};
+};
+var manhattanDistance = (a, b) => Math.abs(a.x - b.x) + Math.abs(a.y - b.y);
+//#endregion
+export { manhattanDistance, parseAoeMask };

package/dist/server/index8.js

@@ -0,0 +1,46 @@
+//#region src/core/hit.ts
+var applyActionBattleHit = (system, context) => {
+	let hitContext = { ...context };
+	const before = system.hooks?.beforeHit?.(hitContext);
+	if (before === false) return {
+		damage: 0,
+		knockbackForce: 0,
+		knockbackDuration: 0,
+		defeated: false,
+		attacker: hitContext.attacker,
+		target: hitContext.target,
+		cancelled: true,
+		metadata: hitContext.metadata
+	};
+	if (before) hitContext = before;
+	const damage = hitContext.damage ?? system.resolveDamage({
+		attacker: hitContext.attacker,
+		target: hitContext.target,
+		skill: hitContext.skill,
+		pattern: hitContext.pattern
+	});
+	hitContext.damage = damage;
+	const afterDamage = system.hooks?.afterDamage?.(hitContext);
+	if (afterDamage) hitContext = afterDamage;
+	const knockback = hitContext.knockback ?? system.resolveKnockback({
+		attacker: hitContext.attacker,
+		target: hitContext.target,
+		damage
+	});
+	hitContext.knockback = knockback;
+	if (!damage.defeated && knockback.force > 0 && knockback.direction) hitContext.target.knockback?.(knockback.direction, knockback.force, knockback.duration);
+	const result = {
+		damage: damage.damage,
+		knockbackForce: knockback.force,
+		knockbackDuration: knockback.duration,
+		defeated: damage.defeated,
+		attacker: hitContext.attacker,
+		target: hitContext.target,
+		rawDamage: damage.raw,
+		metadata: hitContext.metadata
+	};
+	system.hooks?.afterHit?.(result);
+	return result;
+};
+//#endregion
+export { applyActionBattleHit };

package/dist/server/index9.js

@@ -0,0 +1,447 @@
+import { playActionBattleAnimation } from "./index2.js";
+import { normalizeActionBattleOptions, setActionBattleOptions } from "./index3.js";
+import { DEFAULT_ZELDA_PLAYER_HITBOXES } from "./index4.js";
+import { getActionBattleSystems, setActionBattleSystems } from "./index5.js";
+import { DEFAULT_KNOCKBACK } from "./index6.js";
+import { manhattanDistance, parseAoeMask } from "./index7.js";
+import { applyActionBattleHit } from "./index8.js";
+import { RpgEvent } from "@rpgjs/server";
+import { Control, defineModule } from "@rpgjs/common";
+//#region src/server.ts
+var ACTION_BATTLE_ACTION_BAR_GUI_ID = "action-battle-action-bar";
+var DEFAULT_ATTACK_LOCK_DURATION_MS = 350;
+/**
+* Default player attack hitboxes offsets for each direction
+* 
+* These hitboxes define the attack areas relative to the player's position
+* for each cardinal direction. They are converted to absolute coordinates
+* when creating the moving hitbox.
+*/
+var DEFAULT_PLAYER_ATTACK_HITBOXES = { ...DEFAULT_ZELDA_PLAYER_HITBOXES };
+var beginPlayerAttackLock = (player, map, durationMs) => {
+	if (durationMs <= 0) return true;
+	const runtimePlayer = player;
+	const now = Date.now();
+	if (typeof runtimePlayer.__actionBattleAttackLockedUntil === "number" && runtimePlayer.__actionBattleAttackLockedUntil > now) return false;
+	const lockId = (runtimePlayer.__actionBattleAttackLockId ?? 0) + 1;
+	runtimePlayer.__actionBattleAttackLockId = lockId;
+	runtimePlayer.__actionBattleAttackLockedUntil = now + durationMs;
+	const previousCanMove = typeof player.canMove === "function" ? player.canMove() : true;
+	const previousDirectionFixed = player.directionFixed;
+	const previousAnimationFixed = player.animationFixed;
+	player.pendingInputs = [];
+	player.lastProcessedInputTs = 0;
+	map?.stopMovement?.(player);
+	player.canMove.set(false);
+	player.directionFixed = true;
+	setTimeout(() => {
+		if (runtimePlayer.__actionBattleAttackLockId !== lockId) return;
+		runtimePlayer.__actionBattleAttackLockedUntil = 0;
+		player.canMove.set(previousCanMove);
+		player.directionFixed = previousDirectionFixed;
+		player.animationFixed = previousAnimationFixed;
+	}, durationMs);
+	return true;
+};
+var isBattleEvent = (event) => !!event.battleAi;
+var rectsOverlap = (a, b) => a.x < b.x + b.width && a.x + a.width > b.x && a.y < b.y + b.height && a.y + a.height > b.y;
+var eventRect = (event) => {
+	const hitbox = typeof event.hitbox === "function" ? event.hitbox() : event.hitbox;
+	return {
+		x: event.x(),
+		y: event.y(),
+		width: hitbox?.w ?? 32,
+		height: hitbox?.h ?? 32
+	};
+};
+var getVisibleActionEvents = (player, map, hitboxes) => {
+	if (!map) return [];
+	const eventsById = /* @__PURE__ */ new Map();
+	const addEvent = (event) => {
+		if (!event) return;
+		if (!(typeof map.isEventVisibleForPlayer === "function" ? map.isEventVisibleForPlayer(event, player) : true)) return;
+		eventsById.set(event.id, event);
+	};
+	const collisions = map.getCollisions?.(player.id);
+	if (Array.isArray(collisions)) collisions.forEach((id) => addEvent(map.getEvent(id)));
+	for (const event of map.getEvents()) {
+		const rect = eventRect(event);
+		if (hitboxes.some((hitbox) => rectsOverlap(hitbox, rect))) addEvent(event);
+	}
+	return Array.from(eventsById.values());
+};
+var isActionReservedForNormalEvent = (player, map, hitboxes) => {
+	const events = getVisibleActionEvents(player, map, hitboxes);
+	return events.length > 0 && !events.some(isBattleEvent);
+};
+/**
+* Get knockback force from player's equipped weapon
+* 
+* Retrieves the knockbackForce property from the player's equipped weapon.
+* Falls back to DEFAULT_KNOCKBACK.force if no weapon or property is set.
+* 
+* @param player - The player to get weapon knockback from
+* @returns Knockback force value
+* 
+* @example
+* ```ts
+* // Player with weapon having knockbackForce: 80
+* const force = getPlayerWeaponKnockbackForce(player); // 80
+* 
+* // No weapon equipped
+* const force = getPlayerWeaponKnockbackForce(player); // 50 (default)
+* ```
+*/
+function getPlayerWeaponKnockbackForce(player) {
+	try {
+		const equipments = player.equipments?.() || [];
+		for (const item of equipments) {
+			const itemData = player.databaseById?.(item.id());
+			if (itemData?._type === "weapon" && itemData.knockbackForce !== void 0) return itemData.knockbackForce;
+		}
+	} catch {}
+	return DEFAULT_KNOCKBACK.force;
+}
+/**
+* Apply hit from player to target (event with AI)
+* 
+* Handles damage calculation, knockback based on weapon, and visual effects.
+* Can be customized using hooks.
+* 
+* @param player - The attacking player
+* @param target - The event being hit
+* @param hooks - Optional hooks for customizing hit behavior
+* @returns Hit result if AI exists, undefined otherwise
+* 
+* @example
+* ```ts
+* // Basic hit
+* const result = applyPlayerHitToEvent(player, event);
+* 
+* // With custom hooks
+* const result = applyPlayerHitToEvent(player, event, {
+*   onBeforeHit(result) {
+*     result.knockbackForce *= 2; // Double knockback
+*     return result;
+*   },
+*   onAfterHit(result) {
+*     if (result.defeated) {
+*       player.gold += 10;
+*     }
+*   }
+* });
+* ```
+*/
+function applyPlayerHitToEvent(player, target, hooks) {
+	const ai = target.battleAi;
+	if (!ai) return void 0;
+	const systems = getActionBattleSystems();
+	const result = applyActionBattleHit({
+		...systems.combat,
+		hooks: hooks ? {
+			...systems.combat.hooks,
+			beforeHit(context) {
+				const before = systems.combat.hooks?.beforeHit?.(context);
+				if (before === false) return false;
+				const nextContext = before || context;
+				const legacyResult = toLegacyHitResult(nextContext);
+				const modified = hooks.onBeforeHit?.(legacyResult);
+				if (!modified) return nextContext;
+				return {
+					...nextContext,
+					damage: {
+						damage: modified.damage,
+						defeated: modified.defeated,
+						raw: nextContext.damage?.raw
+					},
+					knockback: {
+						force: modified.knockbackForce,
+						duration: modified.knockbackDuration,
+						direction: nextContext.knockback?.direction
+					}
+				};
+			},
+			afterHit(result) {
+				systems.combat.hooks?.afterHit?.(result);
+				hooks.onAfterHit?.(result);
+			}
+		} : systems.combat.hooks
+	}, {
+		attacker: player,
+		target
+	});
+	if (!result.cancelled) ai.handleDamage(player, {
+		damage: result.damage,
+		defeated: result.defeated,
+		raw: result.rawDamage
+	});
+	return result;
+}
+var toLegacyHitResult = (context) => ({
+	damage: context.damage?.damage ?? 0,
+	knockbackForce: context.knockback?.force ?? getPlayerWeaponKnockbackForce(context.attacker),
+	knockbackDuration: context.knockback?.duration ?? DEFAULT_KNOCKBACK.duration,
+	defeated: context.damage?.defeated ?? false,
+	attacker: context.attacker,
+	target: context.target
+});
+var resolvePlayerAttackHitboxes = (player, directionKey, options) => {
+	const configuredHitboxes = {
+		...DEFAULT_PLAYER_ATTACK_HITBOXES,
+		...options.attack?.hitboxes
+	};
+	const hitboxConfig = configuredHitboxes[directionKey] || configuredHitboxes.default;
+	const defaultHitboxes = [{
+		x: player.x() + hitboxConfig.offsetX,
+		y: player.y() + hitboxConfig.offsetY,
+		width: hitboxConfig.width,
+		height: hitboxConfig.height
+	}];
+	return options.attack?.resolveHitboxes?.({
+		player,
+		direction: directionKey,
+		defaultHitboxes
+	}) ?? defaultHitboxes;
+};
+var resolveSignal = (value) => typeof value === "function" ? value() : value;
+var resolveItemData = (player, itemId) => {
+	try {
+		return player.databaseById?.(itemId);
+	} catch {
+		return null;
+	}
+};
+var resolveSkillData = (player, skillId) => {
+	try {
+		return player.databaseById?.(skillId);
+	} catch {
+		return null;
+	}
+};
+var resolveSkillTargeting = (player, skillId, options) => {
+	const skillsOptions = options.skills;
+	const skillData = resolveSkillData(player, skillId);
+	if (skillsOptions?.getTargeting) return skillsOptions.getTargeting(skillData);
+	const range = skillData?.range ?? skillData?.targeting?.range ?? skillData?.targeting?.distance;
+	const aoeMask = skillData?.aoeMask ?? skillData?.targeting?.aoeMask ?? skillData?.targeting?.mask;
+	if (range === void 0 && aoeMask === void 0) return null;
+	return {
+		range: range ?? 0,
+		aoeMask
+	};
+};
+var normalizeMaskRows = (mask) => {
+	if (!mask) return [];
+	if (Array.isArray(mask)) return mask;
+	return mask.trim().split("\n").map((row) => row.replace(/\r/g, ""));
+};
+var buildActionBarData = (player, options) => {
+	return {
+		items: (player.items?.() || []).map((item) => {
+			const id = item.id?.() ?? item.id;
+			const data = resolveItemData(player, id);
+			const name = resolveSignal(data?.name) ?? resolveSignal(item.name) ?? id;
+			const description = resolveSignal(data?.description) ?? resolveSignal(item.description) ?? "";
+			const icon = resolveSignal(data?.icon) ?? resolveSignal(item.icon);
+			const quantity = resolveSignal(item.quantity) ?? 1;
+			const consumable = resolveSignal(data?.consumable);
+			const itemType = resolveSignal(data?._type);
+			return {
+				id,
+				name,
+				description,
+				icon,
+				quantity,
+				usable: quantity > 0 && consumable !== false && (itemType ? itemType === "item" : true)
+			};
+		}),
+		skills: (player.skills?.() || []).map((skill) => {
+			const id = skill.id?.() ?? skill.id;
+			const data = resolveSkillData(player, id) || skill;
+			const name = resolveSignal(data?.name) ?? resolveSignal(skill.name) ?? id;
+			const description = resolveSignal(data?.description) ?? resolveSignal(skill.description) ?? "";
+			const icon = resolveSignal(data?.icon) ?? resolveSignal(skill.icon);
+			const spCost = resolveSignal(data?.spCost) ?? resolveSignal(skill.spCost) ?? 0;
+			const usable = spCost <= player.sp;
+			const targeting = resolveSkillTargeting(player, id, options);
+			const skillEntry = {
+				id,
+				name,
+				description,
+				icon,
+				spCost,
+				usable,
+				range: targeting?.range ?? 0
+			};
+			if (targeting) {
+				const mask = targeting.aoeMask ?? options.skills?.defaultAoeMask;
+				if (mask) skillEntry.aoeMask = normalizeMaskRows(mask);
+			}
+			return skillEntry;
+		})
+	};
+};
+var ensureActionBarGui = (player, options) => {
+	const gui = player.getGui?.("action-battle-action-bar") || player.gui("action-battle-action-bar");
+	if (!gui.__actionBattleReady) {
+		gui.__actionBattleReady = true;
+		gui.on("useItem", ({ id }) => {
+			try {
+				player.useItem(id);
+			} catch {}
+			gui.update(buildActionBarData(player, options));
+		});
+		gui.on("useSkill", ({ id, target }) => {
+			handleActionBattleSkillUse(player, id, target, options);
+			gui.update(buildActionBarData(player, options));
+		});
+		gui.on("refresh", () => {
+			gui.update(buildActionBarData(player, options));
+		});
+	}
+	return gui;
+};
+var openActionBattleActionBar = (player, rawOptions = {}) => {
+	const options = normalizeActionBattleOptions(rawOptions);
+	ensureActionBarGui(player, options).open(buildActionBarData(player, options));
+};
+var updateActionBattleActionBar = (player, rawOptions = {}) => {
+	const options = normalizeActionBattleOptions(rawOptions);
+	const gui = player.getGui?.(ACTION_BATTLE_ACTION_BAR_GUI_ID);
+	if (gui) gui.update(buildActionBarData(player, options));
+};
+var getTileSize = (map) => ({
+	width: map?.tileWidth ?? 32,
+	height: map?.tileHeight ?? 32
+});
+var getEntityTile = (entity, tileSize) => {
+	const hitbox = entity.hitbox?.() || {
+		w: tileSize.width,
+		h: tileSize.height
+	};
+	return {
+		x: Math.floor((entity.x() + hitbox.w / 2) / tileSize.width),
+		y: Math.floor((entity.y() + hitbox.h / 2) / tileSize.height)
+	};
+};
+var handleActionBattleSkillUse = (player, skillId, target, options) => {
+	const skillData = resolveSkillData(player, skillId);
+	const map = player.getCurrentMap();
+	if (!map) {
+		playActionBattleAnimation("castSkill", player, options.animations, { skill: skillData });
+		player.useSkill(skillId);
+		return;
+	}
+	const targeting = resolveSkillTargeting(player, skillId, options);
+	if (!targeting || !target) {
+		playActionBattleAnimation("castSkill", player, options.animations, { skill: skillData });
+		player.useSkill(skillId);
+		return;
+	}
+	const tileSize = getTileSize(map);
+	const origin = getEntityTile(player, tileSize);
+	const targetTile = {
+		x: target.x,
+		y: target.y
+	};
+	if (manhattanDistance(origin, targetTile) > targeting.range) return;
+	const mask = parseAoeMask(targeting.aoeMask || options.skills?.defaultAoeMask);
+	const affected = /* @__PURE__ */ new Set();
+	mask.cells.forEach((cell) => {
+		const x = targetTile.x + cell.dx;
+		const y = targetTile.y + cell.dy;
+		affected.add(`${x},${y}`);
+	});
+	const targets = [];
+	const affects = options.targeting?.affects || "events";
+	if (affects === "events" || affects === "both") map.getEvents().forEach((event) => {
+		const tile = getEntityTile(event, tileSize);
+		if (affected.has(`${tile.x},${tile.y}`)) targets.push(event);
+	});
+	if (affects === "players" || affects === "both") map.getPlayers().forEach((other) => {
+		if (other.id === player.id) return;
+		const tile = getEntityTile(other, tileSize);
+		if (affected.has(`${tile.x},${tile.y}`)) targets.push(other);
+	});
+	if (!options.targeting?.allowEmptyTarget && targets.length === 0) return;
+	playActionBattleAnimation("castSkill", player, options.animations, {
+		skill: skillData,
+		target: targets[0]
+	});
+	player.useSkill(skillId, targets);
+};
+var createActionBattleServer = (rawOptions = {}) => {
+	const options = normalizeActionBattleOptions(rawOptions);
+	setActionBattleOptions(options);
+	setActionBattleSystems(options);
+	return defineModule({
+		player: {
+			/**
+			* Handle player input for combat actions
+			*
+			* When a player presses the action key, create an attack hitbox
+			* that can damage AI enemies within range and knockback the event.
+			* Knockback force is based on the player's equipped weapon.
+			* Triggers attack animation and visual effects.
+			*
+			* @param player - The player performing the action
+			* @param input - Input data containing pressed keys
+			*/
+			onInput(player, input) {
+				if (input.action == Control.Action) {
+					const map = player.getCurrentMap();
+					const hitboxes = resolvePlayerAttackHitboxes(player, player.getDirection(), options);
+					if (isActionReservedForNormalEvent(player, map, hitboxes)) return;
+					const lockMovement = options.attack?.lockMovement !== false;
+					const lockDurationMs = options.attack?.lockDurationMs ?? DEFAULT_ATTACK_LOCK_DURATION_MS;
+					let movementLocked = false;
+					if (lockMovement && !beginPlayerAttackLock(player, map, Math.max(0, lockDurationMs))) return;
+					movementLocked = lockMovement && lockDurationMs > 0;
+					playActionBattleAnimation("attack", player, options.animations);
+					if (movementLocked) player.animationFixed = true;
+					map?.createMovingHitbox(hitboxes, { speed: 3 }).subscribe({ next(hits) {
+						hits.forEach((hit) => {
+							if (hit instanceof RpgEvent) {
+								if (applyPlayerHitToEvent(player, hit)?.defeated) console.log(`Player ${player.id} defeated AI ${hit.id}`);
+							}
+						});
+					} });
+				}
+			},
+			onConnected(player) {
+				if (options.ui?.actionBar?.enabled && options.ui?.actionBar?.autoOpen) openActionBattleActionBar(player, options);
+			}
+		},
+		event: {
+			/**
+			* Handle player detection when entering AI vision
+			*
+			* Called when a player enters an AI event's vision range.
+			* The AI will start pursuing and attacking the player.
+			*
+			* @param event - The AI event
+			* @param player - The player entering vision
+			* @param shape - The vision shape
+			*/
+			onDetectInShape(event, player, shape) {
+				event.battleAi?.onDetectInShape(player, shape);
+			},
+			/**
+			* Handle player leaving AI vision
+			*
+			* Called when a player leaves an AI event's vision range.
+			* The AI will stop pursuing the player.
+			*
+			* @param event - The AI event
+			* @param player - The player leaving vision
+			* @param shape - The vision shape
+			*/
+			onDetectOutShape(event, player, shape) {
+				event.battleAi?.onDetectOutShape(player, shape);
+			}
+		}
+	});
+};
+var server_default = createActionBattleServer();
+//#endregion
+export { ACTION_BATTLE_ACTION_BAR_GUI_ID, DEFAULT_PLAYER_ATTACK_HITBOXES, applyPlayerHitToEvent, createActionBattleServer, server_default as default, getPlayerWeaponKnockbackForce, openActionBattleActionBar, updateActionBattleActionBar };

package/dist/server.d.ts

@@ -96,3 +96,5 @@ export declare const updateActionBattleActionBar: (player: RpgPlayer, rawOptions
 export declare const createActionBattleServer: (rawOptions?: ActionBattleOptions) => RpgServer;
 declare const _default: RpgServer;
 export default _default;
+export { AiDebug, AiState, AttackPattern, BattleAi, DEFAULT_KNOCKBACK, EnemyType, } from './ai.server';
+export type { ApplyHitHooks, BattleAiOptions, HitResult } from './ai.server';

package/dist/ui/state.d.ts

@@ -1,4 +1,13 @@
 import { ActionBattleActionBarSkill, ActionBattleOptions } from '../types';
+export interface ActionBattleAttackPreviewState {
+    active: boolean;
+    id: number;
+    direction: string;
+    startedAt: number;
+    durationMs: number;
+    color: number;
+    accentColor: number;
+}
 export interface ActionBattleTargetingState {
     active: boolean;
     skill: ActionBattleActionBarSkill | null;
@@ -12,7 +21,15 @@ export interface ActionBattleTargetingState {
 export declare const actionBattleUiOptions: import('canvasengine').WritableObjectSignal<import('..').ActionBattleUiOptions>;
 export declare const actionBattleSkillOptions: import('canvasengine').WritableObjectSignal<import('../types').ActionBattleSkillOptions>;
 export declare const actionBattleTargetingState: import('canvasengine').WritableObjectSignal<ActionBattleTargetingState>;
+export declare const actionBattleAttackPreviewState: import('canvasengine').WritableObjectSignal<ActionBattleAttackPreviewState>;
 export declare const setActionBattleOptions: (options?: ActionBattleOptions) => void;
 export declare const startTargeting: (skill: ActionBattleActionBarSkill) => void;
 export declare const stopTargeting: () => void;
 export declare const moveTargetingOffset: (dx: number, dy: number) => void;
+export declare const startAttackPreview: (options: {
+    direction: string;
+    durationMs?: number;
+    color?: number;
+    accentColor?: number;
+}) => number;
+export declare const stopAttackPreview: (id?: number) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpgjs/action-battle",
-  "version": "5.0.0-beta.3",
+  "version": "5.0.0-beta.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -23,10 +23,10 @@
   "description": "RPGJS is a framework for creating RPG/MMORPG games",
   "peerDependencies": {
     "@canvasengine/presets": "*",
-    "@rpgjs/client": "5.0.0-beta.3",
-    "@rpgjs/common": "5.0.0-beta.3",
-    "@rpgjs/server": "5.0.0-beta.3",
-    "@rpgjs/vite": "5.0.0-beta.3",
+    "@rpgjs/client": "5.0.0-beta.5",
+    "@rpgjs/common": "5.0.0-beta.5",
+    "@rpgjs/server": "5.0.0-beta.5",
+    "@rpgjs/vite": "5.0.0-beta.5",
     "canvasengine": "*"
   },
   "publishConfig": {