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

Fix yellow teleport behavior (you pick up even if it itself is not blocked); play pickup sound

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2020-12-03 22:43:24 -07:00
parent caf4906176
commit cb62786470
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/game.js
View File

@ -1167,6 +1167,10 @@ export class Level {
if (teleporter.type.teleport_try_all_directions && dest !== teleporter) { if (teleporter.type.teleport_try_all_directions && dest !== teleporter) {
num_directions = 4; num_directions = 4;
} }
// FIXME bleugh hardcode
if (dest === teleporter && teleporter.type.name === 'teleport_yellow') {
break;
}
for (let i = 0; i < num_directions; i++) { for (let i = 0; i < num_directions; i++) {
if (this.attempt_step(actor, direction)) { if (this.attempt_step(actor, direction)) {
success = true; success = true;
@ -1196,8 +1200,10 @@ export class Level {
if (! success && actor.type.has_inventory && teleporter.type.name === 'teleport_yellow') { if (! success && actor.type.has_inventory && teleporter.type.name === 'teleport_yellow') {
// Super duper special yellow teleporter behavior: you pick it the fuck up // Super duper special yellow teleporter behavior: you pick it the fuck up
// FIXME not if there's only one in the level? // FIXME not if there's only one in the level?
this.give_actor(actor, 'teleport_yellow'); this.attempt_take(actor, teleporter);
this.transmute_tile(teleporter, 'floor'); if (actor === this.player) {
this.sfx.play_once('get-tool', teleporter.cell);
}
} }
} }
} }
@ -1696,7 +1702,13 @@ export class Level {
return false; return false;
if (this.give_actor(actor, tile.type.name)) { if (this.give_actor(actor, tile.type.name)) {
if (tile.type.draw_layer === 0) {
// This should only happen for the yellow teleporter
this.transmute_tile(tile, 'floor');
}
else {
this.remove_tile(tile); this.remove_tile(tile);
}
if (mod && mod.type.item_modifier === 'pickup') { if (mod && mod.type.item_modifier === 'pickup') {
this.remove_tile(mod); this.remove_tile(mod);
} }

1
js/tiletypes.js
View File

@ -1053,7 +1053,6 @@ const TILE_TYPES = {
draw_layer: DRAW_LAYERS.terrain, draw_layer: DRAW_LAYERS.terrain,
teleport_allow_override: true, teleport_allow_override: true,
teleport_dest_order(me, level, other) { teleport_dest_order(me, level, other) {
// FIXME special pickup behavior; NOT an item though, does not combine with no sign
return level.iter_tiles_in_reading_order(me.cell, 'teleport_yellow', true); return level.iter_tiles_in_reading_order(me.cell, 'teleport_yellow', true);
}, },
}, },