fallableを追加 (#7)

* fallableを追加

* highlight周りのtick関数を名前変更&移動

* Revert "highlight周りのtick関数を名前変更&移動"

This reverts commit 9f8c188.

* grid.tick()とfallableの落下処理を実装

* pasteやredo時にdyをリセット

* switchWithObjectを削除し、movableとfallableにswitchIdを追加

* tick()とctrl+Z時の動作をfallable+スイッチに対応

* fallableの速度が保存されていなかった

Author: na-trium-144

public/assets/woodenbox.png

@@ -11,3 +11,8 @@
 <a href="/game?stage=6">Stage 6</a>
 <a href="/game?stage=7">Stage 7</a>
 <a href="/game?stage=8">Stage 8</a>
+
+<p>
+<a href="/game?stage=3-1">Stage 3-1</a>
+<a href="/game?stage=3-2">Stage 3-2</a>
+</p>

routes/+page.svelte

@@ -65,7 +65,8 @@ 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.fallable))
+    return;
   const movableObject = cx.grid.getMovableObject(cx, x, y);
   if (!movableObject) return;
 
@@ -128,10 +129,7 @@ export function cut(cx: Context) {
   const y = focus.y;
   const target = cx.grid.getBlock(cx, x, y);
   // removable 以外はカットできない
-  if (
-    !target ||
-    (target !== Block.movable && target !== Block.switchWithObject)
-  )
+  if (!target || (target !== Block.movable && target !== Block.fallable))
     return;
   const movableObject = cx.grid.getMovableObject(cx, x, y);
   if (!movableObject) return;
@@ -144,7 +142,10 @@ export function cut(cx: Context) {
   });
   cx.grid.update(cx, (prev) => {
     if (prev.objectId !== movableObject.objectId) return prev;
-    if (prev.block === Block.switchWithObject)
+    if (
+      (prev.block === Block.movable || prev.block === Block.fallable) &&
+      prev.switchId !== undefined
+    )
       return { block: Block.switch, switchId: prev.switchId };
     return { block: Block.air };
   });
@@ -176,6 +177,7 @@ export function placeMovableObject(
     grid.setBlock(cx, positionX, positionY, {
       block: object.block,
       objectId: object.objectId,
+      switchId: undefined,
     });
   }
 }

src/ability.ts

@@ -10,9 +10,9 @@ export enum Block {
   air = "air",
   block = "block",
   movable = "movable",
+  fallable = "fallable",
   switch = "switch",
   switchBase = "switch-base",
-  switchWithObject = "switch-with-object",
   switchingBlockOFF = "switching-block-off",
   switchingBlockON = "switching-block-on",
   switchPressed = "switch-pressed",