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

Finally fix pushing a sliding block

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2020-09-20 01:05:24 -06:00
parent c8a24d0e4b
commit 2dc18a98db
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/game.js
View File

@ -365,6 +365,10 @@ export class Level {
if (! actor.cell) if (! actor.cell)
continue; continue;
// Clear any old decisions ASAP. Note that this prop is only used internally within a
// single tic, so it doesn't need to be undoable
actor.decision = null;
// Decrement the cooldown here, but don't check it quite yet, // Decrement the cooldown here, but don't check it quite yet,
// because stepping on cells in the next block might reset it // because stepping on cells in the next block might reset it
if (actor.movement_cooldown > 0) { if (actor.movement_cooldown > 0) {
@ -395,10 +399,6 @@ export class Level {
// Second pass: actors decide their upcoming movement simultaneously // Second pass: actors decide their upcoming movement simultaneously
for (let actor of this.actors) { for (let actor of this.actors) {
// Note that this prop is only used internally within a single iteration of this loop,
// so it doesn't need to be undoable
actor.decision = null;
if (! actor.cell) if (! actor.cell)
continue; continue;
@ -558,7 +558,6 @@ export class Level {
if (! actor.decision) if (! actor.decision)
continue; continue;
this.set_actor_direction(actor, actor.decision);
let old_cell = actor.cell; let old_cell = actor.cell;
this.attempt_step(actor, actor.decision); this.attempt_step(actor, actor.decision);
@ -576,7 +575,6 @@ export class Level {
} }
if (could_push && actor.can_push(tile)) { if (could_push && actor.can_push(tile)) {
// Block slapping: you can shove a block by walking past it sideways // Block slapping: you can shove a block by walking past it sideways
this.set_actor_direction(tile, dir2);
this.attempt_step(tile, dir2); this.attempt_step(tile, dir2);
} }
} }
@ -627,6 +625,12 @@ export class Level {
// Try to move the given actor one tile in the given direction and update // Try to move the given actor one tile in the given direction and update
// their cooldown. Return true if successful. // their cooldown. Return true if successful.
attempt_step(actor, direction) { attempt_step(actor, direction) {
// In mid-movement, we can't even change direction!
if (actor.movement_cooldown > 0)
return false;
this.set_actor_direction(actor, direction);
if (actor.stuck) if (actor.stuck)
return false; return false;
@ -692,7 +696,6 @@ export class Level {
// This time make a copy, since we're modifying the contents of the cell // This time make a copy, since we're modifying the contents of the cell
for (let tile of Array.from(goal_cell)) { for (let tile of Array.from(goal_cell)) {
if (actor.can_push(tile)) { if (actor.can_push(tile)) {
this.set_actor_direction(tile, direction);
this.attempt_step(tile, direction); this.attempt_step(tile, direction);
} }
} }

1
js/tiletypes.js
View File

@ -720,7 +720,6 @@ const TILE_TYPES = {
for (let actor of level.actors) { for (let actor of level.actors) {
// TODO generify somehow?? // TODO generify somehow??
if (actor.type.name === 'tank_yellow') { if (actor.type.name === 'tank_yellow') {
level.set_actor_direction(actor, other.direction);
level.attempt_step(actor, other.direction); level.attempt_step(actor, other.direction);
} }
} }