From e2dd53add611de7fb787d130c94764e3c37bb006 Mon Sep 17 00:00:00 2001
From: HF <pixelplanetdev@gmail.com>
Date: Fri, 1 Apr 2022 14:03:46 +0200
Subject: [PATCH] add spareexu method to canvas cleaner

---
 src/components/Modtools.jsx |  8 ++++++--
 src/core/CanvasCleaner.js   | 29 +++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/components/Modtools.jsx b/src/components/Modtools.jsx
index 8d94c09..2156b1a 100644
--- a/src/components/Modtools.jsx
+++ b/src/components/Modtools.jsx
@@ -263,7 +263,11 @@ function Modtools() {
       break;
     case 'spareext':
       // eslint-disable-next-line max-len
-      descCleanAction = t`Clean spare pixels that are surrounded by a single other color`;
+      descCleanAction = t`Clean spare pixels that are surrounded by unset pixels and up to 1 other set pixels`;
+      break;
+    case 'spareextu':
+      // eslint-disable-next-line max-len
+      descCleanAction = t`Clean spare pixels that are surrounded by a single other color or unset pixels (VERY AGGRESSIVE ON CANVASES THAT ALLOW UNSET PIXELS (where there are two cooldowns)!)`;
       break;
     default:
       // nothing
@@ -571,7 +575,7 @@ function Modtools() {
           selectCleanAction(sel.options[sel.selectedIndex].value);
         }}
       >
-        {['spare', 'spareext'].map((opt) => (
+        {['spare', 'spareext', 'spareextu'].map((opt) => (
           <option
             value={opt}
           >
diff --git a/src/core/CanvasCleaner.js b/src/core/CanvasCleaner.js
index 5394146..5e731be 100644
--- a/src/core/CanvasCleaner.js
+++ b/src/core/CanvasCleaner.js
@@ -53,6 +53,35 @@ const METHODS = {
   },
 
   spareext: (xc, yc, clrIgnore, canvasCleaner) => {
+    let pxl = canvasCleaner.getPixelInChunkArea(xc, yc);
+    if (pxl === null || pxl < clrIgnore) {
+      return null;
+    }
+    let cntSet = 1;
+    let rplPxl = null;
+    for (let u = -1; u <= 1; u += 1) {
+      for (let v = -1; v <= 1; v += 1) {
+        pxl = canvasCleaner.getPixelInChunkArea(xc + u, yc + v);
+        if (pxl === null
+          || (u === 0 && v === 0)
+        ) {
+          continue;
+        }
+        if (pxl >= clrIgnore) {
+          if (cntSet >= 2) {
+            return null;
+          }
+          cntSet += 1;
+        }
+        if (rplPxl === null) {
+          rplPxl = pxl;
+        }
+      }
+    }
+    return rplPxl;
+  },
+
+  spareextu: (xc, yc, clrIgnore, canvasCleaner) => {
     let pxl = canvasCleaner.getPixelInChunkArea(xc, yc);
     if (pxl === null || pxl < clrIgnore) {
       return null;