@rpgjs/client 5.0.0-beta.11 → 5.0.0-beta.13

package/src/RpgClientEngine.ts

@@ -6,7 +6,9 @@ import { AbstractWebsocket, WebSocketToken } from "./services/AbstractSocket";
 import { LoadMapService, LoadMapToken } from "./services/loadMap";
 import { RpgSound } from "./Sound";
 import { RpgResource } from "./Resource";
-import { Hooks, ModulesToken, Direction, normalizeLightingState, Vector2 } from "@rpgjs/common";
+import { getOrCreateI18nService, Hooks, ModulesToken, Direction, normalizeLightingState, Vector2, type I18nParams, type I18nService } from "@rpgjs/common";
+import type { EventComponentConfig } from "./RpgClient";
+import type { RpgClientEvent } from "./Game/Event";
 import { load } from "@signe/sync";
 import { RpgClientMap } from "./Game/Map"
 import { RpgGui } from "./Gui/Gui";
@@ -25,24 +27,107 @@ import {
   type PredictionState,
   type RpgActionInput,
   type RpgActionName,
+  type RpgDashInput,
+  type RpgMovementInput,
 } from "@rpgjs/common";
 import { NotificationManager } from "./Gui/NotificationManager";
 import { SaveClientService } from "./services/save";
 import { getCanMoveValue } from "./utils/readPropValue";
 import { ProjectileManager, type ClientProjectileImpact, type ClientProjectileSpawn } from "./Game/ProjectileManager";
+import { ClientVisualRegistry, type ClientVisualHandler, type ClientVisualMap, type ClientVisualPacket } from "./Game/ClientVisuals";
 import { normalizeActionInput } from "./services/actionInput";
 import { createClientPointerContext, type ClientPointerContext } from "./services/pointerContext";
+import { RpgClientInteractions } from "./services/interactions";
+import { normalizeRoomMapId } from "./utils/mapId";
+import { EventComponentResolverRegistry, type EventComponentResolver } from "./Game/EventComponentResolver";
+import { RpgClientBuiltinI18n } from "./i18n";
 
 interface MovementTrajectoryPoint {
   frame: number;
   tick: number;
   timestamp: number;
-  input: Direction;
+  input: RpgMovementInput;
   x: number;
   y: number;
   direction?: Direction;
 }
 
+const DEFAULT_DASH_ADDITIONAL_SPEED = 8;
+const DEFAULT_DASH_DURATION_MS = 180;
+const DEFAULT_DASH_COOLDOWN_MS = 450;
+
+const isDashInput = (input: RpgMovementInput): input is RpgDashInput =>
+  typeof input === "object" && input !== null && input.type === "dash";
+
+const isMoveInput = (
+  input: RpgMovementInput
+): input is { type: "move"; direction: Direction } =>
+  typeof input === "object" && input !== null && input.type === "move";
+
+const resolveMoveDirection = (input: RpgMovementInput): Direction | undefined => {
+  if (isMoveInput(input)) return input.direction;
+  if (typeof input === "string" || typeof input === "number") {
+    return input as Direction;
+  }
+  return undefined;
+};
+
+const directionToVector = (direction: Direction | undefined) => {
+  switch (direction) {
+    case Direction.Left:
+      return { x: -1, y: 0 };
+    case Direction.Right:
+      return { x: 1, y: 0 };
+    case Direction.Up:
+      return { x: 0, y: -1 };
+    case Direction.Down:
+    default:
+      return { x: 0, y: 1 };
+  }
+};
+
+const vectorToDirection = (direction: { x: number; y: number }): Direction => {
+  if (Math.abs(direction.x) > Math.abs(direction.y)) {
+    return direction.x < 0 ? Direction.Left : Direction.Right;
+  }
+  return direction.y < 0 ? Direction.Up : Direction.Down;
+};
+
+const normalizeDashInput = (
+  input: Partial<RpgDashInput>,
+  fallbackDirection: Direction | undefined
+): RpgDashInput | null => {
+  const rawDirection = input.direction ?? directionToVector(fallbackDirection);
+  const rawX = Number(rawDirection?.x ?? 0);
+  const rawY = Number(rawDirection?.y ?? 0);
+  const magnitude = Math.hypot(rawX, rawY);
+  if (!Number.isFinite(magnitude) || magnitude <= 0) return null;
+
+  const additionalSpeed =
+    typeof input.additionalSpeed === "number" && Number.isFinite(input.additionalSpeed)
+      ? Math.max(0, Math.min(input.additionalSpeed, 64))
+      : DEFAULT_DASH_ADDITIONAL_SPEED;
+  const duration =
+    typeof input.duration === "number" && Number.isFinite(input.duration)
+      ? Math.max(1, Math.min(input.duration, 1000))
+      : DEFAULT_DASH_DURATION_MS;
+  const cooldown =
+    typeof input.cooldown === "number" && Number.isFinite(input.cooldown)
+      ? Math.max(0, Math.min(input.cooldown, 5000))
+      : DEFAULT_DASH_COOLDOWN_MS;
+
+  return {
+    type: "dash",
+    direction: {
+      x: rawX / magnitude,
+      y: rawY / magnitude,
+    },
+    additionalSpeed,
+    duration,
+    cooldown,
+  };
+};
+
 type ConfigurableTrigger<T> = Omit<Trigger<T>, "start"> & {
   start(config?: T): Promise<void>;
 };
@@ -68,10 +153,13 @@ export class RpgClientEngine<T = any> {
   width = signal("100%");
   height = signal("100%");
   spritesheets: Map<string | number, any> = new Map();
+  private spritesheetPromises: Map<string | number, Promise<any>> = new Map();
   sounds: Map<string, any> = new Map();
   componentAnimations: any[] = [];
+  clientVisuals = new ClientVisualRegistry();
   projectiles: ProjectileManager;
   pointer: ClientPointerContext = createClientPointerContext();
+  interactions: RpgClientInteractions = new RpgClientInteractions(this);
   private spritesheetResolver?: (id: string | number) => any | Promise<any>;
   private soundResolver?: (id: string) => any | Promise<any>;
   particleSettings: {
@@ -87,6 +175,7 @@ export class RpgClientEngine<T = any> {
   spriteComponentsBehind = signal<any[]>([]);
   spriteComponentsInFront = signal<any[]>([]);
   spriteComponents: Map<string, any> = new Map();
+  private eventComponentResolvers = new EventComponentResolverRegistry();
   /** ID of the sprite that the camera should follow. null means follow the current player */
   cameraFollowTargetId = signal<string | null>(null);
   /** Trigger for map shake animation */
@@ -96,7 +185,7 @@ export class RpgClientEngine<T = any> {
   gamePause = signal(false);
 
   private predictionEnabled = false;
-  private prediction?: PredictionController<Direction>;
+  private prediction?: PredictionController<RpgMovementInput, Direction>;
   private readonly SERVER_CORRECTION_THRESHOLD = 30;
   private inputFrameCounter = 0;
   private pendingPredictionFrames: number[] = [];
@@ -104,6 +193,7 @@ export class RpgClientEngine<T = any> {
   private frameOffset = 0;
   private latestServerTick?: number;
   private latestServerTickAt = 0;
+  private dashLockedUntil = 0;
   // Ping/Pong for RTT measurement
   private rtt: number = 0; // Round-trip time in ms
   private pingInterval: any = null;
@@ -120,20 +210,29 @@ export class RpgClientEngine<T = any> {
   private eventsReceived$ = new BehaviorSubject<boolean>(false);
   private onAfterLoadingSubscription?: any;
   private sceneResetQueued = false;
+  private mapTransitionInProgress = false;
+  private currentMapRoomId?: string;
+  private socketListenersInitialized = false;
   
   // Store subscriptions and event listeners for cleanup
   private tickSubscriptions: any[] = [];
   private resizeHandler?: () => void;
   private pointerMoveHandler?: (event: PointerEvent) => void;
+  private pointerUpHandler?: (event: PointerEvent) => void;
+  private pointerCancelHandler?: (event: PointerEvent) => void;
   private pointerCanvas?: HTMLCanvasElement;
   private pendingSyncPackets: any[] = [];
   private notificationManager: NotificationManager = new NotificationManager();
+  private i18nService: I18nService;
+  private locale?: string;
 
   constructor(public context) {
     this.webSocket = inject(WebSocketToken);
     this.guiService = inject(RpgGui);
     this.loadMapService = inject(LoadMapToken);
     this.hooks = inject<Hooks>(ModulesToken);
+    this.i18nService = getOrCreateI18nService(context);
+    this.i18nService.addMessages(RpgClientBuiltinI18n, "rpgjs-client", 0);
     this.projectiles = new ProjectileManager(
       this.hooks,
       (projectile) => this.predictProjectileImpact(projectile),
@@ -169,6 +268,25 @@ export class RpgClientEngine<T = any> {
     this.initializePredictionController();
   }
 
+  setLocale(locale: string) {
+    this.locale = locale;
+  }
+
+  getLocale(): string {
+    return this.locale || this.i18nService.defaultLocale;
+  }
+
+  t(key: string, params?: I18nParams): string {
+    return this.i18nService.t(key, params, this.getLocale());
+  }
+
+  i18n() {
+    return {
+      locale: this.getLocale(),
+      t: (key: string, params?: I18nParams) => this.t(key, params),
+    };
+  }
+
   /**
    * Assigns a CanvasEngine KeyboardControls instance to the dependency injection context
    * 
@@ -244,7 +362,6 @@ export class RpgClientEngine<T = any> {
     this.renderer = app.renderer as unknown as PIXI.Renderer;
     this.setupPointerTracking();
     this.tick = canvasElement?.propObservables?.context['tick'].observable
-    this.flushPendingSyncPackets();
 
     const inputCheckSubscription = this.tick.subscribe(() => {
       if (Date.now() - this.lastInputTime > 100) {
@@ -258,6 +375,7 @@ export class RpgClientEngine<T = any> {
 
     this.hooks.callHooks("client-spritesheets-load", this).subscribe();
     this.hooks.callHooks("client-spritesheetResolver-load", this).subscribe();
+    this.flushPendingSyncPackets();
     this.hooks.callHooks("client-sounds-load", this).subscribe();
     this.hooks.callHooks("client-soundResolver-load", this).subscribe();
 
@@ -266,7 +384,9 @@ export class RpgClientEngine<T = any> {
     this.hooks.callHooks("client-gui-load", this).subscribe();
     this.hooks.callHooks("client-particles-load", this).subscribe();
     this.hooks.callHooks("client-componentAnimations-load", this).subscribe();
+    this.hooks.callHooks("client-clientVisuals-load", this).subscribe();
     this.hooks.callHooks("client-projectiles-load", this).subscribe();
+    this.hooks.callHooks("client-interactions-load", this).subscribe();
     this.hooks.callHooks("client-sprite-load", this).subscribe();
 
     await lastValueFrom(this.hooks.callHooks("client-engine-onStart", this));
@@ -313,7 +433,7 @@ export class RpgClientEngine<T = any> {
     }
 
     this.pointerCanvas = canvas;
-    this.pointerMoveHandler = (event: PointerEvent) => {
+    const updatePointer = (event: PointerEvent) => {
       const rect = canvas.getBoundingClientRect();
       const screen = {
         x: event.clientX - rect.left,
@@ -333,16 +453,67 @@ export class RpgClientEngine<T = any> {
       this.pointer.update(screen, world);
     };
 
+    this.pointerMoveHandler = (event: PointerEvent) => {
+      updatePointer(event);
+      this.interactions.handlePointerMove(event);
+    };
+    this.pointerUpHandler = (event: PointerEvent) => {
+      updatePointer(event);
+      this.interactions.handlePointerUp(event);
+    };
+    this.pointerCancelHandler = (event: PointerEvent) => {
+      updatePointer(event);
+      this.interactions.cancelDrag(event);
+    };
+
     canvas.addEventListener("pointermove", this.pointerMoveHandler);
     canvas.addEventListener("pointerdown", this.pointerMoveHandler);
+    canvas.addEventListener("pointerup", this.pointerUpHandler);
+    canvas.addEventListener("pointercancel", this.pointerCancelHandler);
+    canvas.addEventListener("pointerleave", this.pointerCancelHandler);
+  }
+
+  updatePointerFromInteractionEvent(event: any): void {
+    const global = event?.global ?? event?.data?.global;
+
+    if (!global) {
+      this.pointer.updateFromEvent(event);
+      return;
+    }
+
+    const screen = {
+      x: Number(global.x),
+      y: Number(global.y),
+    };
+    if (!Number.isFinite(screen.x) || !Number.isFinite(screen.y)) {
+      this.pointer.updateFromEvent(event);
+      return;
+    }
+
+    const viewport = this.findViewportInstance();
+    if (viewport && typeof viewport.toWorld === "function") {
+      const point = viewport.toWorld(screen.x, screen.y);
+      this.pointer.update(screen, { x: Number(point.x), y: Number(point.y) });
+      return;
+    }
+
+    this.pointer.update(screen);
   }
 
   private findViewportInstance(): any {
-    const children = (this.canvasApp as any)?.stage?.children ?? [];
-    return children.find((child: any) => (
-      typeof child?.toWorld === "function"
-      || child?.constructor?.name === "Viewport"
-    ));
+    const find = (node: any): any => {
+      if (!node) return undefined;
+      if (typeof node?.toWorld === "function" || node?.constructor?.name === "Viewport") {
+        return node;
+      }
+      for (const child of node.children ?? []) {
+        const viewport = find(child);
+        if (viewport) return viewport;
+      }
+      return undefined;
+    };
+
+    return find((this.canvasApp as any)?.stage);
   }
 
   private prepareSyncPayload(data: any): any {
@@ -392,6 +563,9 @@ export class RpgClientEngine<T = any> {
   }
 
   private initListeners() {
+    if (this.socketListenersInitialized) return;
+    this.socketListenersInitialized = true;
+
     this.webSocket.on("sync", (data) => {
       if (!this.tick) {
         this.pendingSyncPackets.push(data);
@@ -420,13 +594,8 @@ export class RpgClientEngine<T = any> {
     });
 
     this.webSocket.on("changeMap", (data) => {
-      this.sceneResetQueued = true;
-      this.sceneMap.weatherState.set(null);
-      this.sceneMap.lightingState.set(null);
-      this.sceneMap.clearLightSpots();
-      this.projectiles.clear();
-      // Reset camera follow to default (follow current player) when changing maps
-      this.cameraFollowTargetId.set(null);
+      const nextMapId = typeof data?.mapId === "string" ? data.mapId : undefined;
+      this.beginMapTransfer(nextMapId);
       const transferToken = typeof data?.transferToken === "string" ? data.transferToken : undefined;
       this.loadScene(data.mapId, transferToken);
     });
@@ -440,22 +609,35 @@ export class RpgClientEngine<T = any> {
       this.getComponentAnimation(id).displayEffect(params, player || position)
     });
 
+    this.webSocket.on("clientVisual", (data) => {
+      this.playClientVisual(data);
+    });
+
     this.webSocket.on("projectile:spawnBatch", (data) => {
+      if (!this.shouldProcessProjectilePacket(data)) return;
       this.projectiles.spawnBatch(data?.projectiles ?? [], {
+        mapId: data?.mapId,
         currentServerTick: this.estimateServerTick(),
         tickDurationMs: this.getPhysicsTickDurationMs(),
       });
     });
 
     this.webSocket.on("projectile:impactBatch", (data) => {
-      this.projectiles.impactBatch(data?.impacts ?? []);
+      if (!this.shouldProcessProjectilePacket(data)) return;
+      this.projectiles.impactBatch(data?.impacts ?? [], {
+        mapId: data?.mapId,
+      });
     });
 
     this.webSocket.on("projectile:destroyBatch", (data) => {
-      this.projectiles.destroyBatch(data?.projectiles ?? []);
+      if (!this.shouldProcessProjectilePacket(data)) return;
+      this.projectiles.destroyBatch(data?.projectiles ?? [], {
+        mapId: data?.mapId,
+      });
     });
 
-    this.webSocket.on("projectile:clear", () => {
+    this.webSocket.on("projectile:clear", (data) => {
+      if (!this.shouldProcessProjectilePacket(data)) return;
       this.projectiles.clear();
     });
 
@@ -573,6 +755,36 @@ export class RpgClientEngine<T = any> {
     })
   }
 
+  private beginMapTransfer(nextMapId?: string) {
+    this.mapTransitionInProgress = true;
+    this.currentMapRoomId = nextMapId;
+    this.sceneResetQueued = false;
+    this.clearClientPredictionStates();
+    this.sceneMap.weatherState.set(null);
+    this.sceneMap.lightingState.set(null);
+    this.sceneMap.clearLightSpots();
+    this.clearComponentAnimations();
+    this.projectiles.setMapId(nextMapId);
+    this.cameraFollowTargetId.set(null);
+    this.sceneMap.reset();
+    this.sceneMap.loadPhysic();
+  }
+
+  private clearComponentAnimations() {
+    this.componentAnimations.forEach((componentAnimation) => {
+      componentAnimation.instance?.clear?.();
+    });
+  }
+
+  private shouldProcessProjectilePacket(data: any): boolean {
+    if (this.mapTransitionInProgress) return false;
+    const packetMapId = normalizeRoomMapId(
+      typeof data?.mapId === "string" ? data.mapId : undefined,
+    );
+    const currentMapId = normalizeRoomMapId(this.currentMapRoomId);
+    return !packetMapId || !currentMapId || packetMapId === currentMapId;
+  }
+
   private async callConnectError(error: any) {
     await lastValueFrom(this.hooks.callHooks("client-engine-onConnectError", this, error, this.socket));
   }
@@ -732,14 +944,10 @@ export class RpgClientEngine<T = any> {
       query: transferToken ? { transferToken } : undefined,
     })
     try {
-      await this.webSocket.reconnect(() => {
-        const saveClient = inject(SaveClientService);
-        saveClient.initialize();
-        this.initListeners()
-        this.guiService._initialize()
-      })
+      await this.webSocket.reconnect()
     }
     catch (error) {
+      this.mapTransitionInProgress = false;
       this.stopPingPong();
       await this.callConnectError(error);
       throw error;
@@ -765,6 +973,8 @@ export class RpgClientEngine<T = any> {
     
     // Signal that map loading is completed (this should be last to ensure other checks are done)
     this.mapLoadCompleted$.next(true);
+    this.currentMapRoomId = mapId;
+    this.mapTransitionInProgress = false;
     this.sceneMap.configureClientPrediction(this.predictionEnabled);
     this.sceneMap.loadPhysic()
   }
@@ -833,17 +1043,29 @@ export class RpgClientEngine<T = any> {
 
     // If not in cache and resolver exists, use it
     if (this.spritesheetResolver) {
+      if (this.spritesheetPromises.has(id)) {
+        return this.spritesheetPromises.get(id);
+      }
+
       const result = this.spritesheetResolver(id);
 
       // Check if result is a Promise
       if (result instanceof Promise) {
-        return result.then((spritesheet) => {
-          if (spritesheet) {
-            // Cache the resolved spritesheet
-            this.spritesheets.set(id, spritesheet);
-          }
-          return spritesheet;
-        });
+        const promise = result
+          .then((spritesheet) => {
+            if (spritesheet) {
+              // Cache the resolved spritesheet
+              this.spritesheets.set(id, spritesheet);
+            }
+            this.spritesheetPromises.delete(id);
+            return spritesheet;
+          })
+          .catch((error) => {
+            this.spritesheetPromises.delete(id);
+            throw error;
+          });
+        this.spritesheetPromises.set(id, promise);
+        return promise;
       } else {
         // Synchronous result
         if (result) {
@@ -1290,6 +1512,29 @@ export class RpgClientEngine<T = any> {
     return this.spriteComponents.get(id);
   }
 
+  /**
+   * Register a custom event component resolver.
+   *
+   * The last resolver returning a component wins. This lets later modules
+   * override earlier defaults without replacing the whole map scene.
+   *
+   * @param resolver - Function receiving the synced event object
+   * @returns The registered resolver
+   */
+  addEventComponentResolver(resolver: EventComponentResolver) {
+    return this.eventComponentResolvers.add(resolver);
+  }
+
+  /**
+   * Resolve the custom CanvasEngine component for an event, if any.
+   *
+   * @param event - Synced client event object
+   * @returns The component/config returned by the last matching resolver
+   */
+  resolveEventComponent(event: RpgClientEvent): EventComponentConfig | null {
+    return this.eventComponentResolvers.resolve(event);
+  }
+
   registerProjectileComponent(type: string, component: any) {
     return this.projectiles.register(type, component);
   }
@@ -1298,6 +1543,42 @@ export class RpgClientEngine<T = any> {
     return this.projectiles.get(type);
   }
 
+  /**
+   * Register a named client visual macro.
+   *
+   * Client visuals are small client-side functions that group existing visual
+   * primitives such as flash, sound, component animations, sprite animation, or
+   * map shake. The server sends only the visual name and a serializable payload.
+   *
+   * @param name - Stable visual name sent by the server
+   * @param handler - Client-side visual handler
+   * @returns The registered handler
+   */
+  registerClientVisual(name: string, handler: ClientVisualHandler) {
+    return this.clientVisuals.register(name, handler);
+  }
+
+  /**
+   * Register several named client visual macros.
+   *
+   * @param visuals - Map of visual names to client-side handlers
+   */
+  registerClientVisuals(visuals: ClientVisualMap) {
+    this.clientVisuals.registerMany(visuals);
+  }
+
+  /**
+   * Play a registered client visual locally.
+   *
+   * This is also used by the websocket listener when the server calls
+   * `player.clientVisual()` or `map.clientVisual()`.
+   *
+   * @param packet - Visual name and serializable payload
+   */
+  playClientVisual(packet: ClientVisualPacket) {
+    return this.clientVisuals.play(packet, this);
+  }
+
   /**
    * Add a component animation to the engine
    * 
@@ -1406,7 +1687,7 @@ export class RpgClientEngine<T = any> {
     });
   }
 
-  async processInput({ input }: { input: Direction }) {
+  async processInput({ input }: { input: RpgMovementInput }) {
     if (this.stopProcessingInput) return;
 
     const currentPlayer = this.sceneMap.getCurrentPlayer() as any;
@@ -1419,10 +1700,20 @@ export class RpgClientEngine<T = any> {
     }
 
     const timestamp = Date.now();
+    const movementInput = isDashInput(input)
+      ? normalizeDashInput(input, currentPlayer?.direction?.())
+      : input;
+    if (!movementInput) return;
+    if (isDashInput(movementInput)) {
+      const cooldown = movementInput.cooldown ?? DEFAULT_DASH_COOLDOWN_MS;
+      if (timestamp < this.dashLockedUntil) return;
+      this.dashLockedUntil = timestamp + cooldown;
+    }
+
     let frame: number;
     let tick: number;
     if (this.predictionEnabled && this.prediction) {
-      const meta = this.prediction.recordInput(input, timestamp);
+      const meta = this.prediction.recordInput(movementInput, timestamp);
       frame = meta.frame;
       tick = meta.tick;
     } else {
@@ -1430,12 +1721,11 @@ export class RpgClientEngine<T = any> {
       tick = this.getPhysicsTick();
     }
     this.inputFrameCounter = frame;
-    this.hooks.callHooks("client-engine-onInput", this, { input, playerId: this.playerId }).subscribe();
+    this.hooks.callHooks("client-engine-onInput", this, { input: movementInput, playerId: this.playerId }).subscribe();
 
     const bodyReady = this.ensureCurrentPlayerBody();
     if (currentPlayer && bodyReady) {
-      currentPlayer.changeDirection(input);
-      (this.sceneMap as any).moveBody(currentPlayer, input);
+      this.applyPredictedMovementInput(currentPlayer, movementInput);
       if (this.predictionEnabled && this.prediction) {
         this.pendingPredictionFrames.push(frame);
         if (this.pendingPredictionFrames.length > 240) {
@@ -1444,8 +1734,21 @@ export class RpgClientEngine<T = any> {
       }
     }
 
-    this.emitMovePacket(input, frame, tick, timestamp, true);
-    this.lastInputTime = Date.now();
+    this.emitMovePacket(movementInput, frame, tick, timestamp, true);
+    this.lastInputTime = isDashInput(movementInput)
+      ? Date.now() + (movementInput.duration ?? DEFAULT_DASH_DURATION_MS)
+      : Date.now();
+  }
+
+  async processDash(input: Partial<RpgDashInput> = {}) {
+    const currentPlayer = this.sceneMap.getCurrentPlayer() as any;
+    const fallbackDirection =
+      typeof currentPlayer?.direction === "function"
+        ? currentPlayer.direction()
+        : currentPlayer?.direction;
+    const dashInput = normalizeDashInput(input, fallbackDirection);
+    if (!dashInput) return;
+    await this.processInput({ input: dashInput });
   }
 
   processAction(action: RpgActionName, data?: any): void;
@@ -1485,6 +1788,10 @@ export class RpgClientEngine<T = any> {
     return this.sceneMap
   }
 
+  getObjectById(id: string) {
+    return this.sceneMap?.getObjectById(id);
+  }
+
   private getPhysicsTick(): number {
     return (this.sceneMap as any)?.getTick?.() ?? 0;
   }
@@ -1617,7 +1924,7 @@ export class RpgClientEngine<T = any> {
         input: entry.direction,
         x: state.x,
         y: state.y,
-        direction: state.direction ?? entry.direction,
+        direction: state.direction ?? resolveMoveDirection(entry.direction),
       });
     }
     if (trajectory.length > this.MAX_MOVE_TRAJECTORY_POINTS) {
@@ -1627,7 +1934,7 @@ export class RpgClientEngine<T = any> {
   }
 
   private emitMovePacket(
-    input: Direction,
+    input: RpgMovementInput,
     frame: number,
     tick: number,
     timestamp: number,
@@ -1682,6 +1989,22 @@ export class RpgClientEngine<T = any> {
     this.emitMovePacket(latest.direction, latest.frame, latest.tick, now, false);
   }
 
+  private applyPredictedMovementInput(
+    player: any,
+    input: RpgMovementInput
+  ): boolean {
+    if (isDashInput(input)) {
+      const direction = vectorToDirection(input.direction);
+      player.changeDirection(direction);
+      return Boolean((this.sceneMap as any).dashBody?.(player, input));
+    }
+
+    const direction = resolveMoveDirection(input);
+    if (!direction) return false;
+    player.changeDirection(direction);
+    return Boolean((this.sceneMap as any).moveBody?.(player, direction));
+  }
+
   private getLocalPlayerState(): PredictionState<Direction> {
     const currentPlayer = this.sceneMap?.getCurrentPlayer();
     if (!currentPlayer) {
@@ -1725,7 +2048,7 @@ export class RpgClientEngine<T = any> {
         ? configuredMaxEntries
         : Math.max(600, Math.ceil(historyTtlMs / 16) + 120);
     this.sceneMap?.configureClientPrediction?.(true);
-    this.prediction = new PredictionController<Direction>({
+    this.prediction = new PredictionController<RpgMovementInput, Direction>({
       correctionThreshold: (this.globalConfig as any)?.prediction?.correctionThreshold ?? this.SERVER_CORRECTION_THRESHOLD,
       historyTtlMs,
       maxHistoryEntries,
@@ -1940,7 +2263,7 @@ export class RpgClientEngine<T = any> {
 
   private reconcilePrediction(
     authoritativeState: PredictionState<Direction>,
-    pendingInputs: PredictionHistoryEntry<Direction>[],
+    pendingInputs: PredictionHistoryEntry<RpgMovementInput, Direction>[],
   ): void {
     const player = this.getCurrentPlayer() as any;
     if (!player) {
@@ -1962,7 +2285,7 @@ export class RpgClientEngine<T = any> {
     const replayInputs = pendingInputs.slice(-600);
     for (const entry of replayInputs) {
       if (!entry?.direction) continue;
-      (this.sceneMap as any).moveBody(player, entry.direction);
+      this.applyPredictedMovementInput(player, entry.direction);
       this.sceneMap.stepPredictionTick();
       this.prediction?.attachPredictedState(entry.frame, this.getLocalPlayerState());
     }
@@ -2065,7 +2388,16 @@ export class RpgClientEngine<T = any> {
       if (this.pointerMoveHandler && this.pointerCanvas) {
         this.pointerCanvas.removeEventListener('pointermove', this.pointerMoveHandler);
         this.pointerCanvas.removeEventListener('pointerdown', this.pointerMoveHandler);
+        if (this.pointerUpHandler) {
+          this.pointerCanvas.removeEventListener('pointerup', this.pointerUpHandler);
+        }
+        if (this.pointerCancelHandler) {
+          this.pointerCanvas.removeEventListener('pointercancel', this.pointerCancelHandler);
+          this.pointerCanvas.removeEventListener('pointerleave', this.pointerCancelHandler);
+        }
         this.pointerMoveHandler = undefined;
+        this.pointerUpHandler = undefined;
+        this.pointerCancelHandler = undefined;
         this.pointerCanvas = undefined;
       }
 
@@ -2142,6 +2474,7 @@ export class RpgClientEngine<T = any> {
       this.cameraFollowTargetId.set(null);
       this.spriteComponentsBehind.set([]);
       this.spriteComponentsInFront.set([]);
+      this.eventComponentResolvers.clear();
       
       // Clear maps and arrays
       this.spritesheets.clear();