Restore the splash when pushing a block into water; fix splash/explosion in TW tileset
This commit is contained in:
parent
dee2970ad3
commit
48e03f3225
@ -791,6 +791,10 @@ const EDITOR_PALETTE = [{
|
||||
'button_blue',
|
||||
'button_red', 'cloner',
|
||||
'button_brown', 'trap',
|
||||
'teleport_blue',
|
||||
'teleport_red',
|
||||
'teleport_green',
|
||||
'teleport_yellow',
|
||||
],
|
||||
}];
|
||||
class Editor extends PrimaryView {
|
||||
|
||||
@ -385,11 +385,12 @@ export const TILE_WORLD_TILESET_LAYOUT = {
|
||||
thinwall_se: [3, 0],
|
||||
cloner: [3, 1],
|
||||
force_floor_all: [3, 2],
|
||||
splash: [3, 3],
|
||||
player_drowned: [3, 3],
|
||||
player_burned: [3, 4],
|
||||
player_bombed: [3, 5],
|
||||
explosion_bomb: [3, 6],
|
||||
explosion_other: [3, 7],
|
||||
explosion: [3, 6],
|
||||
explosion_other: [3, 7], // TODO ???
|
||||
// 3, 8 unused
|
||||
player_exiting: [3, 9],
|
||||
// 3, 10 and 11 are "exit_extra_{1,2}"
|
||||
|
||||
@ -306,7 +306,7 @@ const TILE_TYPES = {
|
||||
on_arrive(me, level, other) {
|
||||
// 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') {
|
||||
level.remove_tile(other);
|
||||
level.transmute_tile(other, 'splash');
|
||||
level.transmute_tile(me, 'dirt');
|
||||
}
|
||||
else if (other.type.name === 'ice_block') {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user