Correctly do destructibility by tool

jcreedcmu · Feb 7, 2024 · b6e3d8c · b6e3d8c
1 parent a29ac9f
commit b6e3d8c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/core/intent.ts b/src/core/intent.ts
@@ -2,6 +2,7 @@ import { WidgetPoint } from '../ui/widget-helpers';
 import { produce } from '../util/produce';
 import { Point } from '../util/types';
 import { vint, vm } from '../util/vutil';
+import { Bonus } from './bonus';
 import { tryKillTileOfState } from './kill-helpers';
 import { vacuous_down } from './low-actions';
 import { SelectionOperation, deselect, selectionOperationOfMods } from './selection';
@@ -27,7 +28,18 @@ export type Intent =
   ;
 
 function dynamiteableCell(cell: CellContents): boolean {
-  return cell.t == 'tile' || (cell.t == 'bonus' && (cell.bonus.t != 'empty'));
+  return cell.t == 'tile' || (cell.t == 'bonus' && killableBonus(dynamiteIntent, cell.bonus));
+}
+
+export function killableBonus(intent: KillIntent, bonus: Bonus): boolean {
+  switch (intent.t) {
+    case 'fillWater':
+      return !(bonus.t == 'required' || bonus.t == 'empty');
+    case 'kill':
+    case 'bomb':
+      return !(bonus.t == 'block' || bonus.t == 'required' || bonus.t == 'empty');
+  }
+
 }
 
 export function getIntentOfMouseDown(tool: Tool, wp: WidgetPoint, button: number, mods: Set<string>, hoverCell: CellContents, pinned: boolean): Intent {

diff --git a/src/core/kill-helpers.ts b/src/core/kill-helpers.ts
@@ -4,7 +4,7 @@ import { Point } from "../util/types";
 import { vequal, vint } from "../util/vutil";
 import { Animation, mkExplosionAnimation } from './animations';
 import { getBonusFromLayer, updateBonusLayer } from "./bonus-helpers";
-import { KillIntent } from './intent';
+import { KillIntent, killableBonus } from './intent';
 import { getScore, incrementScore } from "./scoring";
 import { deselect } from "./selection";
 import { CoreState, MainTile } from "./state";
@@ -62,10 +62,6 @@ function killTileOfState(state: CoreState, wp: DragWidgetPoint, intent: KillInte
       function tileAt(p: Point): MainTile | undefined {
         return get_main_tiles(state).find(tile => vequal(tile.loc.p_in_world_int, p));
       }
-      function killableBonusAt(p: Point) {
-        // FIXME: any unbombable ones? Maybe 'water', in the future?
-        return getBonusFromLayer(state, p).t != 'empty';
-      }
 
       const tilesToDestroy: Point[] = splashDamage(p_in_world_int, radius);
       // remove all tiles in radius
@@ -76,7 +72,7 @@ function killTileOfState(state: CoreState, wp: DragWidgetPoint, intent: KillInte
       });
       // remove all killable bonuses in radius
       tilesToDestroy.forEach(p => {
-        if (killableBonusAt(p)) {
+        if (killableBonus(intent, getBonusFromLayer(state, p))) {
           state = updateBonusLayer(state, p, { t: 'empty' });
         }
       });