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

Don't use "ignores" to override blocking; it breaks ice corners

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2020-09-19 22:53:38 -06:00
parent 16f87bf6e0
commit 582a875c52
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/game.js
View File

@ -138,7 +138,6 @@ export class Cell extends Array {
blocks_entering(actor, direction, level, ignore_pushables = false) { blocks_entering(actor, direction, level, ignore_pushables = false) {
for (let tile of this) { for (let tile of this) {
if (tile.blocks(actor, direction, level) && if (tile.blocks(actor, direction, level) &&
! actor.ignores(tile.type.name) &&
! (ignore_pushables && actor.can_push(tile))) ! (ignore_pushables && actor.can_push(tile)))
{ {
return true; return true;
@ -660,6 +659,16 @@ export class Level {
let has_slide_tile = false; let has_slide_tile = false;
let blocked_by_pushable = false; let blocked_by_pushable = false;
for (let tile of goal_cell) { for (let tile of goal_cell) {
if (tile.blocks(actor, direction, this)) {
if (actor.can_push(tile)) {
blocked_by_pushable = true;
}
else {
blocked = true;
// Don't break here, because we might still want to bump other tiles
}
}
if (actor.ignores(tile.type.name)) if (actor.ignores(tile.type.name))
continue; continue;
@ -672,16 +681,6 @@ export class Level {
if (tile.type.on_bump) { if (tile.type.on_bump) {
tile.type.on_bump(tile, this, actor); tile.type.on_bump(tile, this, actor);
} }
if (tile.blocks(actor, direction, this)) {
if (actor.can_push(tile)) {
blocked_by_pushable = true;
}
else {
blocked = true;
break;
}
}
} }
if (has_slide_tile) { if (has_slide_tile) {

2
js/tiletypes.js
View File

@ -939,7 +939,6 @@ const TILE_TYPES = {
blocks_blocks: true, blocks_blocks: true,
movement_mode: 'turn-right', movement_mode: 'turn-right',
movement_speed: 4, movement_speed: 4,
ignores: new Set(['wall']),
// TODO ignores /most/ walls. collision is basically completely different. has a regular inventory, except red key. good grief // TODO ignores /most/ walls. collision is basically completely different. has a regular inventory, except red key. good grief
}, },
floor_mimic: { floor_mimic: {
@ -1079,6 +1078,7 @@ const TILE_TYPES = {
is_tool: true, is_tool: true,
blocks_monsters: true, blocks_monsters: true,
blocks_blocks: true, blocks_blocks: true,
// FIXME this doesn't work any more, need to put it in railroad blocks impl
item_ignores: new Set(['railroad']), item_ignores: new Set(['railroad']),
}, },
foil: { foil: {