fix

Author: kt3k

game/field.ts

@@ -82,6 +82,14 @@ export class FieldItems implements IStepper, ILoader {
     return this.#coordMap[`${i}.${j}`]
   }
 
+  debug() {
+    console.log(
+      Object.entries(this.#coordMap).filter(([_, item]: any) =>
+        item.type === "fish"
+      ),
+    )
+  }
+
   /** Collects an item from the field. */
   collect(i: number, j: number) {
     const item = this.#deactivate(i, j)
@@ -107,16 +115,24 @@ export class FieldItems implements IStepper, ILoader {
   }
 
   step(field: IField) {
+    const changed = new Set<[string, string, IItem]>()
     for (const item of this.#items) {
       const key = `${item.i}.${item.j}`
       item.step(field)
       const keyAfter = `${item.i}.${item.j}`
       if (key !== keyAfter) {
+        changed.add([key, keyAfter, item])
         // The item has moved
         delete this.#coordMap[key]
         this.#coordMap[keyAfter] = item
       }
     }
+    for (const [key] of changed) {
+      delete this.#coordMap[key]
+    }
+    for (const [_, keyAfter, item] of changed) {
+      this.#coordMap[keyAfter] = item
+    }
   }
 
   async loadAssets(options: LoadOptions): Promise<void> {

game/main-character.ts

@@ -61,6 +61,8 @@ export class IdleMainActor implements IdleDelegate {
 
 export class MoveEndMainActor implements MoveEndDelegate {
   onMoveEnd(actor: Actor, field: IField, _move: Move): void {
+    //console.log("peekItem", actor.i, actor.j, field.peekItem(actor.i, actor.j))
+    ;(field as any).items.debug()
     field.peekItem(actor.i, actor.j)?.onCollect(actor, field)
   }
 }

model/actor.ts

@@ -249,15 +249,8 @@ export class Actor implements IActor {
     if (type === "go") this.setDir(dir)
     if (this.canGo(dir, field)) {
       this.#move = new MoveGo(this.#speed, dir)
-      if (
-        this.#follower && this.#lastMoveDir &&
-        (this.#i !== this.#follower.i || this.#j !== this.#follower.j)
-      ) {
-        this.#follower.enqueueActions({
-          type: "go",
-          dir: this.#lastMoveDir,
-          speed: this.#speed,
-        })
+      if (this.#follower && this.#lastMoveDir) {
+        this.#follower.follow(this.#i, this.#j, this.#lastMoveDir, this.#speed)
       }
 
       // actor position moves to the next grid immediately (the animation catches it up in 16 frames)
@@ -288,6 +281,7 @@ export class Actor implements IActor {
     this.#move = new MoveJump()
     this.#move.cb = cb
     this.#idleCounter = 0
+    this.unsetFollower()
   }
 
   setDir(state: Dir) {
@@ -526,7 +520,18 @@ export class Actor implements IActor {
   }
 
   setFollower(follower: IFollower) {
-    this.#follower = follower
+    if (this.#follower) {
+      this.#follower.setFollower(follower)
+    } else {
+      this.#follower = follower
+    }
+  }
+
+  unsetFollower() {
+    if (this.#follower) {
+      this.#follower.unfollow()
+      this.#follower = null
+    }
   }
 }
 

model/item.ts

@@ -34,7 +34,8 @@ export class Item implements IItem {
   #image: ImageBitmap | undefined
   #move: Move | null = null
   #lastMoveDir: Dir | null = null
-  #follower: Item | null = null
+  #follower: IFollower | null = null
+  #followState: "following" | "waiting" | null = null
   readonly #actionQueue = new ActionQueue<Item, ItemAction>(
     (_field, action) => {
       switch (action.type) {
@@ -184,7 +185,41 @@ export class Item implements IItem {
   }
 
   setFollower(follower: IFollower): void {
-    this.#follower = follower as Item
+    if (this.#follower) {
+      this.#follower.setFollower(follower)
+    } else {
+      this.#follower = follower
+    }
+  }
+
+  follow(i: number, j: number, dir: Dir, speed: 1 | 2 | 4 | 8 | 16) {
+    if (this.#followState === "following") {
+      this.enqueueActions({ type: "go", dir, speed })
+      if (this.#follower && this.#lastMoveDir) {
+        this.#follower.follow(this.i, this.j, this.#lastMoveDir, speed)
+      }
+    } else if (this.#followState === "waiting") {
+      if (this.i === i && this.j === j) {
+        this.#followState = "following"
+      }
+    }
+  }
+
+  unfollow() {
+    console.log("unfollow", this.id, this.i, this.j)
+    this.#followState = null
+    if (this.#follower) {
+      this.#follower.unfollow()
+      this.#follower = null
+    }
+  }
+
+  get isFollowing() {
+    return this.#followState !== null
+  }
+
+  startFollowing() {
+    this.#followState = "waiting"
   }
 }
 
@@ -312,7 +347,11 @@ export class CollectPurpleMushroom implements CollectDelegate {
 
 export class CollectFish implements CollectDelegate {
   onCollect(actor: IActor, field: IField, item: Item): void {
+    if (item.isFollowing) {
+      return
+    }
     actor.setFollower(item)
+    item.startFollowing()
 
     for (
       const effect of linePattern0(DIRS, actor.i, actor.j, 1, 0.7, 3, "#006e8a")
@@ -321,5 +360,3 @@ export class CollectFish implements CollectDelegate {
     }
   }
 }
-
-// implement following item delegate

model/types.ts

@@ -80,12 +80,14 @@ export type IFinishable = {
   readonly finished: boolean
 }
 
-export type IFollower = {
+export type IFollower = IFollowable & {
   i: number
   j: number
   enqueueActions(
     ...actions: { type: "go"; dir: Dir; speed?: 1 | 2 | 4 | 8 | 16 }[]
   ): void
+  follow(i: number, j: number, dir: Dir, speed: 1 | 2 | 4 | 8 | 16): void
+  unfollow(): void
 }
 
 export type IFollowable = {

static/map/block_-200.-200.json

@@ -4046,6 +4046,16 @@
       "i": -54,
       "j": -46,
       "type": "fish"
+    },
+    {
+      "i": -79,
+      "j": -65,
+      "type": "fish"
+    },
+    {
+      "i": -76,
+      "j": -65,
+      "type": "fish"
     }
   ],
   "props": [