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

Fix bowling balls to start rolling immediately

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2020-12-19 19:25:14 -07:00
parent 296d1a356b
commit a413d1afc2
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/game.js
View File

@ -812,10 +812,6 @@ export class Level extends LevelInterface {
let old_cell = actor.cell; let old_cell = actor.cell;
let success = this.attempt_step(actor, actor.decision); let success = this.attempt_step(actor, actor.decision);
if (! success && actor.type.on_blocked) {
actor.type.on_blocked(actor, this, actor.decision);
}
if (! success && actor.slide_mode === 'ice') { if (! success && actor.slide_mode === 'ice') {
this._handle_slide_bonk(actor); this._handle_slide_bonk(actor);
success = this.attempt_step(actor, actor.decision); success = this.attempt_step(actor, actor.decision);
@ -1220,18 +1216,15 @@ export class Level extends LevelInterface {
let double_speed = false; let double_speed = false;
let move = DIRECTIONS[direction].movement; let move = DIRECTIONS[direction].movement;
let goal_cell = this.get_neighboring_cell(actor.cell, direction); if (! this.check_movement(actor, actor.cell, direction, 'push')) {
if (! goal_cell) if (actor.type.on_blocked) {
return false; actor.type.on_blocked(actor, this, direction);
}
// Only bother touching the goal cell if we're not already trapped in this one
if (! actor.cell.try_leaving(actor, direction))
return false;
if (! goal_cell.try_entering(actor, direction, this, 'push'))
return false; return false;
}
// FIXME this feels clunky // FIXME this feels clunky
let goal_cell = this.get_neighboring_cell(actor.cell, direction);
let terrain = goal_cell.get_terrain(); let terrain = goal_cell.get_terrain();
if (terrain && terrain.type.slide_mode && ! actor.ignores(terrain.type.name)) { if (terrain && terrain.type.slide_mode && ! actor.ignores(terrain.type.name)) {
double_speed = true; double_speed = true;
@ -1543,11 +1536,11 @@ export class Level extends LevelInterface {
} }
} }
let tile = new Tile(type); let tile = new Tile(type);
if (type.is_actor) {
tile.direction = actor.direction;
this.add_actor(tile);
}
this.add_tile(tile, actor.cell); this.add_tile(tile, actor.cell);
if (type.is_actor) {
this.add_actor(tile);
this.attempt_out_of_turn_step(tile, actor.direction);
}
} }
actor.toolbelt.shift(); actor.toolbelt.shift();