From a4dbd49ded5c18d9d627412dbaa187aa6e9ba23f Mon Sep 17 00:00:00 2001 From: JustAGenericUsername Date: Fri, 9 Feb 2024 18:11:48 -0500 Subject: [PATCH 1/3] fix fillers? --- mods/nousersthings.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/nousersthings.js b/mods/nousersthings.js index 5dc8b764..3a674500 100644 --- a/mods/nousersthings.js +++ b/mods/nousersthings.js @@ -2006,6 +2006,7 @@ elemfillerVar = 0; elements.element_filler = { category: "special", color: elements.filler.color, + excludeRandom: true, state: "solid", movable: "false", onSelect: function() { @@ -2040,6 +2041,7 @@ var outlinerVar = 0 elements.outliner = { color: elements.filler.color, category: elements.filler.category, + excludeRandom: true, onSelect: function() { var answerot = prompt("Please input the desired element of this outliner. It will not work if you do multiple filter types while paused.",(outlinerVar||undefined)); if (!answerot) { return } From 3f4b4a3868baf65596a462c5c6e1a608671d362c Mon Sep 17 00:00:00 2001 From: JustAGenericUsername Date: Fri, 9 Feb 2024 18:14:03 -0500 Subject: [PATCH 2/3] one color.js --- mods/onecolor.js | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 mods/onecolor.js diff --git a/mods/onecolor.js b/mods/onecolor.js new file mode 100644 index 00000000..f2eb1b50 --- /dev/null +++ b/mods/onecolor.js @@ -0,0 +1,44 @@ +function pixelColorPick(pixel,customColor=null) { + var element = pixel.element; + var elementInfo = elements[element]; + //if (elementInfo.behavior instanceof Array) { + + if (pixel.charge && elementInfo.colorOn) { + customColor = elementInfo.colorOn; + } + if (customColor != null) { + if (Array.isArray(customColor)) { + customColor = customColor[0]; + } + if (customColor.startsWith("#")) { + customColor = hexToRGB(customColor); + } + var rgb = customColor; + } + else { + var rgb = elements[element].colorObject; // {r, g, b} + // If rgb is an array, choose a random item + if (Array.isArray(rgb)) { + rgb = rgb[0]; + } + } + // Randomly darken or lighten the RGB color + var coloroffset = Math.floor(Math.random() * (Math.random() > 0.5 ? -1 : 1) * Math.random() * 15); + var r = rgb.r + coloroffset; + var g = rgb.g + coloroffset; + var b = rgb.b + coloroffset; + // Make sure the color is within the RGB range + r = Math.max(0, Math.min(255, r)); + g = Math.max(0, Math.min(255, g)); + b = Math.max(0, Math.min(255, b)); + var color = "rgb("+r+","+g+","+b+")"; + + /*} + else { + var color = elementInfo.color; + if (Array.isArray(color)) { + color = color[Math.floor(Math.random() * color.length)]; + } + }*/ + return color; +} \ No newline at end of file From 087647445733df1da10dd535661a7359c8d97544 Mon Sep 17 00:00:00 2001 From: JustAGenericUsername Date: Fri, 9 Feb 2024 18:32:33 -0500 Subject: [PATCH 3/3] the --- mods/onecolor.js | 89 +++++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/mods/onecolor.js b/mods/onecolor.js index f2eb1b50..2820328c 100644 --- a/mods/onecolor.js +++ b/mods/onecolor.js @@ -1,44 +1,47 @@ -function pixelColorPick(pixel,customColor=null) { - var element = pixel.element; - var elementInfo = elements[element]; - //if (elementInfo.behavior instanceof Array) { - - if (pixel.charge && elementInfo.colorOn) { - customColor = elementInfo.colorOn; +window.addEventListener('load', function() { + console.log("attempted override") + pixelColorPick = function(pixel,customColor=null) { + var element = pixel.element; + var elementInfo = elements[element]; + //if (elementInfo.behavior instanceof Array) { + + if (pixel.charge && elementInfo.colorOn) { + customColor = elementInfo.colorOn; + } + if (customColor != null) { + if (Array.isArray(customColor)) { + customColor = customColor[0]; + } + if (customColor.startsWith("#")) { + customColor = hexToRGB(customColor); + } + var rgb = customColor; + } + else { + var rgb = elements[element].colorObject; // {r, g, b} + // If rgb is an array, choose a random item + if (Array.isArray(rgb)) { + rgb = rgb[0]; + } + } + // Randomly darken or lighten the RGB color + var coloroffset = Math.floor(Math.random() * (Math.random() > 0.5 ? -1 : 1) * Math.random() * 15); + var r = rgb.r + 0; + var g = rgb.g + 0; + var b = rgb.b + 0; + // Make sure the color is within the RGB range + r = Math.max(0, Math.min(255, r)); + g = Math.max(0, Math.min(255, g)); + b = Math.max(0, Math.min(255, b)); + var color = "rgb("+r+","+g+","+b+")"; + + /*} + else { + var color = elementInfo.color; + if (Array.isArray(color)) { + color = color[Math.floor(Math.random() * color.length)]; + } + }*/ + return color; } - if (customColor != null) { - if (Array.isArray(customColor)) { - customColor = customColor[0]; - } - if (customColor.startsWith("#")) { - customColor = hexToRGB(customColor); - } - var rgb = customColor; - } - else { - var rgb = elements[element].colorObject; // {r, g, b} - // If rgb is an array, choose a random item - if (Array.isArray(rgb)) { - rgb = rgb[0]; - } - } - // Randomly darken or lighten the RGB color - var coloroffset = Math.floor(Math.random() * (Math.random() > 0.5 ? -1 : 1) * Math.random() * 15); - var r = rgb.r + coloroffset; - var g = rgb.g + coloroffset; - var b = rgb.b + coloroffset; - // Make sure the color is within the RGB range - r = Math.max(0, Math.min(255, r)); - g = Math.max(0, Math.min(255, g)); - b = Math.max(0, Math.min(255, b)); - var color = "rgb("+r+","+g+","+b+")"; - - /*} - else { - var color = elementInfo.color; - if (Array.isArray(color)) { - color = color[Math.floor(Math.random() * color.length)]; - } - }*/ - return color; -} \ No newline at end of file +});