ゴールのブロックを追加

Author: nakomochi

public/assets/goal.png

@@ -16,6 +16,7 @@ export enum Block {
   switchingBlockOFF = "switching-block-off",
   switchingBlockON = "switching-block-on",
   switchPressed = "switch-pressed",
+  goal = "goal",
 }
 export enum Facing {
   left = "left",

src/constants.ts

@@ -9,6 +9,7 @@ import type {
   MovableObject,
 } from "./public-types.ts";
 import {
+  goalTexture,
   rockTexture,
   switchBaseTexture,
   switchPressedTexture,
@@ -62,6 +63,10 @@ export type GridCell =
       block: Block.switchPressed;
       switchId?: string;
       objectId?: unknown;
+    }
+  | {
+      block: Block.goal;
+      objectId?: unknown;
     };
 
 export class Grid {
@@ -166,6 +171,12 @@ export class Grid {
             });
             break;
           }
+          case Block.goal: {
+            const sprite = createSprite(cellSize, block, x, y, this.marginY);
+            stage.addChild(sprite);
+            spriteRow.push({ sprite, block });
+            break;
+          }
           default:
             block satisfies never;
         }
@@ -689,6 +700,13 @@ export function createCellsFromStageDefinition(
           row.push(cell);
           break;
         }
+        case Block.goal: {
+          const cell: GridCell = {
+            block,
+          };
+          row.push(cell);
+          break;
+        }
         default:
           block satisfies never;
       }
@@ -712,6 +730,8 @@ export function blockFromDefinition(n: string) {
       return Block.switchBase;
     case "w":
       return Block.switchingBlockOFF;
+    case "g":
+      return Block.goal;
     default:
       throw new Error("no proper block");
   }
@@ -776,7 +796,13 @@ function createSprite(
       updateSprite(sprite, blockSize, x, y, marginY);
       return sprite;
     }
+    case Block.goal: {
+      const sprite = new Sprite(goalTexture);
+      updateSprite(sprite, blockSize, x, y, marginY);
+      return sprite;
+    }
     default:
+      block satisfies Block.air;
       throw new Error("no proper block");
   }
 }
@@ -819,6 +845,8 @@ export function printCells(cells: GridCell[][], context?: string) {
                  return "w";
                case Block.switchPressed:
                  return "s";
+               case Block.goal:
+                 return "g";
                default:
                  cell satisfies never;
              }

src/grid.ts

@@ -164,6 +164,7 @@ export function tick(cx: Context, ticker: Ticker) {
       Block.switchPressed &&
     cx.grid.getBlock(cx, Math.floor(x), Math.floor(y)) !==
       Block.switchingBlockON &&
+    cx.grid.getBlock(cx, Math.floor(x), Math.floor(y)) !== Block.goal &&
     cx.grid.getBlock(cx, Math.floor(x), Math.floor(y)) !== undefined;
   const isSwitchBase = (x: number, y: number) =>
     cx.grid.getBlock(cx, Math.floor(x), Math.floor(y)) === Block.switchBase;

src/player.ts

@@ -8,6 +8,7 @@ export const switchBaseTexture = await Assets.load("/assets/switch-base.png");
 export const switchPressedTexture = await Assets.load(
   "/assets/switch-pressed.png",
 );
+export const goalTexture = await Assets.load("/assets/goal.png");
 export const highlightTexture = await Assets.load("/assets/highlight.svg");
 export const highlightHoldTexture = await Assets.load(
   "/assets/highlight-hold.webp",

src/resources.ts

@@ -23,7 +23,7 @@ export const stages = new Map<string, StageDefinition>([
       stage: [
         "bbbbbbbbbbbbbbbbbb",
         ".........b........",
-        ".........b........",
+        ".........b......g.",
         ".........b...bbbbb",
         ".........m...bbbbb",
         "bbbbbbbbbbbbbbbbbb",
@@ -40,7 +40,7 @@ export const stages = new Map<string, StageDefinition>([
       stage: [
         "bbbbbbbbbbbbbbbbbb",
         "..................",
-        "..................",
+        "...............g..",
         "m............bbbbb",
         "bb...........bbbbb",
         "bb.....m.....bbbbb",
@@ -57,7 +57,7 @@ export const stages = new Map<string, StageDefinition>([
     {
       stage: [
         "bbbbbbbbbbbbbbbbbb",
-        "...b..............",
+        "...b............g.",
         "...b....m......bbb",
         "...bm..........bbb",
         "...bbb.........bbb",
@@ -87,7 +87,7 @@ export const stages = new Map<string, StageDefinition>([
       stage: [
         "bbbbbbbbbbbbbbbbbbbbbb",
         "......................",
-        "......................",
+        "....................g.",
         "m..................bbb",
         "bb.................bbb",
         "bb..........m......bbb",
@@ -127,7 +127,7 @@ export const stages = new Map<string, StageDefinition>([
         ".........b........",
         ".........b........",
         ".........w........",
-        ".s....m..w........",
+        ".s....m..w.....g..",
         "bSbbbbbbbbbbbbbbbb",
       ],
       initialPlayerX: 3,
@@ -158,7 +158,7 @@ export const stages = new Map<string, StageDefinition>([
       stage: [
         "bbbbbbbbbbbbbbbbbbbbbbbbb",
         ".........................",
-        ".........................",
+        "......................g..",
         "...............wbbbbbbbbb",
         "m...............bbbbbbbbb",
         "bb..............w.....m..",
@@ -230,7 +230,7 @@ export const stages = new Map<string, StageDefinition>([
       stage: [
         "bbbbbbbbbbbbbbbbbb",
         "..................",
-        "..................",
+        "................g.",
         "........w......bbb",
         "........w.....wbbb",
         ".....bm.w....w.bbb",
@@ -298,7 +298,7 @@ export const stages = new Map<string, StageDefinition>([
       stage: [
         "bbbbbbbbbbbbbbbbbbbbbbb",
         ".........w...b.........",
-        ".........w...b...m.....",
+        ".........w.g.b...m.....",
         ".........bbbbb.........",
         "m.......w.....w......m.",
         "mm.....w.......w.....mm",