From 69d62f82665fd9b199815e01b0b8e87464e45b8c Mon Sep 17 00:00:00 2001
From: "Eevee (Evelyn Woods)" <eevee.git@veekun.com>
Date: Sat, 2 Jan 2021 12:19:52 -0700
Subject: [PATCH] Fix collision masks for dynamite and bowling balls

---
 js/defs.js      |  1 +
 js/tiletypes.js | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/js/defs.js b/js/defs.js
index 4aa20e6..4226bf6 100644
--- a/js/defs.js
+++ b/js/defs.js
@@ -82,6 +82,7 @@ export const COLLISION = {
 
     block_cc1:          0x0010,
     block_cc2:          0x0020,  // ice + frame (+ circuit, etc)
+    dropped_item:       0x0040,  // rolling ball, dynamite
 
     // Monsters are a little complicated, because some of them have special rules, e.g. fireballs
     // aren't blocked by fire.
diff --git a/js/tiletypes.js b/js/tiletypes.js
index 59233a0..2a5a4e4 100644
--- a/js/tiletypes.js
+++ b/js/tiletypes.js
@@ -2207,8 +2207,7 @@ const TILE_TYPES = {
         draw_layer: DRAW_LAYERS.item,
         is_actor: true,
         is_monster: true,
-        // FIXME ???????
-        collision_mask: COLLISION.block_cc2,
+        collision_mask: COLLISION.dropped_item,
         blocks_collision: COLLISION.all_but_real_player,
         // FIXME inherits a copy of player's inventory!
         // FIXME holds down buttons, so needs an on_arrive
@@ -2301,11 +2300,10 @@ const TILE_TYPES = {
     rolling_ball: {
         draw_layer: DRAW_LAYERS.actor,
         is_actor: true,
+        is_monster: true,
         has_inventory: true,
         can_reveal_walls: true,
-        // FIXME ???????
-        // FIXME we need to hit the player also
-        collision_mask: COLLISION.block_cc2,
+        collision_mask: COLLISION.dropped_item,
         // FIXME do i start moving immediately when dropped, or next turn?
         movement_speed: 4,
         decide_movement(me, level) {
@@ -2328,6 +2326,9 @@ const TILE_TYPES = {
         },
         on_blocked(me, level, direction) {
             // Blow up anything we run into
+            // FIXME if we hit a wall, we should definitely /not/ blow up an actor...  but that's
+            // tricky because on_blocked doesn't tell us what we hit, and on_bump goes top to bottom
+            // so it hits actors before walls...
             let cell = level.get_neighboring_cell(me.cell, direction);
             let other;
             if (cell) {
@@ -2700,7 +2701,7 @@ const TILE_TYPES = {
         draw_layer: DRAW_LAYERS.actor,
         is_actor: true,
         collision_mask: 0,
-        ttl: 4 * 3,
+        ttl: 6 * 3,
     },
 
     // Invalid tiles that appear in some CCL levels because community level