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

Fix block behavior, again

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2020-09-23 22:41:07 -06:00
parent 958a2768d7
commit 5e70df77a6
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
js/game.js
View File

@ -7,8 +7,10 @@ export class Tile {
this.direction = direction; this.direction = direction;
this.cell = null; this.cell = null;
if (type.is_actor) {
this.slide_mode = null; this.slide_mode = null;
this.movement_cooldown = 0; this.movement_cooldown = 0;
}
if (type.has_inventory) { if (type.has_inventory) {
this.keyring = {}; this.keyring = {};
@ -392,13 +394,17 @@ export class Level {
this._set_prop(actor, 'animation_progress', null); this._set_prop(actor, 'animation_progress', null);
this._set_prop(actor, 'animation_speed', null); this._set_prop(actor, 'animation_speed', null);
if (! this.compat.tiles_react_instantly) { if (! this.compat.tiles_react_instantly) {
cell_steppers.push(actor); // We need to track the actor AND the cell explicitly, because it's possible
// that one actor's step will cause another actor to start another move, and
// then they'd end up stepping on the new cell they're moving to instead of
// the one they just landed on!
cell_steppers.push([actor, actor.cell]);
} }
} }
} }
} }
for (let actor of cell_steppers) { for (let [actor, cell] of cell_steppers) {
this.step_on_cell(actor); this.step_on_cell(actor, cell);
} }
// Only reset the player's is_pushing between movement, so it lasts for the whole push // Only reset the player's is_pushing between movement, so it lasts for the whole push
@ -564,6 +570,11 @@ export class Level {
if (! actor.cell) if (! actor.cell)
continue; continue;
// Check this again, because one actor's movement might caused a later actor to move
// (e.g. by pressing a red or brown button)
if (actor.movement_cooldown > 0)
continue;
if (! actor.decision) if (! actor.decision)
continue; continue;
@ -813,14 +824,14 @@ export class Level {
} }
if (this.compat.tiles_react_instantly) { if (this.compat.tiles_react_instantly) {
this.step_on_cell(actor); this.step_on_cell(actor, actor.cell);
} }
} }
// 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) { step_on_cell(actor, cell) {
let teleporter; let teleporter;
for (let tile of Array.from(actor.cell)) { for (let tile of Array.from(cell)) {
if (tile === actor) if (tile === actor)
continue; continue;
if (actor.ignores(tile.type.name)) if (actor.ignores(tile.type.name))