From 6446a4654b02f0752394829f521067b469dce35c Mon Sep 17 00:00:00 2001
From: "Eevee (Evelyn Woods)" <eevee.git@veekun.com>
Date: Sat, 2 Jan 2021 23:47:49 -0700
Subject: [PATCH] Fix the order of operations for slide mode, again

This fixes an obscure bug where you could redirect a block that was in
the process of sliding off of ice onto floor, because its slide mode had
not yet been cleared.
---
 js/game.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/js/game.js b/js/game.js
index 07e9793..cd6026a 100644
--- a/js/game.js
+++ b/js/game.js
@@ -1514,7 +1514,9 @@ export class Level extends LevelInterface {
             this.sfx.play_once('step-floor');
         }
 
-        // Announce we're approaching
+        // Announce we're approaching.  Slide mode is set here, since it's about the tile we're
+        // moving towards and needs to last through our next decision
+        this.make_slide(actor, null);
         for (let tile of Array.from(actor.cell)) {
             if (tile === actor)
                 continue;
@@ -1540,6 +1542,9 @@ export class Level extends LevelInterface {
             if (tile.type.on_approach) {
                 tile.type.on_approach(tile, this, actor);
             }
+            if (tile.type.slide_mode) {
+                this.make_slide(actor, tile.type.slide_mode);
+            }
         }
 
         // If we're a monster stepping on the player's tail, that also kills her immediately; the
@@ -1564,9 +1569,6 @@ export class Level extends LevelInterface {
 
     // Step on every tile in a cell we just arrived in
     step_on_cell(actor, cell) {
-        // Also reset slide here, since slide mode is differently important for forced moves
-        this.make_slide(actor, null);
-
         // Step on topmost things first -- notably, it's safe to step on water with flippers on top
         for (let tile of Array.from(cell).reverse()) {
             if (tile === actor)
@@ -1594,9 +1596,6 @@ export class Level extends LevelInterface {
             else if (tile.type.on_arrive) {
                 tile.type.on_arrive(tile, this, actor);
             }
-            if (tile.type.slide_mode) {
-                this.make_slide(actor, tile.type.slide_mode);
-            }
         }
     }
 
@@ -2244,6 +2243,14 @@ export class Level extends LevelInterface {
 
             actor.toolbelt.push(name);
             this._push_pending_undo(() => actor.toolbelt.pop());
+
+            // FIXME hardcodey, but, this doesn't seem to fit anywhere else
+            if (name === 'cleats' && actor.slide_mode === 'ice') {
+                this.make_slide(actor, null);
+            }
+            else if (name === 'suction_boots' && actor.slide_mode === 'force') {
+                this.make_slide(actor, null);
+            }
         }
         return true;
     }