From 9bff7b721a994be555208a190b54bf2ca0402285 Mon Sep 17 00:00:00 2001 From: JustAGenericUsername Date: Sun, 28 Jan 2024 18:52:41 -0500 Subject: [PATCH 1/2] asdasdasd --- mods/heatglow.js | 104 ++++++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 50 deletions(-) diff --git a/mods/heatglow.js b/mods/heatglow.js index 2fb1a58b..3f2cbd6d 100644 --- a/mods/heatglow.js +++ b/mods/heatglow.js @@ -52,53 +52,57 @@ elements.color_baker = { excludeRandom: true, desc: "Use to bake a metals paint color into its 'true' color, for heating purposes.", } -//const plantfunc = function(pixel){ -// if (pixel.ogR == null || pixel.ogG == null || pixel.ogB == null){ -// pixel.ogR = parseInt(pixel.color.slice(4, pixel.color.indexOf(',')), 10) -// pixel.ogG = parseInt(pixel.color.slice(pixel.color.indexOf(',') + 1, pixel.color.lastIndexOf(',')), 10) -// pixel.ogB = parseInt(pixel.color.slice(pixel.color.lastIndexOf(',') + 1, -1), 10) -// pixel.deadR = 130; -// pixel.deadG = 103; -// pixel.deadB = 40; -// pixel.burnR = 30; -// pixel.burnG = 30; -// pixel.burnB = 30; -// }else{ -// pixel.gethigh = (elements[pixel.element].tempHigh) -// pixel.halftemp = ((20+pixel.gethigh)/2) -// if (pixel.temp <= (pixel.gethigh) - pixel.halftemp){ -// pixel.ctemp = 0; -// pixel.twoctemp = 0, -// pixel.littlectemp = 1; -// } else if (pixel.temp > (pixel.gethigh)-pixel.halftemp && pixel.temp <= pixel.gethigh){ -// pixel.ctemp = ((1/pixel.halftemp)*pixel.temp)-(((pixel.gethigh)-pixel.halftemp)/pixel.halftemp); -// pixel.twoctemp = pixel.ctemp*2; -// pixel.littlectemp = 2*(1-(pixel.ctemp)); -// } -// if (pixel.ctemp <= 0.5){ -// pixel.newR = ((pixel.twoctemp*pixel.deadR)+(pixel.littlectemp*pixel.ogR)/(pixel.twoctemp+pixel.littlectemp)); -// pixel.newG = ((pixel.twoctemp*pixel.deadG)+(pixel.littlectemp*pixel.ogG)/(pixel.twoctemp+pixel.littlectemp)); -// pixel.newB = ((pixel.twoctemp*pixel.deadB)+(pixel.littlectemp*pixel.ogB)/(pixel.twoctemp+pixel.littlectemp)); -// }else if (pixel.ctemp > 0.5){ -// pixel.newR = (((pixel.twoctemp*pixel.deadR)+(pixel.littlectemp*pixel.burnR))/(pixel.twoctemp*pixel.littlectemp)); -// pixel.newG = (((pixel.twoctemp*pixel.deadG)+(pixel.littlectemp*pixel.burnG))/(pixel.twoctemp*pixel.littlectemp)); -// pixel.newB= (((pixel.twoctemp*pixel.deadB)+(pixel.littlectemp*pixel.burnB))/(pixel.twoctemp*pixel.littlectemp)); -// } -// pixel.color = "rgb(" + pixel.newR + "," + pixel.newG + "," + pixel.newB + ")"; -// } -// }; -// if (!eLists.burnplants) { eLists.burnplants = [] } -// eLists.burnplants = eLists.burnplants.concat(["plant","dead_plant","grass","algae","sapling","evergreen","cactus","seeds","grass_seed","wheat_seed","flower_seed","pistil","petal","tree_branch","bamboo_plant","mushroom_spore","mushroom_stalk","mushroom_gill","mushroom_cap","hyphae","pumpkin_seed","pumpkin","corn","corn_seed","potato","potato_seed","root"]) -//eLists.burnplants.forEach(plant => { -// const prefunc = elements[plant].tick; -// if (!prefunc){ -// elements[plant].tick = plantfunc; -// }else{ -// const modfunc = function(pixel){ -// prefunc(pixel); -// plantfunc(pixel); -// }; -// elements[plant].tick = modfunc; -// } -//}); - +/* +function weightedAverage(num1, num2, weight){ + return ((weight * num1)+((1-weight)*num2)) +} + const plantfunc = function(pixel){ + if (pixel.ogR == null || pixel.ogG == null || pixel.ogB == null){ + pixel.ogR = parseInt(pixel.color.slice(4, pixel.color.indexOf(',')), 10) + pixel.ogG = parseInt(pixel.color.slice(pixel.color.indexOf(',') + 1, pixel.color.lastIndexOf(',')), 10) + pixel.ogB = parseInt(pixel.color.slice(pixel.color.lastIndexOf(',') + 1, -1), 10) + var deadR = 130; + var deadG = 103; + var deadB = 40; + var burnR = 30; + var burnG = 30; + var burnB = 30; + var newR = pixel.ogR; + var newG = pixel.ogG; + var newB = pixel.ogB; + }else{ + var gethigh = (elements[pixel.element].tempHigh) + var halftemp = ((20+gethigh)/2) + if (pixel.temp > halftemp){ + var ctemp = ((1/halftemp)*pixel.temp)-(((gethigh)-halftemp)/halftemp); + } else (ctemp = 0) + if (ctemp <= 0.5 && ctemp > 0){ + newR = weightedAverage(deadR, pixel.ogR, 2*ctemp); + newG = weightedAverage(deadG, pixel.ogG, 2*ctemp); + newB = weightedAverage(deadB, pixel.ogB, 2*ctemp); + }else if (ctemp > 0.5){ + var modctemp = 2*(ctemp%0.5) + newR = weightedAverage(burnR, deadR, 2*modctemp); + newG = weightedAverage(burnG, deadG, 2*modctemp); + newB = weightedAverage(burnB, deadB, 2*modctemp); + } + if (!ctemp == 0){ + pixel.color = "rgb(" + newR + "," + newG + "," + newB + ")"; + } else {pixel.color = "rgb(" + pixel.ogR + "," + pixel.ogG + "," + pixel.ogB + ")"} + } + }; + if (!eLists.burnplants) { eLists.burnplants = [] } + eLists.burnplants = eLists.burnplants.concat(["plant","dead_plant","grass","algae","sapling","evergreen","cactus","seeds","grass_seed","wheat_seed","flower_seed","pistil","petal","tree_branch","bamboo_plant","mushroom_spore","mushroom_stalk","mushroom_gill","mushroom_cap","hyphae","pumpkin_seed","pumpkin","corn","corn_seed","potato","potato_seed","root"]) +eLists.burnplants.forEach(plant => { + const prefunc = elements[plant].tick; + if (!prefunc){ + elements[plant].tick = plantfunc; + }else{ + const modfunc = function(pixel){ + prefunc(pixel); + plantfunc(pixel); + }; + elements[plant].tick = modfunc; + } +}); + */ \ No newline at end of file From 500a4d342eae6ec40700173df01dea1e482ccfc2 Mon Sep 17 00:00:00 2001 From: JustAGenericUsername Date: Tue, 6 Feb 2024 16:58:05 -0500 Subject: [PATCH 2/2] nouser update --- mods/nousersthings.js | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/mods/nousersthings.js b/mods/nousersthings.js index 5fc77088..5dc8b764 100644 --- a/mods/nousersthings.js +++ b/mods/nousersthings.js @@ -1613,11 +1613,7 @@ elements.molten_bismuth = { } } changePixel(pixel, "bismuth") - if (1 == 1){ - var rgbResult = HSVtoRGB(pixel.tHue + 0.02, 0.8, 0.8); - } else { - var rgbResult = HSVtoRGB(pixel.tHue, 0.8, 0.8); - } + var rgbResult = HSVtoRGB(pixel.tHue + 0.08, 0.5, 0.9); const hexR = rgbResult.r.toString(16).padStart(2, '0'); const hexG = rgbResult.g.toString(16).padStart(2, '0'); const hexB = rgbResult.b.toString(16).padStart(2, '0'); @@ -2039,4 +2035,39 @@ elements.element_filler = { changePixel(pixel, pixel.changeElem) } } -} \ No newline at end of file +} +var outlinerVar = 0 +elements.outliner = { + color: elements.filler.color, + category: elements.filler.category, + 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 } + outlinerVar = mostSimilarElement(answerot); + }, + tick: function(pixel){ + var neighbors = 0; + if(!pixel.changeElem){ + pixel.changeElem = outlinerVar; + if (pixel.nDelete == undefined){ + pixel.nDelete = false + } + } + if (pixel.nDelete){ + deletePixel(pixel.x, pixel.y) + } + for (var i = 0; i < squareCoords.length; i++) { + var coord = squareCoords[i]; + var x = pixel.x+coord[0]; + var y = pixel.y+coord[1]; + if (!isEmpty(x,y, true)) { + neighbors = neighbors + 1; + } + } + if (neighbors >= 8){ + pixel.nDelete = true + } else { + changePixel(pixel, pixel.changeElem) + } + } +} \ No newline at end of file