@rpgjs/server 5.0.0-alpha.26 → 5.0.0-alpha.27

package/src/Player/Player.ts

@@ -369,7 +369,16 @@ export class RpgPlayer extends BasicPlayerMixins(RpgCommonPlayer) {
       // Skip collision check for teleportation (allow teleporting through walls)
       const entity = this.map.physic.getEntityByUUID(this.id);
       if (entity) {
-        this.map.physic.teleport(entity, { x: positions.x, y: positions.y });
+        const hitbox = typeof this.hitbox === "function" ? this.hitbox() : this.hitbox;
+        const width = hitbox?.w ?? 32;
+        const height = hitbox?.h ?? 32;
+        
+        // Convert top-left position to center position for physics engine
+        // positions.x/y are TOP-LEFT coordinates, but physic.teleport expects CENTER coordinates
+        const centerX = positions.x + width / 2;
+        const centerY = positions.y + height / 2;
+        
+        this.map.physic.teleport(entity, { x: centerX, y: centerY });
       }
     }
     this.x.set(positions.x)
@@ -1108,6 +1117,10 @@ export class RpgPlayer extends BasicPlayerMixins(RpgCommonPlayer) {
       }, this)
     }
   }
+
+  isEvent(): boolean {
+    return false;
+  }
 }
 
 export class RpgEvent extends RpgPlayer {
@@ -1126,6 +1139,10 @@ export class RpgEvent extends RpgPlayer {
     if (!map) return;
     map.removeEvent(this.id);
   }
+
+  override isEvent(): boolean {
+    return true;
+  }
 }
 
 

package/src/index.ts

@@ -12,4 +12,5 @@ export * from "@signe/reactive";
 export * from "./Gui";
 export { RpgShape, RpgModule } from "@rpgjs/common";
 export * from "./decorators/event";
-export * from "./decorators/map";
+export * from "./decorators/map";
+export * from "./Player/MoveManager";

package/src/rooms/map.ts

@@ -222,6 +222,7 @@ export class RpgMap extends RpgCommonMap<RpgPlayer> implements RoomOnJoin {
     if (isTest) {
       this.autoSync = false;
       this.setAutoTick(false);
+      this.autoTickEnabled = false;
       this.throttleSync = 0;
       this.throttleStorage = 0;
     }
@@ -1320,8 +1321,7 @@ export class RpgMap extends RpgCommonMap<RpgPlayer> implements RoomOnJoin {
     eventInstance.map = this;
     eventInstance.context = context;
 
-    eventInstance.x.set(x);
-    eventInstance.y.set(y);
+    await eventInstance.teleport({ x, y });
 
     this.events()[id] = eventInstance;
 

package/tests/change-map.spec.ts

@@ -67,6 +67,6 @@ test('Player can change map', async () => {
     expect(newMap).toBeDefined()
     expect(newMap?.id).toBe('map2')
     
-    expect(player.x()).toBe(200 - player.hitbox().h / 2)
-    expect(player.y()).toBe(200 - player.hitbox().w / 2)
+    expect(player.x()).toBe(200)
+    expect(player.y()).toBe(200)
 })

package/tests/event.spec.ts

@@ -0,0 +1,80 @@
+import { beforeEach, test, expect, afterEach } from 'vitest'
+import { testing, TestingFixture } from '@rpgjs/testing'
+import { defineModule, createModule } from '@rpgjs/common'
+import { RpgPlayer, RpgServer, Move } from '../src'
+import { RpgClient } from '../../client/src'
+
+const Event = () => {
+  return {
+    name: "EV-1",
+    onInit() {
+      this.setGraphic("hero");
+    }
+  }
+}
+
+// Define server module with two maps
+const serverModule = defineModule<RpgServer>({
+  maps: [
+    {
+      id: 'map1',
+      events: [{ event: Event(), x: 100, y: 150 }]
+    },
+  ],
+  player: {
+    async onConnected(player) {
+      await player.changeMap('map1', { x: 100, y: 126 })
+    }
+  }
+})
+
+// Define client module
+const clientModule = defineModule<RpgClient>({
+  // Client-side logic
+})
+
+let player: RpgPlayer
+let client: any
+let fixture: TestingFixture
+
+beforeEach(async () => {
+    const myModule = createModule('TestModule', [{
+        server: serverModule,
+        client: clientModule
+    }])
+    
+    fixture = await testing(myModule)
+    client = await fixture.createClient()
+    player = client.player
+})
+
+afterEach(() => {
+  fixture.clear()
+})
+
+test('Player to touch event', async () => {
+    player = await client.waitForMapChange('map1')
+    const map = player.getCurrentMap()
+    const event = map?.getEvents()[0]
+    expect(event).toBeDefined()
+    expect(event?.name()).toBe("EV-1")
+    expect(event?.x()).toBe(100)
+    expect(event?.y()).toBe(150)
+    await fixture.waitUntil(
+        player.moveRoutes([
+          Move.tileDown(2),
+        ], {
+          onStuck: () => false
+        })
+    )
+    expect(event?.x()).toBe(100)
+    expect(event?.y()).toBe(150)
+    await fixture.waitUntil(
+      event!.moveRoutes([
+        Move.down()
+      ])
+    )
+    expect(event?.x()).toBe(100)
+    expect(event?.y()).toBe(150 + event!.speed())
+   
+})

package/tests/item.spec.ts

@@ -1,5 +1,5 @@
 import { beforeEach, test, expect, afterEach, describe, vi } from "vitest";
-import { testing, waitForSyncComplete } from "@rpgjs/testing";
+import { testing, waitForSyncComplete, TestingFixture } from "@rpgjs/testing";
 import { defineModule, createModule } from "@rpgjs/common";
 import { RpgPlayer, RpgServer } from "../src";
 import { RpgClient } from "../../client/src";
@@ -57,7 +57,7 @@ const TestNoPriceItem = {
 
 let player: RpgPlayer;
 let clientTesting: any;
-let fixture: any;
+let fixture: TestingFixture;
 
   // Define server module with items in database
   const serverModule = defineModule<RpgServer>({