feat: add portal

Author: kt3k

game/field.ts

@@ -53,25 +53,35 @@ export class FieldItems implements IStepper, ILoader {
   #items: Set<IItem> = new Set()
   #deactivateScope: RectScope
   #gridSet = new GridSet<IItem>()
+  #idSet = new Set<string>()
 
   constructor(scope: RectScope) {
     this.#deactivateScope = scope
   }
 
   checkDeactivate(i: number, j: number) {
     this.#deactivateScope.setCenter(i * CELL_SIZE, j * CELL_SIZE)
-    ;[...this.#items.values()]
+    let c = 0
+    this.#items.values()
       .filter((item) => !this.#deactivateScope.overlaps(item))
       .forEach((item) => {
-        console.log("deactivating item", item.id)
+        c++
         this.#deactivate(item.i, item.j, item.id)
       })
+    if (c > 0) {
+      console.log(`deactivating ${c} items`)
+    }
     signal.itemsCount.update(this.#items.size)
   }
 
+  has(id: string) {
+    return this.#idSet.has(id)
+  }
+
   add(item: IItem) {
     this.#items.add(item)
     this.#gridSet.add(item.i, item.j, item)
+    this.#idSet.add(item.id)
     signal.itemsCount.update(this.#items.size)
   }
 
@@ -106,6 +116,7 @@ export class FieldItems implements IStepper, ILoader {
     }
     this.#items.delete(item)
     this.#gridSet.delete(i, j, item)
+    this.#idSet.delete(id)
     signal.itemsCount.update(this.#items.size)
     return item
   }
@@ -127,14 +138,15 @@ export class FieldItems implements IStepper, ILoader {
 
   async loadAssets(options: LoadOptions): Promise<void> {
     await Promise.all(
-      [...this.#items]
+      this.#items.values()
         .filter((item) => !item.assetsReady)
-        .map((item) => item.loadAssets(options)),
+        .map((item) => item.loadAssets(options))
+        .toArray(),
     )
   }
 
   get assetsReady(): boolean {
-    return [...this.#items].every((x) => x.assetsReady)
+    return this.#items.values().every((x) => x.assetsReady)
   }
 
   iter() {
@@ -153,12 +165,16 @@ export class FieldProps implements IStepper, ILoader {
 
   checkDeactivate(i: number, j: number) {
     this.#deactivateScope.setCenter(i * CELL_SIZE, j * CELL_SIZE)
-    ;[...this.#props.values()]
+    let c = 0
+    this.#props.values()
       .filter((obj) => !this.#deactivateScope.overlaps(obj))
       .forEach((obj) => {
-        console.log("deactivating object", obj.id)
+        c++
         this.remove(obj.i, obj.j)
       })
+    if (c > 0) {
+      console.log(`deactivating ${c} objects`)
+    }
     signal.propsCount.update(this.#props.size)
   }
 
@@ -306,17 +322,21 @@ export class FieldActors implements IStepper, ILoader {
     this.#deactivateScope.setCenter(i * CELL_SIZE, j * CELL_SIZE)
 
     const actors = [] as IActor[]
+    let c = 0
     for (const actor of this.#actors) {
       if (this.#deactivateScope.overlaps(actor)) {
         actors.push(actor)
         continue
       }
-      console.log("deactivating actor", actor.id)
+      c++
       this.#idSet.delete(actor.id)
       this.#coordCountMap.decrement(actor.physicalGridKey)
     }
     this.#actors = actors
     signal.actorsCount.update(this.#actors.length)
+    if (c > 0) {
+      console.log(`deactivating ${c} actors`)
+    }
   }
 
   iter() {
@@ -590,9 +610,7 @@ export class Field implements IField {
       this.#addBlock(new FieldBlock(map))
     }
     const initialLoad = !this.#initialBlocksLoaded
-    await Promise.all(
-      [...this.#getChunks(i, j)].map((c) => c.render(initialLoad)),
-    )
+    await Promise.all(this.#getChunks(i, j).map((c) => c.render(initialLoad)))
     if (!this.#initialBlocksLoaded) {
       this.#initialBlocksLoaded = true
       this.checkActivate(
@@ -627,23 +645,30 @@ export class Field implements IField {
     this.#activateScope.setCenter(i * CELL_SIZE, j * CELL_SIZE)
 
     const chunks = [...this.#getChunks(i, j)]
-    const newCharSpawns = chunks.flatMap((c) => c.getCharacterSpawns())
+    const newActorSpawns = chunks.values()
+      .flatMap((c) => c.getCharacterSpawns())
       .filter((spawn) => !this.#actors.has(spawn.id)) // isn't spawned yet
       .filter((spawn) => initialLoad || !viewScope.overlaps(spawn)) // not in view
       .filter((spawn) => this.#activateScope.overlaps(spawn)) // in activate scope
+      .toArray()
 
-    const newItemSpawns = chunks.flatMap((c) => c.getItemSpawns())
+    const newItemSpawns = chunks.values()
+      .flatMap((c) => c.getItemSpawns())
       .filter((spawn) => !this.#items.isCollected(spawn.id)) // isn't collected yet
+      .filter((spawn) => !this.#items.has(spawn.id)) // item is already on the field
       .filter((spawn) => initialLoad || !viewScope.overlaps(spawn)) // not in view
       .filter((spawn) => this.#activateScope.overlaps(spawn)) // in activate scope
+      .toArray()
 
-    const newObjectSpawns = chunks.flatMap((c) => c.getPropSpawns())
+    const newPropSpawns = chunks.values()
+      .flatMap((c) => c.getPropSpawns())
       .filter((spawn) => initialLoad || !viewScope.overlaps(spawn)) // not in view
       .filter((spawn) => this.#activateScope.overlaps(spawn)) // in activate scope
+      .toArray()
 
-    if (newCharSpawns.length > 0) {
+    if (newActorSpawns.length > 0) {
       let i = 0
-      for (const spawn of newCharSpawns) {
+      for (const spawn of newActorSpawns) {
         i++
         this.#actors.add(Actor.fromSpawn(spawn))
       }
@@ -681,9 +706,9 @@ export class Field implements IField {
       await this.#items.loadAssets({ loadImage })
     }
 
-    if (newObjectSpawns.length > 0) {
+    if (newPropSpawns.length > 0) {
       let i = 0
-      for (const spawn of newObjectSpawns) {
+      for (const spawn of newPropSpawns) {
         if (this.#props.get(spawn.i, spawn.j)) {
           // The space is already occupied by some other object
           continue

game/game-screen.ts

@@ -20,8 +20,8 @@ const parseGridPosition = (hash: string) => {
 const start = parseGridPosition(globalThis.location.hash)
 
 // The starting position of the main character
-const I = start?.i ?? -131
-const J = start?.j ?? 183
+const I = start?.i ?? -9964
+const J = start?.j ?? -9981
 
 /**
  * The area which is visible to the user
@@ -148,6 +148,7 @@ export function GameScreen({ el, query }: Context) {
     setTimeout(() => {
       field.reset()
       field.me.fastTravel(i, j)
+      field.me.unsetFollower()
       signal.centerPixel.update({ x: field.me.centerX, y: field.me.centerY })
       loop.start()
     }, 2000)

game/main-character.ts

@@ -63,5 +63,7 @@ export class IdleMainActor implements IdleDelegate {
 export class MoveEndMainActor implements MoveEndDelegate {
   onMoveEnd(actor: Actor, field: IField, _move: Move): void {
     field.peekItem(actor.i, actor.j)?.onCollect(actor, field)
+
+    field.props.get(actor.i, actor.j)?.onEnter(actor, field)
   }
 }

model/catalog.ts

@@ -17,6 +17,7 @@ interface CatalogSource {
   readonly props: Record<string, {
     readonly src: string
     readonly canEnter: boolean
+    readonly onEnter?: string
     readonly pushed?: string
   }>
 }
@@ -47,6 +48,7 @@ export interface PropDefinition {
   readonly type: string
   readonly canEnter: boolean
   readonly pushed?: string
+  readonly onEnter?: string
   readonly src: string
   readonly href: string
 }
@@ -97,6 +99,7 @@ export class Catalog {
         catalog.props[type] = {
           type: type,
           canEnter: def.canEnter,
+          onEnter: def.onEnter,
           pushed: def.pushed,
           src: def.src,
           href: new URL(def.src, url).href,
@@ -141,6 +144,7 @@ export class Catalog {
       props[def.type] = {
         src: def.src,
         canEnter: def.canEnter,
+        onEnter: def.onEnter,
         pushed: def.pushed,
       }
     }

model/field-block.ts

@@ -79,16 +79,19 @@ export class PropSpawnInfo implements IBox {
   readonly y: number
   readonly w = CELL_SIZE
   readonly h = CELL_SIZE
+  readonly data: unknown
   constructor(
     i: number,
     j: number,
     type: PropType,
     def: PropDefinition,
+    data: unknown,
   ) {
     this.id = `${i}.${j}.${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
     this.y = j * CELL_SIZE
@@ -100,11 +103,15 @@ export class PropSpawnInfo implements IBox {
   }
 
   toJSON(): BlockMapSource["props"][number] {
-    return {
+    const json: BlockMapSource["props"][number] = {
       i: this.i,
       j: this.j,
       type: this.type,
     }
+    if (this.data !== undefined) {
+      json.data = this.data
+    }
+    return json
   }
 }
 
@@ -274,6 +281,7 @@ interface BlockMapSource {
     i: number
     j: number
     type: string
+    data?: unknown
   }[]
   field: string[]
 }
@@ -331,6 +339,7 @@ export class BlockMap {
         prop.j,
         prop.type as PropType,
         catalog.props[prop.type]!,
+        prop.data,
       )
     )
     this.field = obj.field

model/item.ts

@@ -106,9 +106,6 @@ export class Item implements IItem {
   }
 
   onCollect(actor: Actor, field: IField) {
-    if (this.id) {
-      Item.collect(this.id)
-    }
     switch (this.def.type) {
       case "apple": {
         const delegate = new CollectApple()

model/prop.ts

@@ -1,6 +1,7 @@
 import { CELL_SIZE } from "../util/constants.ts"
 import type {
   Dir,
+  IActor,
   IField,
   IProp,
   LoadOptions,
@@ -23,6 +24,7 @@ export class Prop implements IProp {
   readonly j: number
   readonly type: PropType
   readonly def: PropDefinition
+  readonly data: unknown
   #motion: Motion | null = null
   readonly #actionQueue = new ActionQueue<Prop, PropAction>(
     (field, action) => {
@@ -60,6 +62,7 @@ export class Prop implements IProp {
       spawn.type,
       spawn.def,
       pushed,
+      spawn.data,
     )
   }
 
@@ -76,13 +79,15 @@ export class Prop implements IProp {
     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
   }
 
   /**
@@ -152,6 +157,21 @@ export class Prop implements IProp {
     this.#pushed?.onPushed(event, this, field)
   }
 
+  onEnter(_actor: IActor, _field: IField): void {
+    if (this.def.onEnter === "teleport") {
+      // deno-lint-ignore no-explicit-any
+      const data = this.data as any
+      const i = data.i
+      const j = data.j
+      if (typeof i === "number" && typeof j === "number") {
+        location.hash = ""
+        setTimeout(() => {
+          location.replace(`#${i},${j}`)
+        }, 10)
+      }
+    }
+  }
+
   enqueueActions(...actions: PropAction[]): void {
     this.#actionQueue.enqueue(...actions)
   }

model/types.ts

@@ -43,6 +43,7 @@ export type IProp =
   & IEntity
   & IStepper
   & FieldEventTarget
+  & { onEnter(actor: IActor, field: IField): void }
   & {
     id: string | null
     type: PropType

static/catalog/base.json

@@ -100,6 +100,11 @@
       "pushed": "break",
       "canEnter": false
     },
+    "portal": {
+      "src": "../prop/portal.png",
+      "canEnter": true,
+      "onEnter": "teleport"
+    },
     "a": {
       "src": "../prop/a.png",
       "canEnter": true