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

Tanks in traps turn around

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2020-10-04 09:52:59 -06:00
parent 5c2fc32546
commit b20e2cac8c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/game.js
View File

@ -430,10 +430,6 @@ export class Level {
if (actor.movement_cooldown > 0) if (actor.movement_cooldown > 0)
continue; continue;
// XXX does the cooldown drop while in a trap? is this even right?
if (actor.stuck && ! actor.type.is_player)
continue;
// Teeth can only move the first 4 of every 8 tics, though "first" // Teeth can only move the first 4 of every 8 tics, though "first"
// can be adjusted // can be adjusted
if (actor.slide_mode == null && if (actor.slide_mode == null &&
@ -491,7 +487,11 @@ export class Level {
this._set_prop(actor, 'pending_reverse', false); this._set_prop(actor, 'pending_reverse', false);
} }
// Tanks are controlled explicitly so they don't check if they're blocked // Tanks are controlled explicitly so they don't check if they're blocked
actor.decision = direction; // TODO tanks in traps turn around, but tanks on cloners do not, and i use the same
// prop for both
if (! actor.cell.some(tile => tile.type.name === 'cloner')) {
actor.decision = direction;
}
continue; continue;
} }
else if (actor.type.movement_mode === 'follow-left') { else if (actor.type.movement_mode === 'follow-left') {
@ -574,7 +574,7 @@ export class Level {
// Check which of those directions we *can*, probably, move in // Check which of those directions we *can*, probably, move in
// TODO i think player on force floor will still have some issues here // TODO i think player on force floor will still have some issues here
if (direction_preference) { if (direction_preference && ! actor.stuck) {
for (let direction of direction_preference) { for (let direction of direction_preference) {
let dest_cell = this.get_neighboring_cell(actor.cell, direction); let dest_cell = this.get_neighboring_cell(actor.cell, direction);
if (! dest_cell) if (! dest_cell)