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

Make erasing thin walls undoable; fix ctrl key sometimes not being recognized

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2021-03-14 16:57:41 -06:00
parent 29fb8791e5
commit 9e090f967d
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/main-editor.js
View File

@ -589,6 +589,7 @@ class MouseOperation {
do_press(ev) { do_press(ev) {
this.is_held = true; this.is_held = true;
this._update_modifiers(ev);
this.client_x = ev.clientX; this.client_x = ev.clientX;
this.client_y = ev.clientY; this.client_y = ev.clientY;
@ -607,10 +608,10 @@ class MouseOperation {
} }
do_move(ev) { do_move(ev) {
this._update_modifiers(ev);
let [frac_cell_x, frac_cell_y] = this.editor.renderer.real_cell_coords_from_event(ev); let [frac_cell_x, frac_cell_y] = this.editor.renderer.real_cell_coords_from_event(ev);
let cell_x = Math.floor(frac_cell_x); let cell_x = Math.floor(frac_cell_x);
let cell_y = Math.floor(frac_cell_y); let cell_y = Math.floor(frac_cell_y);
this._update_modifiers(ev);
if (this.is_held && (ev.buttons & MOUSE_BUTTON_MASKS[this.physical_button]) === 0) { if (this.is_held && (ev.buttons & MOUSE_BUTTON_MASKS[this.physical_button]) === 0) {
this.do_abort(); this.do_abort();
@ -842,11 +843,12 @@ class PencilOperation extends MouseOperation {
if (this.ctrl) { if (this.ctrl) {
// Erase // Erase
if (this.shift) { if (this.shift) {
// Wipe the whole cell
let new_cell = this.editor.make_blank_cell(x, y); let new_cell = this.editor.make_blank_cell(x, y);
this.editor.replace_cell(cell, new_cell); this.editor.replace_cell(cell, new_cell);
} }
else if (template) { else if (template) {
// Erase whatever's on the same layer // Erase whatever's on the same layer as the fg tile
this.editor.erase_tile(cell); this.editor.erase_tile(cell);
} }
} }
@ -855,13 +857,13 @@ class PencilOperation extends MouseOperation {
if (! template) if (! template)
return; return;
if (this.shift) { if (this.shift) {
// Aggressive mode: erase whatever's already in the cell // Aggressive mode: replace whatever's already in the cell
let new_cell = this.editor.make_blank_cell(x, y); let new_cell = this.editor.make_blank_cell(x, y);
new_cell[template.type.layer] = {...template}; new_cell[template.type.layer] = {...template};
this.editor.replace_cell(cell, new_cell); this.editor.replace_cell(cell, new_cell);
} }
else { else {
// Default operation: only erase whatever's on the same layer // Default operation: only replace whatever's on the same layer
this.editor.place_in_cell(cell, template); this.editor.place_in_cell(cell, template);
} }
} }
@ -4363,7 +4365,6 @@ export class Editor extends PrimaryView {
return; return;
// Replace whatever's on the same layer // Replace whatever's on the same layer
// TODO should preserve wiring if possible too
let layer = tile.type.layer; let layer = tile.type.layer;
let existing_tile = cell[layer]; let existing_tile = cell[layer];
@ -4412,7 +4413,6 @@ export class Editor extends PrimaryView {
tile = this.fg_tile; tile = this.fg_tile;
} }
this.mark_cell_dirty(cell);
let existing_tile = cell[tile.type.layer]; let existing_tile = cell[tile.type.layer];
// If we find a tile of the same type as the one being drawn, see if it has custom combine // If we find a tile of the same type as the one being drawn, see if it has custom combine
@ -4423,10 +4423,14 @@ export class Editor extends PrimaryView {
SPECIAL_PALETTE_BEHAVIOR[tile.type.name] && SPECIAL_PALETTE_BEHAVIOR[tile.type.name] &&
SPECIAL_PALETTE_BEHAVIOR[tile.type.name].combine_erase) SPECIAL_PALETTE_BEHAVIOR[tile.type.name].combine_erase)
{ {
let remove = SPECIAL_PALETTE_BEHAVIOR[tile.type.name].combine_erase(tile, existing_tile); let old_tile = {...existing_tile};
if (! remove) let new_tile = existing_tile;
let remove = SPECIAL_PALETTE_BEHAVIOR[tile.type.name].combine_erase(tile, new_tile);
if (! remove) {
this._assign_tile(cell, tile.type.layer, new_tile, old_tile);
return; return;
} }
}
let new_tile = null; let new_tile = null;
if (tile.type.layer === LAYERS.terrain) { if (tile.type.layer === LAYERS.terrain) {