From 6c99752f3787e8adb6ab30d3fbd5301efb035b27 Mon Sep 17 00:00:00 2001
From: "Eevee (Evelyn Woods)" <eevee.git@veekun.com>
Date: Tue, 29 Dec 2020 09:03:40 -0700
Subject: [PATCH] Allow the hook to block monster movement at decision time

---
 js/game.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/js/game.js b/js/game.js
index a8f5ab2..fb67462 100644
--- a/js/game.js
+++ b/js/game.js
@@ -1282,7 +1282,6 @@ export class Level extends LevelInterface {
         // Check which of those directions we *can*, probably, move in
         if (! direction_preference)
             return;
-        let all_blocked = true;
         for (let [i, direction] of direction_preference.entries()) {
             if (! direction) {
                 // This actor is giving up!  Alas.
@@ -1299,7 +1298,6 @@ export class Level extends LevelInterface {
             if (this.check_movement(actor, actor.cell, direction, 'bump')) {
                 // We found a good direction!  Stop here
                 actor.decision = direction;
-                all_blocked = false;
                 break;
             }
 
@@ -1327,23 +1325,23 @@ export class Level extends LevelInterface {
         // first.  but also, hooking can stop us from moving, but it /does/ still allow us to push.
         // also this all seems to apply exactly the same to monsters, except of course they can't
         // hook slap.  so where the hell does this actually go?
-        if (success && push_mode === 'push' && actor.has_item('hook')) {
+        if (success && actor.has_item('hook')) {
             let behind_cell = this.get_neighboring_cell(orig_cell, DIRECTIONS[direction].opposite);
             if (behind_cell) {
                 let behind_actor = behind_cell.get_actor();
-                if (behind_actor &&
+                // FIXME starting to think fx should not count as actors
+                if (behind_actor && ! behind_actor.type.ttl &&
                     // FIXME i don't actually know the precise rules here.  dirt blocks and ghosts
                     // can pull other blocks even though they can't usually push them.  given the
                     // existence of monster hooking, i suspect /anything/ can be hooked but on
                     // monsters it has a weird effect?  figure this out?
-                    behind_actor.type.is_block &&
                     (! behind_actor.type.allows_push || behind_actor.type.allows_push(behind_actor, direction)))
                 {
                     if (behind_actor.movement_cooldown) {
                         // FIXME this sucks actually, make it not default behavior
                         return false;
                     }
-                    else {
+                    else if (behind_actor.type.is_block && push_mode === 'push') {
                         this._set_tile_prop(behind_actor, 'is_pulled', true);
                         // FIXME i am pretty sure lexy benefits immensely from doing an immediate
                         // move, which also makes it match pushing, but that only works if this