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

Prevent pushing a block that's already moving due to a slide push

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2020-12-29 12:30:08 -07:00
parent c475500bdb
commit 6b0bb9cb3d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/game.js
View File

@ -94,6 +94,10 @@ export class Tile {
} }
can_push(tile, direction) { can_push(tile, direction) {
// This tile already has a push queued, sorry
if (tile.pending_push)
return false;
if (! (this.type.pushes && this.type.pushes[tile.type.name] && if (! (this.type.pushes && this.type.pushes[tile.type.name] &&
(! tile.type.allows_push || tile.type.allows_push(tile, direction)))) (! tile.type.allows_push || tile.type.allows_push(tile, direction))))
{ {
@ -906,10 +910,10 @@ export class Level extends LevelInterface {
if (! direction) if (! direction)
return true; return true;
// Clear this again here due to a perverse CC2 ordering issue: a player with a hook sets // Clear this here since we use it to prevent pushing a block that's already been pushed.
// this on a block at decision time, and then the block makes its decision (based on this), // Also avoids a perverse CC2 ordering issue: a player with a hook sets this on a block at
// but then the player acts and sets this /again/ so it carries over and the block tries to // decision time; the block makes its decision (based on this); but then the player acts and
// move an extra time next turn. // sets this /again/ so it carries over and the block tries to move an extra time next turn.
if (actor.pending_push) { if (actor.pending_push) {
this._set_tile_prop(actor, 'pending_push', null); this._set_tile_prop(actor, 'pending_push', null);
} }
@ -1261,8 +1265,8 @@ export class Level extends LevelInterface {
if (actor.pending_push) { if (actor.pending_push) {
// Blocks that were pushed while sliding will move in the push direction as soon as // Blocks that were pushed while sliding will move in the push direction as soon as
// they stop sliding, regardless of what they landed on. Also used for hooking. // they stop sliding, regardless of what they landed on. Also used for hooking.
// This isn't cleared until the block makes another move; see _do_actor_movement.
actor.decision = actor.pending_push; actor.decision = actor.pending_push;
this._set_tile_prop(actor, 'pending_push', null);
return; return;
} }