fallableを追加

Author: na-trium-144

public/assets/woodenbox.png

@@ -65,7 +65,13 @@ export function copy(cx: Context) {
   const x = focus.x;
   const y = focus.y;
   const target = cx.grid.getBlock(cx, x, y);
-  if (!target || target !== Block.movable) return;
+  if (
+    !target ||
+    (target !== Block.movable &&
+      target !== Block.switchWithObject &&
+      target !== Block.fallable)
+  )
+    return;
   const movableObject = cx.grid.getMovableObject(cx, x, y);
   if (!movableObject) return;
 
@@ -130,7 +136,9 @@ export function cut(cx: Context) {
   // removable 以外はカットできない
   if (
     !target ||
-    (target !== Block.movable && target !== Block.switchWithObject)
+    (target !== Block.movable &&
+      target !== Block.switchWithObject &&
+      target !== Block.fallable)
   )
     return;
   const movableObject = cx.grid.getMovableObject(cx, x, y);
@@ -176,6 +184,7 @@ export function placeMovableObject(
     grid.setBlock(cx, positionX, positionY, {
       block: object.block,
       objectId: object.objectId,
+      dy: 0,
     });
   }
 }

src/ability.ts

@@ -10,6 +10,7 @@ export enum Block {
   air = "air",
   block = "block",
   movable = "movable",
+  fallable = "fallable",
   switch = "switch",
   switchBase = "switch-base",
   switchWithObject = "switch-with-object",

src/constants.ts

@@ -9,6 +9,7 @@ import type {
   MovableObject,
 } from "./public-types.ts";
 import {
+  fallableTexture,
   rockTexture,
   switchBaseTexture,
   switchPressedTexture,
@@ -30,6 +31,11 @@ export type GridCell =
       block: Block.movable;
       objectId: string;
     }
+  | {
+      block: Block.fallable;
+      objectId: string;
+      dy: number; // in pixels
+    }
   | {
       block: Block.air;
       objectId?: unknown;
@@ -99,6 +105,12 @@ export class Grid {
             spriteRow.push({ sprite, block });
             break;
           }
+          case Block.fallable: {
+            const sprite = createSprite(cellSize, block, x, y, this.marginY);
+            stage.addChild(sprite);
+            spriteRow.push({ sprite, block });
+            break;
+          }
           case Block.block: {
             const sprite = createSprite(cellSize, block, x, y, this.marginY);
             stage.addChild(sprite);
@@ -289,7 +301,11 @@ export class Grid {
     const cells = get(cx.state).cells;
     const cell = cells[y]?.[x];
     if (!cell) return undefined;
-    if (cell.block !== Block.movable && cell.block !== Block.switchWithObject)
+    if (
+      cell.block !== Block.movable &&
+      cell.block !== Block.switchWithObject &&
+      cell.block !== Block.fallable
+    )
       return undefined;
     const objectId = cell.objectId;
     const retrievedBlocks: { x: number; y: number }[] = [];
@@ -308,7 +324,7 @@ export class Grid {
       .reduce((a, b) => Math.max(a, b), 0);
 
     const retrievedObject: MovableObject = {
-      block: Block.movable,
+      block: cell.block === Block.fallable ? Block.fallable : Block.movable,
       objectId,
       relativePositions: retrievedBlocks.map((block) => ({
         x: block.x - minX,
@@ -357,6 +373,7 @@ export class Grid {
     if (
       cell.block !== Block.movable &&
       cell.block !== Block.switchWithObject &&
+      cell.block !== Block.fallable &&
       cell.objectId
     ) {
       console.warn("Cell is not movable but has an objectId");
@@ -419,7 +436,8 @@ export class Grid {
     else if (prev.block === Block.switch) {
       if (
         cell.block !== Block.movable &&
-        cell.block !== Block.switchWithObject
+        cell.block !== Block.switchWithObject &&
+        cell.block !== Block.fallable
       ) {
         console.warn(
           "No block other than movable cannot be placed on the switch",
@@ -441,6 +459,9 @@ export class Grid {
           prevCell.block === Block.switchWithObject,
         "block is not switch",
       );
+      if (cell.block === Block.fallable) {
+        console.warn("TODO: switchWithFallable is not implemented");
+      }
       cells[y][x] = {
         block: Block.switchWithObject,
         switchId: prevCell.switchId,
@@ -609,6 +630,28 @@ export class Grid {
           prev.block = cell.block;
           break;
         }
+        case Block.fallable: {
+          const movableSprite = createSprite(
+            blockSize,
+            cell.block,
+            x,
+            y,
+            marginY,
+          );
+          stage.addChild(movableSprite);
+          assert(
+            cell.objectId !== undefined,
+            "movable block must have objectId",
+          );
+          cells[y][x] = {
+            block: cell.block,
+            objectId: cell.objectId,
+            dy: 0,
+          };
+          prev.sprite = movableSprite;
+          prev.block = cell.block;
+          break;
+        }
         default:
         // cell satisfies never;
       }
@@ -644,6 +687,19 @@ export function createCellsFromStageDefinition(
 
           break;
         }
+        case Block.fallable: {
+          const group = stageDefinition.blockGroups.find(
+            (b) => b.x === x && b.y === y,
+          );
+          const objectId = group ? group.objectId : Math.random().toString();
+          const cell: GridCell = {
+            block,
+            objectId,
+            dy: 0,
+          };
+          row.push(cell);
+          break;
+        }
         case Block.block:
         case Block.air: {
           const cell: GridCell = {
@@ -706,6 +762,8 @@ export function blockFromDefinition(n: string) {
       return Block.block;
     case "m":
       return Block.movable;
+    case "f":
+      return Block.fallable;
     case "s":
       return Block.switch;
     case "S":
@@ -737,6 +795,12 @@ function createSprite(
       updateSprite(movableSprite, blockSize, x, y, marginY);
       return movableSprite;
     }
+    case Block.fallable: {
+      const movableSprite = new Sprite(fallableTexture);
+      // movableSprite.tint = 0xff0000;
+      updateSprite(movableSprite, blockSize, x, y, marginY);
+      return movableSprite;
+    }
     case Block.switch: {
       const switchSprite = new Sprite(switchTexture);
       if (switchColor) switchSprite.tint = switchColor;
@@ -807,6 +871,8 @@ export function printCells(cells: GridCell[][], context?: string) {
                  return "b";
                case Block.movable:
                  return "m";
+               case Block.fallable:
+                 return "m";
                case Block.switch:
                  return "s";
                case Block.switchBase:

src/grid.ts

@@ -3,6 +3,7 @@ import { Assets } from "pixi.js";
 // assets
 export const bunnyTexture = await Assets.load("/assets/bunny.png");
 export const rockTexture = await Assets.load("/assets/block.png");
+export const fallableTexture = await Assets.load("/assets/woodenbox.png");
 export const switchTexture = await Assets.load("/assets/switch.png");
 export const switchBaseTexture = await Assets.load("/assets/switch-base.png");
 export const switchPressedTexture = await Assets.load(

src/resources.ts

@@ -405,4 +405,23 @@ export const stages = new Map<string, StageDefinition>([
       ],
     },
   ],
+  [
+    "3-2",
+    {
+      stage: [
+        "bbbbbbbbbbbbbbbbbb",
+        "..................",
+        "..................",
+        ".............bbbbb",
+        ".........f...bbbbb",
+        ".........f...bbbbb",
+        ".........f...bbbbb",
+        "bbbbbbbbbbbbbbbbbb",
+      ],
+      initialPlayerX: 1,
+      initialPlayerY: 7,
+      blockGroups: [],
+      switchGroups: [],
+    },
+  ],
 ]);