cell removal wip

README.md

@@ -29,7 +29,8 @@ Implemented in vanilla js and rendered using canvas API.
 
 ## TODO
 
-- detect cells to remove
+- properly remove cells
+- drop remaining ones
 - generate decent level
 - hint leaving cells visually
 - display next piece

cell.mjs

@@ -1,11 +1,27 @@
+import { COLOR_NONE, KIND_EMPTY } from './constants.mjs';
+
 export class Cell {
     constructor(color, kind, rotation) {
         this.color = color;
         this.kind = kind;
         this.rotation = rotation; // only relevant for pills
+        this.leaving = false;
     }
 
     clone() {
-        return new Cell(this.color, this.kind, this.rotation);
+        const c = new Cell(this.color, this.kind, this.rotation);
+        c.leaving = this.leaving;
+        return c;
+    }
+
+    toRemove() {
+        this.leaving = true;
+    }
+
+    clearLeaving() {
+        if (!this.leaving) return;
+        this.leaving = false;
+        this.color = COLOR_NONE;
+        this.kind = KIND_EMPTY;
     }
 }

logic.mjs

@@ -57,6 +57,8 @@ export function applyPill(m, p) {
         }
     });
 
+    markCellsToDelete(m, p);
+
     // reset new pill
     p.restore(randomPill());
 
@@ -119,9 +121,65 @@ export function rotateCCW(m, p) {
 }
 
 export function markCellsToDelete(m, p) {
+    const combos = [];
+
+    for (let x = 0; x < m.w; ++x) {
+        let prev = COLOR_NONE;
+        let combo;
+        for (let y = 0; y < m.h; ++y) {
+            const c = m.getValue([x, y]).color;
+            if (c && !combo || (c && combo && c !== prev)) {
+                combo = [[x, y]];
+                prev = c;
+            } else if (combo && (!c || c !== prev)) {
+                if (combo.length > 3) combos.push(combo);
+                combo = undefined;
+                prev = c;
+            } else if (c === prev && combo) {
+                combo.push([x, y]);
+            }
+        }
+        if (combo && combo.length > 3) combos.push(combo);
+    }
+
+    for (let y = 0; y < m.h; ++y) {
+        let prev = COLOR_NONE;
+        let combo;
+        for (let x = 0; x < m.w; ++x) {
+            const c = m.getValue([x, y]).color;
+            if (c && !combo || (c && combo && c !== prev)) {
+                combo = [[x, y]];
+                prev = c;
+            } else if (combo && (!c || c !== prev)) {
+                if (combo.length > 3) combos.push(combo);
+                combo = undefined;
+                prev = c;
+            } else if (c === prev && combo) {
+                combo.push([x, y]);
+            }
+        }
+        if (combo && combo.length > 3) combos.push(combo);
+    }
+
+    if (combos.length > 0) {
+        console.warn('combos', combos);
+        combos.forEach((c) => {
+            c.forEach((pos) => {
+                const v = m.getValue(pos);
+                v.toRemove();
+            });
+        });
+        // TODO HACkY
+        setTimeout(() => removeMarkedCells(m, p), 2000);
+    }
 
+    return combos.length > 0;
 }
 
 export function removeMarkedCells(m, p) {
-
+    console.log('to remove...');
+    m.values().forEach((v) => {
+        //console.log('v', v);
+        v.clearLeaving();
+    });
 }

render.mjs

@@ -86,9 +86,10 @@ function render(el, m, p, { bg, viruses, pills }) {
     const ctx = el.getContext('2d');
     ctx.clearRect(0, 0, S * m.w, S * m.h);
     ctx.drawImage(bg, 0, 0);
-    m.entries().forEach(([[x, y], { color, kind, rotation }]) => {
+    m.entries().forEach(([[x, y], { color, kind, rotation, leaving }]) => {
         x *= S;
         y *= S;
+        ctx.globalAlpha = leaving ? 0.5 : 1;
         if (kind === KIND_VIRUS) {
             ctx.drawImage(viruses[color], x, y);
         } else if (kind === KIND_PILL) {