refactor: remove PropType, ItemType

Author: kt3k

game/field.ts

@@ -693,7 +693,6 @@ export class Field implements IField {
             spawn.id,
             spawn.i,
             spawn.j,
-            spawn.type,
             spawn.def,
           ),
         )

model/field-block.ts

@@ -4,7 +4,7 @@ import { seed } from "../util/random.ts"
 import { floorN, modulo } from "../util/math.ts"
 import { loadImage } from "../util/load.ts"
 import type { Dir, IBox } from "./types.ts"
-import type { ItemType, LoadOptions, PropType as PropType } from "./types.ts"
+import type { LoadOptions } from "./types.ts"
 import {
   ActorDefinition,
   Catalog,
@@ -33,7 +33,6 @@ export class ItemSpawn implements IBox {
   readonly id: string
   readonly i: number
   readonly j: number
-  readonly type: ItemType
   readonly def: ItemDefinition
   readonly x: number
   readonly y: number
@@ -42,28 +41,26 @@ export class ItemSpawn implements IBox {
   constructor(
     i: number,
     j: number,
-    type: ItemType,
     def: ItemDefinition,
   ) {
-    this.id = `${i}.${j}.${type}` // Unique ID for the spawn
+    this.id = `${i}.${j}.${def.type}` // Unique ID for the spawn
     this.i = i
     this.j = j
-    this.type = type
     this.def = def
     this.x = i * CELL_SIZE
     this.y = j * CELL_SIZE
   }
 
   equals(other: ItemSpawn): boolean {
     return this.i === other.i && this.j === other.j &&
-      this.type === other.type
+      this.def.type === other.def.type
   }
 
   toJSON(): BlockMapSource["items"][number] {
     return {
       i: this.i,
       j: this.j,
-      type: this.type,
+      type: this.def.type,
     }
   }
 }
@@ -73,7 +70,6 @@ export class PropSpawn implements IBox {
   readonly id: string
   readonly i: number
   readonly j: number
-  readonly type: PropType
   readonly def: PropDefinition
   readonly x: number
   readonly y: number
@@ -83,14 +79,12 @@ export class PropSpawn implements IBox {
   constructor(
     i: number,
     j: number,
-    type: PropType,
     def: PropDefinition,
     data: unknown,
   ) {
-    this.id = `${i}.${j}.${type}` // Unique ID for the spawn
+    this.id = `${i}.${j}.${def.type}` // Unique ID for the spawn
     this.i = i
     this.j = j
-    this.type = type
     this.data = data
     this.def = def
     this.x = i * CELL_SIZE
@@ -99,14 +93,14 @@ export class PropSpawn implements IBox {
 
   equals(other: PropSpawn): boolean {
     return this.i === other.i && this.j === other.j &&
-      this.type === other.type
+      this.def.type === other.def.type
   }
 
   toJSON(): BlockMapSource["props"][number] {
     const json: BlockMapSource["props"][number] = {
       i: this.i,
       j: this.j,
-      type: this.type,
+      type: this.def.type,
     }
     if (this.data !== undefined) {
       json.data = this.data
@@ -329,15 +323,13 @@ export class BlockMap {
       new ItemSpawn(
         item.i,
         item.j,
-        item.type as ItemType,
         catalog.items[item.type]!,
       )
     )
     this.props = (source.props ?? []).map((prop) =>
       new PropSpawn(
         prop.i,
         prop.j,
-        prop.type as PropType,
         catalog.props[prop.type]!,
         prop.data,
       )

model/item.ts

@@ -8,7 +8,6 @@ import type {
   IField,
   IFollower,
   IItem,
-  ItemType,
   LoadOptions,
   Move,
 } from "./types.ts"
@@ -27,7 +26,6 @@ export class Item implements IItem {
   readonly id: string
   i: number
   j: number
-  readonly type: ItemType
   readonly def: ItemDefinition
   readonly w = CELL_SIZE
   readonly h = CELL_SIZE
@@ -80,33 +78,29 @@ export class Item implements IItem {
       spawn.id,
       spawn.i,
       spawn.j,
-      spawn.type,
       spawn.def,
     )
   }
 
   /**
    * @param i The column of the grid coordinate
    * @param j The row of the grid coordinate
-   * @param type The type of item
    * @param def The item definition
    */
   constructor(
     id: string | null,
     i: number,
     j: number,
-    type: ItemType,
     def: ItemDefinition,
   ) {
     this.id = id ?? `item-${i}-${j}-${crypto.randomUUID()}`
     this.i = i
     this.j = j
-    this.type = type
     this.def = def
   }
 
   onCollect(actor: Actor, field: IField) {
-    switch (this.def.type) {
+    switch (this.def.collect) {
       case "apple": {
         const delegate = new CollectApple()
         delegate.onCollect(actor, field, this)

model/prop.ts

@@ -5,7 +5,6 @@ import type {
   IField,
   IProp,
   LoadOptions,
-  PropType,
   PushedEvent,
 } from "./types.ts"
 import { PropSpawn } from "./field-block.ts"
@@ -22,7 +21,6 @@ export class Prop implements IProp {
   readonly id: string | null
   readonly i: number
   readonly j: number
-  readonly type: PropType
   readonly def: PropDefinition
   readonly data: unknown
   #motion: Motion | null = null
@@ -59,7 +57,6 @@ export class Prop implements IProp {
       spawn.id,
       spawn.i,
       spawn.j,
-      spawn.type,
       spawn.def,
       pushed,
       spawn.data,
@@ -69,22 +66,21 @@ export class Prop implements IProp {
   /**
    * @param i The column of the grid coordinate
    * @param j The row of the grid coordinate
-   * @param type The type of item
-   * @param src The path to the asset image
+   * @param def The definition of the prop
+   * @param pushed The pushed delegate
+   * @param data The additional data
    */
   constructor(
     id: string | null,
     i: number,
     j: number,
-    type: PropType,
     def: PropDefinition,
     pushed: PushedDelegate | null,
     data: unknown,
   ) {
     this.id = id
     this.i = i
     this.j = j
-    this.type = type
     this.def = def
     this.#pushed = pushed
     this.data = data

model/types.ts

@@ -29,24 +29,19 @@ export type IEntity = IBox & ILoader & {
   image(): ImageBitmap
 }
 
-export type ItemType = "apple" | "green-apple" | "mushroom" | "purple-mushroom"
-
 export type IItem = IEntity & IStepper & IFollowable & {
   id: string
   isFollowing: boolean
   onCollect(actor: IActor, field: IField): void
 }
 
-export type PropType = "stool" | "table"
-
 export type IProp =
   & IEntity
   & IStepper
   & FieldEventTarget
   & { onEnter(actor: IActor, field: IField): void }
   & {
     id: string | null
-    type: PropType
     canEnter: boolean
   }