Allow bombing empty squares (fix #61)

jcreedcmu · Nov 21, 2023 · 6b842e7 · 6b842e7
1 parent 500c40d
commit 6b842e7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 27 deletions.
diff --git a/src/core/reduce.ts b/src/core/reduce.ts
@@ -192,12 +192,7 @@ function getIntentOfMouseDown(tool: Tool, wp: WidgetPoint, button: number, mods:
         return { t: 'vacuous' };
       }
     case 'bomb':
-      if (hoverTile || hoverBlock) {
-        return bombIntent;
-      }
-      else {
-        return { t: 'vacuous' };
-      }
+      return bombIntent;
   }
 }
 

diff --git a/src/core/state-helpers.ts b/src/core/state-helpers.ts
@@ -93,30 +93,25 @@ function killTileOfState(state: GameState, wp: DragWidgetPoint, radius: number,
         return getOverlayLayer(state.coreState.bonusOverlay, getBonusLayer(), p) == 'block';
       }
 
-      if (tileAt(p_in_world_int) || blockAt(p_in_world_int)) {
-        const tilesToDestroy: Point[] = splashDamage(p_in_world_int, radius);
-        // remove all tiles in radius
+      const tilesToDestroy: Point[] = splashDamage(p_in_world_int, radius);
+      // remove all tiles in radius
+      tilesToDestroy.forEach(p => {
+        const tileAtP = tileAt(p);
+        if (tileAtP !== undefined)
+          state = removeTile(state, tileAtP.id);
+      });
+      // remove all blocks in radius
+      state = produce(state, s => {
         tilesToDestroy.forEach(p => {
-          const tileAtP = tileAt(p);
-          if (tileAtP !== undefined)
-            state = removeTile(state, tileAtP.id);
-        });
-        // remove all bonuses in radius
-        state = produce(state, s => {
-          tilesToDestroy.forEach(p => {
-            if (blockAt(p))
-              setOverlay(s.coreState.bonusOverlay, p, 'empty');
-          });
+          if (blockAt(p))
+            setOverlay(s.coreState.bonusOverlay, p, 'empty');
         });
+      });
 
-        return checkValid(produce(state, s => {
-          s.coreState.score -= cost;
-          s.coreState.animations.push(anim);
-        }));
-      }
-      else {
-        return state;
-      }
+      return checkValid(produce(state, s => {
+        s.coreState.score -= cost;
+        s.coreState.animations.push(anim);
+      }));
     }
     case 'hand': {
       const p_in_hand_int = vint(wp.p_in_local);