refactor: clean up move intent handling

Author: kt3k

game/field.ts

@@ -10,7 +10,7 @@ import type {
   IStepper,
   LoadOptions,
 } from "../model/types.ts"
-import { spawnActor } from "../model/actor.ts"
+import { Actor } from "../model/actor.ts"
 import { Item } from "../model/item.ts"
 import { Prop } from "../model/prop.ts"
 import {
@@ -550,16 +550,7 @@ export class Field implements IField {
       let i = 0
       for (const spawn of newCharSpawns) {
         i++
-        this.#actors.add(spawnActor(
-          spawn.id,
-          spawn.i,
-          spawn.j,
-          spawn.def,
-          {
-            dir: spawn.dir,
-            speed: spawn.speed,
-          },
-        ))
+        this.#actors.add(Actor.fromSpawn(spawn))
       }
       if (i > 0) {
         console.log(`Spawning ${i} actors`)

game/main-character.ts

@@ -2,22 +2,25 @@ import { DOWN, LEFT, RIGHT, UP } from "../util/dir.ts"
 import { Input, inputQueue } from "./ui/input.ts"
 import {
   Actor,
-  ActorMove,
   type IdleDelegate,
   type MoveEndDelegate,
 } from "../model/actor.ts"
-import type { IField, MovePlan } from "../model/types.ts"
+import type { IField, Move } from "../model/types.ts"
 
 export class IdleMainActor implements IdleDelegate {
-  onIdle(_actor: Actor, _field: IField): MovePlan | undefined {
+  onIdle(actor: Actor, field: IField): void {
     if (Input.up) {
-      return { type: "go", dir: UP }
+      actor.tryMove("go", UP, field)
+      return
     } else if (Input.down) {
-      return { type: "go", dir: DOWN }
+      actor.tryMove("go", DOWN, field)
+      return
     } else if (Input.left) {
-      return { type: "go", dir: LEFT }
+      actor.tryMove("go", LEFT, field)
+      return
     } else if (Input.right) {
-      return { type: "go", dir: RIGHT }
+      actor.tryMove("go", RIGHT, field)
+      return
     }
 
     const queueHead = inputQueue[0]
@@ -27,13 +30,13 @@ export class IdleMainActor implements IdleDelegate {
       queueHead === "touchendempty"
     ) {
       inputQueue.shift()
-      return { type: "jump" }
+      actor.jump()
     }
   }
 }
 
 export class MoveEndMainActor implements MoveEndDelegate {
-  onMoveEnd(actor: Actor, field: IField, _move: ActorMove): void {
+  onMoveEnd(actor: Actor, field: IField, _move: Move): void {
     field.peekItem(actor.i, actor.j)?.onCollect(actor, field)
   }
 }

model/action-queue.ts

@@ -1,4 +1,4 @@
-import type { Dir, IEntity, IField, MovePlan } from "./types.ts"
+import type { Dir, IEntity, IField, MoveAction } from "./types.ts"
 import { splashColor } from "../game/field.ts"
 
 type CommonAction = {
@@ -20,7 +20,7 @@ export type PropAction =
 
 export type ActorAction =
   | CommonAction
-  | MovePlan
+  | MoveAction
   | { readonly type: "go-random" }
   | { readonly type: "speed"; readonly change: "2x" | "4x" | "reset" }
   | {
@@ -38,19 +38,18 @@ export type ActorAction =
 export class ActionQueue<
   T extends IEntity,
   A extends Record<string, unknown>,
-  R = undefined,
 > {
   #queue: A[] = []
   #handler: (
     field: IField,
     action: Exclude<A, CommonAction>,
-  ) => R | undefined
+  ) => "next" | "end"
 
   constructor(
     handler: (
       field: IField,
       action: Exclude<A, CommonAction>,
-    ) => R | undefined,
+    ) => "next" | "end",
   ) {
     this.#handler = handler
   }
@@ -71,7 +70,7 @@ export class ActionQueue<
     this.#queue = []
   }
 
-  process(entity: T, field: IField): R | "idle" | "wait" {
+  process(entity: T, field: IField): "idle" | undefined {
     while (true) {
       const action = this.#queue[0] as unknown as CommonAction
       if (!action) {
@@ -80,7 +79,7 @@ export class ActionQueue<
 
       if (action.type === "wait") {
         if (field.time < action.until) {
-          return "wait"
+          return
         }
         this.#queue.shift()
         continue
@@ -106,8 +105,8 @@ export class ActionQueue<
         }
         default: {
           const result = this.#handler(field, action)
-          if (result) {
-            return result
+          if (result === "end") {
+            return
           }
         }
       }

model/actor.test.ts

@@ -1,26 +1,24 @@
-import { MoveGo, RandomlyTurnNPC, StaticNPC } from "./actor.ts"
+import { Actor, MoveGo } from "./actor.ts"
 import { ActorDefinition } from "./catalog.ts"
 import { assert, assertEquals, assertFalse } from "@std/assert"
 
 const actorDef: ActorDefinition = {
-  src: "main/",
   type: "main",
-  main: "main",
-  href: "main/",
-  // other properties if needed
+  src: "../main/",
+  href: "./main/",
 }
 
 Deno.test("Actor", async (t) => {
   await t.step("physicalGridKey", () => {
-    const mc = new StaticNPC(100, 100, actorDef, "main")
+    const mc = new Actor(100, 100, actorDef, "main")
     assertEquals(mc.physicalGridKey, "100.100")
 
-    const npc = new RandomlyTurnNPC(200, 200, actorDef, "npc")
+    const npc = new Actor(200, 200, actorDef, "npc")
     assertEquals(npc.physicalGridKey, "200.200")
   })
 
   await t.step("frontGrid", () => {
-    const c = new StaticNPC(100, 100, actorDef, "main")
+    const c = new Actor(100, 100, actorDef, "main")
     assertEquals(c.frontGrid(), [100, 101])
 
     c.setDir("right")