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

Restore the splash when pushing a block into water; fix splash/explosion in TW tileset

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2020-09-14 21:52:27 -06:00
parent dee2970ad3
commit 48e03f3225
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/main.js
View File

@ -791,6 +791,10 @@ const EDITOR_PALETTE = [{
'button_blue', 'button_blue',
'button_red', 'cloner', 'button_red', 'cloner',
'button_brown', 'trap', 'button_brown', 'trap',
'teleport_blue',
'teleport_red',
'teleport_green',
'teleport_yellow',
], ],
}]; }];
class Editor extends PrimaryView { class Editor extends PrimaryView {

5
js/tileset.js
View File

@ -385,11 +385,12 @@ export const TILE_WORLD_TILESET_LAYOUT = {
thinwall_se: [3, 0], thinwall_se: [3, 0],
cloner: [3, 1], cloner: [3, 1],
force_floor_all: [3, 2], force_floor_all: [3, 2],
splash: [3, 3],
player_drowned: [3, 3], player_drowned: [3, 3],
player_burned: [3, 4], player_burned: [3, 4],
player_bombed: [3, 5], player_bombed: [3, 5],
explosion_bomb: [3, 6], explosion: [3, 6],
explosion_other: [3, 7], explosion_other: [3, 7], // TODO ???
// 3, 8 unused // 3, 8 unused
player_exiting: [3, 9], player_exiting: [3, 9],
// 3, 10 and 11 are "exit_extra_{1,2}" // 3, 10 and 11 are "exit_extra_{1,2}"

2
js/tiletypes.js
View File

@ -306,7 +306,7 @@ const TILE_TYPES = {
on_arrive(me, level, other) { on_arrive(me, level, other) {
// TODO cc1 allows items under water, i think; water was on the upper layer // TODO cc1 allows items under water, i think; water was on the upper layer
if (other.type.name === 'dirt_block' || other.type.name === 'clone_block') { if (other.type.name === 'dirt_block' || other.type.name === 'clone_block') {
level.remove_tile(other); level.transmute_tile(other, 'splash');
level.transmute_tile(me, 'dirt'); level.transmute_tile(me, 'dirt');
} }
else if (other.type.name === 'ice_block') { else if (other.type.name === 'ice_block') {