leif/lexys-labyrinth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the order of operations for slide mode, again

Browse Source 
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.
This commit is contained in:
Eevee (Evelyn Woods) 2021-01-02 23:47:49 -07:00
parent b08750696e
commit 6446a4654b
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/game.js
View File

@ -1514,7 +1514,9 @@ export class Level extends LevelInterface {
this.sfx.play_once('step-floor'); 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)) { for (let tile of Array.from(actor.cell)) {
if (tile === actor) if (tile === actor)
continue; continue;
@ -1540,6 +1542,9 @@ export class Level extends LevelInterface {
if (tile.type.on_approach) { if (tile.type.on_approach) {
tile.type.on_approach(tile, this, actor); 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 // 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 every tile in a cell we just arrived in
step_on_cell(actor, cell) { 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 // 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()) { for (let tile of Array.from(cell).reverse()) {
if (tile === actor) if (tile === actor)
@ -1594,9 +1596,6 @@ export class Level extends LevelInterface {
else if (tile.type.on_arrive) { else if (tile.type.on_arrive) {
tile.type.on_arrive(tile, this, actor); 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); actor.toolbelt.push(name);
this._push_pending_undo(() => actor.toolbelt.pop()); 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; return true;
} }