@rpgjs/action-battle 5.0.0-beta.12 → 5.0.0-beta.14

package/package.json

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

package/src/ai.server.spec.ts

@@ -1,8 +1,9 @@
 import { MAXHP } from "@rpgjs/server";
 import { afterEach, describe, expect, test, vi } from "vitest";
-import { BattleAi } from "./ai.server";
+import { AttackPattern, BattleAi } from "./ai.server";
 import { chase, idle, ifTargetVisible } from "./core/ai-behavior-tree";
 import { setActionBattleSystems } from "./core/context";
+import { ACTION_BATTLE_CLIENT_VISUAL_ID } from "./visual";
 
 const createEvent = () => ({
   id: "monster-1",
@@ -268,6 +269,118 @@ describe("BattleAi behavior tree", () => {
     ai.destroy();
   });
 
+  test("approaches a visible target while alert but not yet in combat range", () => {
+    vi.useFakeTimers();
+    const event = createEvent();
+    event.attachShape.mockReturnValue({ id: "vision_monster-1" });
+    const player = {
+      ...createPlayer(),
+      hp: 10,
+      x: vi.fn(() => 120),
+      y: vi.fn(() => 0),
+    };
+    const ai = new BattleAi(event as any, {
+      attackRange: 50,
+      visionRange: 150,
+    });
+
+    ai.onDetectInShape(player as any, {});
+    vi.advanceTimersByTime(100);
+
+    expect(event.moveTo).toHaveBeenCalledWith(player);
+    ai.destroy();
+  });
+
+  test("normalizes position move targets before calling RPGJS moveTo", () => {
+    vi.useFakeTimers();
+    const event = createEvent();
+    event.attachShape.mockReturnValue({ id: "vision_monster-1" });
+
+    const ai = new BattleAi(event as any, {
+      patrolWaypoints: [{ x: 32, y: 48 }],
+      moveToCooldown: 0,
+    });
+
+    expect(event.moveTo).toHaveBeenCalledWith({ x: 32, y: 48 });
+    ai.destroy();
+  });
+
+  test("targets its attacker after taking non-lethal damage", () => {
+    vi.useFakeTimers();
+    const event = createEvent();
+    event.hp = 9;
+    event.attachShape.mockReturnValue({ id: "vision_monster-1" });
+    const player = {
+      ...createPlayer(),
+      hp: 10,
+      x: vi.fn(() => 120),
+      y: vi.fn(() => 0),
+    };
+    const ai = new BattleAi(event as any, {
+      attackRange: 50,
+      visionRange: 150,
+    });
+
+    ai.handleDamage(player as any, { damage: 1, defeated: false });
+
+    expect(ai.getTarget()).toBe(player);
+    ai.destroy();
+  });
+
+  test("waits for damage recovery before chasing its attacker", () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(1000);
+    const event = createEvent();
+    event.hp = 9;
+    event.attachShape.mockReturnValue({ id: "vision_monster-1" });
+    const player = {
+      ...createPlayer(),
+      hp: 10,
+      x: vi.fn(() => 120),
+      y: vi.fn(() => 0),
+    };
+    const ai = new BattleAi(event as any, {
+      attackRange: 50,
+      visionRange: 150,
+      hitstunMs: 100,
+      moveToCooldown: 0,
+    });
+
+    ai.handleDamage(player as any, { damage: 1, defeated: false });
+    vi.advanceTimersByTime(200);
+    expect(event.moveTo).not.toHaveBeenCalledWith(player);
+
+    vi.advanceTimersByTime(100);
+    expect(event.moveTo).toHaveBeenCalledWith(player);
+    ai.destroy();
+  });
+
+  test("chases its attacker after hitstun ends", () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(1000);
+    const event = createEvent();
+    event.hp = 9;
+    event.attachShape.mockReturnValue({ id: "vision_monster-1" });
+    const player = {
+      ...createPlayer(),
+      hp: 10,
+      x: vi.fn(() => 120),
+      y: vi.fn(() => 0),
+    };
+    const ai = new BattleAi(event as any, {
+      attackRange: 50,
+      visionRange: 150,
+      hitstunMs: 100,
+      moveToCooldown: 0,
+    });
+
+    ai.handleDamage(player as any, { damage: 1, defeated: false });
+    vi.advanceTimersByTime(300);
+
+    expect(event.moveTo).toHaveBeenCalledWith(player);
+    ai.destroy();
+  });
+
   test("behavior tree idle fallback does not block target acquisition", () => {
     vi.useFakeTimers();
     const event = createEvent();
@@ -350,4 +463,37 @@ describe("BattleAi behavior tree", () => {
     expect(ai.getTarget()).toBe(hostile);
     ai.destroy();
   });
+
+  test("dash attacks emit an attack visual before the dash hit", () => {
+    vi.useFakeTimers();
+    const clientVisual = vi.fn();
+    const event = createEvent();
+    event.getCurrentMap.mockReturnValue({ clientVisual });
+    event.attachShape.mockReturnValue({ id: "vision_monster-1" });
+    const player = {
+      ...createPlayer(),
+      hp: 10,
+      x: vi.fn(() => 20),
+      y: vi.fn(() => 0),
+    };
+    const ai = new BattleAi(event as any, {
+      attackPatterns: [AttackPattern.DashAttack],
+      attackRange: 50,
+      moveToCooldown: 0,
+    });
+
+    ai.onDetectInShape(player as any, {});
+    (ai as any).performDashAttack();
+
+    expect(clientVisual).toHaveBeenCalledWith(
+      ACTION_BATTLE_CLIENT_VISUAL_ID,
+      expect.objectContaining({
+        moment: "attack",
+        objectId: "monster-1",
+        targetId: "player-1",
+        pattern: AttackPattern.DashAttack,
+      })
+    );
+    ai.destroy();
+  });
 });