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

Show the entire blast radius of dynamite

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2024-04-12 01:08:16 -06:00
parent f7b8d3c7bc
commit 52bc2bdf8e
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/tiletypes.js
View File

@ -344,8 +344,8 @@ const TILE_TYPES = {
} }
}, },
on_depart(me, level, other) { on_depart(me, level, other) {
// Inexplicable CC2 quirk: nothing happens if there's dynamite on us // CC2 quirk: nothing happens if there's still an actor on us (i.e. dynamite)
// TODO compat? this makes no sense to me // FIXME does this imply on_depart isn't called at all if we walk off dynamite?
if (me.cell.has('dynamite_lit')) if (me.cell.has('dynamite_lit'))
return; return;
@ -866,8 +866,7 @@ const TILE_TYPES = {
layer: LAYERS.terrain, layer: LAYERS.terrain,
blocks_collision: COLLISION.ghost | COLLISION.fireball, blocks_collision: COLLISION.ghost | COLLISION.fireball,
on_depart(me, level, other) { on_depart(me, level, other) {
// Inexplicable CC2 quirk: nothing happens if there's dynamite on us // CC2 quirk: nothing happens if there's still an actor on us (i.e. dynamite)
// TODO compat? this makes no sense to me
if (me.cell.has('dynamite_lit')) if (me.cell.has('dynamite_lit'))
return; return;
@ -2851,13 +2850,15 @@ const TILE_TYPES = {
} }
} }
if (removed_anything || actor) {
if (actor) { if (actor) {
level.kill_actor(actor, me, 'explosion'); level.kill_actor(actor, me, 'explosion');
} }
else { else if (removed_anything && ! cell.get_actor()) {
level.spawn_animation(cell, cell.get_actor() ? 'explosion_nb' : 'explosion'); level.spawn_animation(cell, 'explosion');
} }
else {
// Extension: Show the entire blast radius every time
level.spawn_animation(cell, 'explosion_nb');
} }
} }
} }