inverseSwitchingBlock実装

Author: na-trium-144

src/constants.ts

@@ -13,8 +13,10 @@ export enum Block {
   fallable = "fallable",
   switch = "switch",
   switchBase = "switch-base",
-  switchingBlockOFF = "switching-block-off",
-  switchingBlockON = "switching-block-on",
+  switchingBlockOFF = "switching-block-off", // 初期状態で出現している
+  switchingBlockON = "switching-block-on", // スイッチを押すと隠れる
+  inverseSwitchingBlockOFF = "inverse-switching-block-off", // 初期状態で隠れている
+  inverseSwitchingBlockON = "inverse-switching-block-on", // スイッチを押すと出現する
   switchPressed = "switch-pressed",
   goal = "goal",
 }
@@ -37,5 +39,6 @@ export const BlockDefinitionMap = new Map<string, Block | null>([
   ["s", Block.switch],
   ["S", Block.switchBase],
   ["w", Block.switchingBlockOFF],
+  ["W", Block.inverseSwitchingBlockOFF],
   ["g", Block.goal],
 ]);

src/grid.ts

@@ -63,6 +63,16 @@ export type GridCell =
       switchId?: string;
       objectId?: unknown;
     }
+  | {
+      block: Block.inverseSwitchingBlockOFF;
+      switchId?: string;
+      objectId?: unknown;
+    }
+  | {
+      block: Block.inverseSwitchingBlockON;
+      switchId?: string;
+      objectId?: unknown;
+    }
   | {
       block: Block.switchPressed;
       switchId?: string;
@@ -145,6 +155,7 @@ export class Grid {
             vspriteRow.push({ sprite, block: dblock, dy: 0, vy: 0 });
             break;
           }
+          case Block.inverseSwitchingBlockOFF:
           case Block.switchingBlockOFF: {
             const switchId = (
               get(cx.state).cells[y][x] as {
@@ -173,6 +184,7 @@ export class Grid {
             vspriteRow.push({ sprite, block: dblock, dy: 0, vy: 0 });
             break;
           }
+          case Block.inverseSwitchingBlockON:
           case Block.switchingBlockON:
           case Block.switchPressed:
             throw new Error(`createCellsFromStageDefinition: block is not supported: ${dblock}`);
@@ -437,50 +449,60 @@ export class Grid {
       });
     }
     // switchingBlockOFFがONに切り替わるとき
-    else if (vprev?.block === Block.switchingBlockOFF) {
-      if (cNewCell.block !== Block.switchingBlockON) {
+    else if (vprev?.block === Block.switchingBlockOFF || vprev?.block === Block.inverseSwitchingBlockOFF) {
+      if (cNewCell.block !== Block.switchingBlockON && cNewCell.block !== Block.inverseSwitchingBlockON) {
         console.warn("No block other than switchingBlockON cannot replace the switchingBlockOFF");
         return;
       }
       assert(
-        cprev.block === Block.switchingBlockOFF || cprev.block === Block.switchingBlockON,
+        cprev.block === Block.switchingBlockOFF ||
+          cprev.block === Block.switchingBlockON ||
+          cprev.block === Block.inverseSwitchingBlockOFF ||
+          cprev.block === Block.inverseSwitchingBlockON,
         "block is not switchingBlock",
       );
+      const inversed = vprev.block === Block.inverseSwitchingBlockOFF;
+      const switchONBlock = inversed ? Block.inverseSwitchingBlockON : Block.switchingBlockON;
       const switchId = cprev.switchId;
       if (!switchId) throw new Error("switchId is undefined");
-      const blockSprite = createSprite(blockSize, Block.switchingBlockON, x, y, marginY, switchColor(switchId));
+      const blockSprite = createSprite(blockSize, switchONBlock, x, y, marginY, switchColor(switchId));
       stage.addChild(blockSprite);
       cells[y][x] = {
-        block: Block.switchingBlockON,
+        block: switchONBlock,
         switchId,
         objectId: undefined,
       };
       vprev.sprite = blockSprite;
-      vprev.block = Block.switchingBlockON;
+      vprev.block = switchONBlock;
       vprev.dy = 0;
       vprev.vy = 0;
     }
     // switchingBlockONがOFFに切り替わるとき
-    else if (vprev?.block === Block.switchingBlockON) {
-      if (cNewCell.block !== Block.switchingBlockOFF) {
+    else if (vprev?.block === Block.switchingBlockON || vprev?.block === Block.inverseSwitchingBlockON) {
+      if (cNewCell.block !== Block.switchingBlockOFF && cNewCell.block !== Block.inverseSwitchingBlockOFF) {
         console.warn("No block other than switchingBlockOFF cannot replace the switchingBlockON");
         return;
       }
       assert(
-        cprev.block === Block.switchingBlockOFF || cprev.block === Block.switchingBlockON,
+        cprev.block === Block.switchingBlockOFF ||
+          cprev.block === Block.switchingBlockON ||
+          cprev.block === Block.inverseSwitchingBlockOFF ||
+          cprev.block === Block.inverseSwitchingBlockON,
         "block is not switchingBlock",
       );
+      const inversed = vprev.block === Block.inverseSwitchingBlockON;
+      const switchOFFBlock = inversed ? Block.inverseSwitchingBlockOFF : Block.switchingBlockOFF;
       const switchId = cprev.switchId;
       if (!switchId) throw new Error("switchId is undefined");
-      const blockSprite = createSprite(blockSize, Block.switchingBlockOFF, x, y, marginY, switchColor(switchId));
+      const blockSprite = createSprite(blockSize, switchOFFBlock, x, y, marginY, switchColor(switchId));
       stage.addChild(blockSprite);
       cells[y][x] = {
-        block: Block.switchingBlockOFF,
+        block: switchOFFBlock,
         switchId,
         objectId: undefined,
       };
       vprev.sprite = blockSprite;
-      vprev.block = Block.switchingBlockOFF;
+      vprev.block = switchOFFBlock;
       vprev.dy = 0;
       vprev.vy = 0;
     } else {
@@ -654,6 +676,8 @@ export function createCellsFromStageDefinition(stageDefinition: StageDefinition)
         }
         // switches
         case Block.switch:
+        case Block.inverseSwitchingBlockON:
+        case Block.inverseSwitchingBlockOFF:
         case Block.switchingBlockON:
         case Block.switchingBlockOFF: {
           const group = stageDefinition.switchGroups.find((b) => b.x === x && b.y === y);
@@ -726,13 +750,15 @@ function createSprite(
       updateSprite(switchBaseSprite, blockSize, x, y, marginY, 0);
       return switchBaseSprite;
     }
+    case Block.inverseSwitchingBlockON:
     case Block.switchingBlockOFF: {
       const sprite = new Sprite(rockTexture);
       if (switchColor) sprite.tint = switchColor;
       else sprite.tint = 0xffa500;
       updateSprite(sprite, blockSize, x, y, marginY, 0);
       return sprite;
     }
+    case Block.inverseSwitchingBlockOFF:
     case Block.switchingBlockON: {
       const sprite = new Sprite(rockTexture);
       if (switchColor) sprite.tint = switchColor;
@@ -804,9 +830,11 @@ export function printCells(cells: GridCell[][], context?: string) {
                case Block.switchBase:
                  return "S";
                case Block.switchingBlockOFF:
-                 return "w";
                case Block.switchingBlockON:
                  return "w";
+               case Block.inverseSwitchingBlockOFF:
+               case Block.inverseSwitchingBlockON:
+                 return "W";
                case Block.switchPressed:
                  return "s";
                case Block.goal:

src/player.ts

@@ -154,6 +154,7 @@ export function tick(cx: Context, ticker: Ticker) {
     cx.grid.getBlock(cx, Math.floor(x), Math.floor(y)) !== Block.switch &&
     cx.grid.getBlock(cx, Math.floor(x), Math.floor(y)) !== 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.inverseSwitchingBlockOFF &&
     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) =>
@@ -262,13 +263,19 @@ export function tick(cx: Context, ticker: Ticker) {
         if (cx.grid.getBlock(cx, sb.x, sb.y) === Block.switchingBlockOFF) {
           cx.grid.setBlock(cx, sb.x, sb.y, { block: Block.switchingBlockON });
         }
+        if (cx.grid.getBlock(cx, sb.x, sb.y) === Block.inverseSwitchingBlockOFF) {
+          cx.grid.setBlock(cx, sb.x, sb.y, { block: Block.inverseSwitchingBlockON });
+        }
       }
     } else {
       // スイッチが押されていないとき
       for (const sb of switchingBlock) {
         if (cx.grid.getBlock(cx, sb.x, sb.y) === Block.switchingBlockON) {
           cx.grid.setBlock(cx, sb.x, sb.y, { block: Block.switchingBlockOFF });
         }
+        if (cx.grid.getBlock(cx, sb.x, sb.y) === Block.inverseSwitchingBlockON) {
+          cx.grid.setBlock(cx, sb.x, sb.y, { block: Block.inverseSwitchingBlockOFF });
+        }
       }
     }
   }

src/stages.ts

@@ -449,7 +449,7 @@ export const stages = new Map<string, StageDefinition>([
         ".........b........",
         ".........b........",
         ".........w........",
-        ".sss..f..w.....g..",
+        ".sss..fW.w..W..g..",
         "bSSSbbbbbbbbbbbbbb",
       ],
       initialPlayerX: 3,
@@ -481,6 +481,16 @@ export const stages = new Map<string, StageDefinition>([
           y: 4,
           switchId: "1",
         },
+        {
+          x: 7,
+          y: 4,
+          switchId: "1",
+        },
+        {
+          x: 12,
+          y: 4,
+          switchId: "1",
+        },
       ],
     },
   ],