refactor: actor spawn

Author: kt3k

game/field.ts

@@ -2,6 +2,7 @@ import * as signal from "../util/signal.ts"
 import { ceilN, floorN } from "../util/math.ts"
 import { BLOCK_CHUNK_SIZE, BLOCK_SIZE, CELL_SIZE } from "../util/constants.ts"
 import type {
+  Dir,
   IActor,
   IField,
   IItem,
@@ -10,7 +11,7 @@ import type {
   IStepper,
   LoadOptions,
 } from "../model/types.ts"
-import { Actor } from "../model/actor.ts"
+import { Actor, spawnActor } from "../model/actor.ts"
 import { Item } from "../model/item.ts"
 import { Prop } from "../model/prop.ts"
 import {
@@ -387,7 +388,6 @@ export class Field implements IField {
   #loadScope = new BlockLoadScope()
   #unloadScope = new BlockUnloadScope()
   #activateScope: RectScope
-  #deactivateScope: RectScope
   #mapLoader = new BlockMapLoader(new URL("map/", location.href).href)
   #initialBlocksLoaded = false
   #initialActivateReady = false
@@ -405,7 +405,6 @@ export class Field implements IField {
   ) {
     this.#el = el
     this.#activateScope = activateScope
-    this.#deactivateScope = deactivateScope
     this.#actors = new FieldActors([], deactivateScope)
     this.#items = new FieldItems(deactivateScope)
     this.#props = new FieldProps(deactivateScope)
@@ -485,6 +484,29 @@ export class Field implements IField {
     this.#items.collect(i, j)
   }
 
+  // Spawns a new actor at the given grid coordinate
+  // if the actor type is unavailable in the given block, returns null
+  spawnActor(type: string, i: number, j: number, dir: Dir): IActor | null {
+    const def = this.#getBlock(i, j).catalog.actors[type]
+
+    if (!def) {
+      console.log("Unable to spawn actor of type:", type)
+      return null
+    }
+
+    const actor = spawnActor(
+      `${i}.${j}.${type}.${crypto.randomUUID()}`,
+      i,
+      j,
+      def,
+      { dir },
+    )
+    this.actors.add(actor)
+    actor.loadAssets({ loadImage })
+
+    return actor
+  }
+
   #hasBlock(blockId: string) {
     return !!this.#blocks[blockId]
   }

model/field-block.ts

@@ -498,6 +498,10 @@ export class FieldBlock {
     this.propSpawns = new SpawnMap(map.props)
   }
 
+  get catalog(): Catalog {
+    return this.#map.catalog
+  }
+
   loadCellImage(href: string, options: LoadOptions): Promise<ImageBitmap> {
     return options.loadImage
       ? options.loadImage(href)

model/item.ts

@@ -4,22 +4,13 @@ import { ItemDefinition } from "./catalog.ts"
 import type { IActor, IField, IItem, ItemType, LoadOptions } from "./types.ts"
 import { splashColor } from "../game/field.ts"
 import { seed } from "../util/random.ts"
-import { spawnActor } from "./actor.ts"
-import { loadImage } from "../util/load.ts"
 import { DIRS } from "../util/dir.ts"
 import * as signal from "../util/signal.ts"
 
 const fallbackImage = await fetch(
   "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAADRJREFUOE9jZKAQMFKon2FoGPAfzZsoribGC0PQALxORo92bGEwDAwgKXUTkw7wGjjwBgAAiwgIEW1Cnt4AAAAASUVORK5CYII=",
 ).then((res) => res.blob()).then((blob) => createImageBitmap(blob))
 
-const lenaDef = {
-  type: "inertial" as const,
-  moveEnd: "inertial" as const,
-  src: "../actor/lena/",
-  href: "./actor/lena/",
-}
-
 export class Item implements IItem {
   /** The unique identifier of the item. Only items which are spawned from block map have ids. */
   readonly id: string | null
@@ -123,16 +114,9 @@ export class CollectApple implements CollectDelegate {
     for (const dir of DIRS) {
       if (dir === actor.dir) continue
       if (!actor.canGo(dir, field)) continue
-      const actor_ = spawnActor(
-        `${actor.i}.${actor.j}.inertial.${crypto.randomUUID()}`,
-        actor.i,
-        actor.j,
-        lenaDef,
-        { dir },
-      )
-      actor_.loadAssets({ loadImage })
-      actor_.enqueueActions({ type: "go", dir })
-      field.actors.add(actor_)
+      const spawned = field.spawnActor("inertial", actor.i, actor.j, dir)
+      if (!spawned) continue
+      spawned.enqueueActions({ type: "go", dir })
     }
 
     const hue = 333.3

model/types.ts

@@ -50,6 +50,7 @@ export type IField = {
   /** can enter the cell without considering dynamic objects */
   canEnterStatic(i: number, j: number): boolean
   peekItem(i: number, j: number): IItem | undefined
+  spawnActor(type: string, i: number, j: number, dir: Dir): IActor | null
   collectItem(i: number, j: number): void
   actors: {
     iter(): Iterable<IActor>