Merge pull request #43 from neagix/main

fix: do not run onTurn events when map changed

Author: achtaitaipai

packages/odyc/src/gameLoop.ts

@@ -37,7 +37,7 @@ class GameLoop<T extends string> {
 
 		const onTurnEvents = this.#gameState.cells
 			.get()
-			.map((el) => this.#gameState.cells.getEvent(...el.position, 'onTurn'))
+			.filter((cell) => cell.onTurn)
 
 		if (this.#isCellOnworld(to.value)) {
 			const cell = this.#gameState.cells.getCellAt(...to.value)
@@ -54,8 +54,8 @@ class GameLoop<T extends string> {
 				await this.#gameState.cells.getEvent(...to.value, 'onCollide')?.()
 			else await this.#gameState.cells.getEvent(...to.value, 'onEnter')?.()
 		}
-		for (const event of onTurnEvents) {
-			await event?.()
+		for (const cell of onTurnEvents) {
+			await this.#gameState.cells.getEvent(...cell.position, 'onTurn')?.()
 		}
 		this.#gameState.player.dispatchOnTurn()
 		if (!this.#ender.ending) this.#gameState.turn.next()

tests/odyc-e2e/functional/on-turn/index.test.ts

@@ -39,5 +39,50 @@ describe('onTurn events', () => {
 		expect(turnSpy).toHaveBeenCalledOnce()
 	})
 
-	// test('should call onTurn for newly created actors on subsequent turns', async () => {})
+	test('should call onTurn for newly created actors on subsequent turns', async () => {
+		const turnSpy = vi.fn()
+		const game = createGame({
+			templates: {
+				x: {
+					onTurn() {
+						game.setCellAt(1, 0, 'y')
+					},
+				},
+				'.': {},
+				y: {
+					onTurn: turnSpy,
+				},
+			},
+			map: `x.`,
+		})
+
+		// First turn - x creates y
+		await userEvent.keyboard('[ArrowLeft]')
+		expect(turnSpy).not.toHaveBeenCalled()
+
+		// Second turn - y should have onTurn called
+		await userEvent.keyboard('[ArrowLeft]')
+		expect(turnSpy).toHaveBeenCalledOnce()
+	})
+
+	test('should not call onTurn for cells removed during the turn', async () => {
+		const turnSpy = vi.fn()
+		const game = createGame({
+			templates: {
+				x: {
+					onCollide() {
+						game.clearCellAt(0, 0)
+					},
+				},
+				y: {
+					onTurn: turnSpy,
+				},
+			},
+			map: `yx`,
+		})
+
+		// Move right to collide with x, which clears y during the collision
+		await userEvent.keyboard('[ArrowRight]')
+		expect(turnSpy).not.toHaveBeenCalled()
+	})
 })