diff --git a/mod-list.html b/mod-list.html index 474ea217..45665bb6 100644 --- a/mod-list.html +++ b/mod-list.html @@ -224,6 +224,7 @@ fairy_chain.jsAdds way too many fairies to fey_and_more.jsAlice fantastic_creatures.jsAdds various animalsMelecie fantasy_elements.jsFantasy creatures and substancespixelegend4 +flowers_and_forests.jsadds trees and flowers and things to do with naturepixelegend4 and SquareScreamYT fey_and_more.jsAdds fairies, magic, and a lot of other thingsMelecie fwibblen.jsAdds a flying creature that turns nickel into itself, and a second creature that does the same to the first oneAlice human_edit.jsImprovements to humansAlice diff --git a/mods/Mucho_frio_y_Calor.js b/mods/Mucho_frio_y_Calor.js new file mode 100644 index 00000000..02872888 --- /dev/null +++ b/mods/Mucho_frio_y_Calor.js @@ -0,0 +1,16 @@ +elements.Calor = { + color: "#ff2f2f", + tool: function(pixel) { + pixel.temp += 500000000000000000000500000000000000000000; + pixelTempCheck(pixel) + }, + category: "tools", +}; +elements.Frio = { + color: "#2f2fff", + tool: function(pixel) { + pixel.temp += -500000000000000000000500000000000000000000; + pixelTempCheck(pixel) + }, + category: "tools", +}; \ No newline at end of file diff --git a/mods/aChefsDream.js b/mods/aChefsDream.js index 800c9e8a..09ac248d 100644 --- a/mods/aChefsDream.js +++ b/mods/aChefsDream.js @@ -2,7 +2,18 @@ Created by SquareScreamYT and RealerRaddler Thanks to Alice, nousernamefound and Fioushemastor for helping :) -v1.4 +Upcoming Features: +- onions +- spring onions +- soy sauce +- rice +- seaweed and agar +- pigs, ham and bacon +- garlic +- msg +- stainless steel + +v1.5 Changelog (v1.0) - added chickens @@ -192,6 +203,21 @@ Changelog (v1.4) - added ginger - added ginger juice - added ginger rhizomes, pseudostems and leaves + + + +Changelog (v1.5) + - added blueberries + - added blueberries + - added blueberry seeds, stem, and leaves + - added blueberry juice + - added strawberry and blueberry jam + - added cut blueberries + - added advanced dough + - added carbonic acid + - added cookies and cookie dough + - replaced cooking oil with nut oil + - added boba and boba dough */ /* @@ -536,7 +562,7 @@ elements.raw_chicken = { "smoke": {elem1: "smoked_chicken"}, "steam": {elem1: "steamed_chicken"}, "water": {elem1: "boiled_chicken", tempMin: 70}, - "cooking_oil": {elem1: "fried_chicken", tempMin: 70} + "nut_oil": {elem1: "fried_chicken", tempMin: 70} } }; @@ -575,7 +601,7 @@ elements.raw_chicken_nugget = { stateHigh: ["ash", "smoke"], hidden: true, reactions: { - "cooking_oil": {elem1: "chicken_nugget", tempMin: 70} + "nut_oil": {elem1: "chicken_nugget", tempMin: 70} } }; @@ -678,22 +704,20 @@ elements.olive = { "baking_soda": { elem1:"dead_plant", elem2:null, chance:0.01 }, "bleach": { elem1:"dead_plant", elem2:null, chance:0.05 }, "alcohol": { elem1:"dead_plant", elem2:null, chance:0.035 }, - "rock": { elem1:"cooking_oil", elem2:"rock", chance:0.035 }, + "rock": { elem1:"nut_oil", elem2:"rock", chance:0.035, color1: "#ffc844" }, }, category:"food", tempHigh: 100, stateHigh: "dead_plant", - tempLow: -1.66, - stateLow: "frozen_plant", burn:65, burnTime:60, burnInto: "dead_plant", - breakInto: "cooking_oil", - state: "solid", + breakInto: "nut_oil", + breakIntoColor: "#ffc844", density: 1050, isFood: false } - +/* elements.cooking_oil = { color: "#ffc844", behavior: behaviors.LIQUID, @@ -711,7 +735,7 @@ elements.cooking_oil = { "peeled_potato": {elem2: "fried_potato", tempMin: 70} } }, - +*/ elements.pepper = { color: ["#1f190a", "#2b200d", "#362712", "#3b2211"], behavior: behaviors.POWDER, @@ -752,7 +776,7 @@ elements.peeled_potato = { stateHigh: "baked_potato", density: 1100, reactions: { - "cooking_oil": { elem1: "fried_potato", tempMin: 70 } + "nut_oil": { elem1: "fried_potato", tempMin: 70 } } } @@ -843,8 +867,6 @@ elements.apple = { category:"food", tempHigh: 100, stateHigh: "dead_plant", - tempLow: -1.66, - stateLow: "frozen_plant", burn:65, burnTime:60, burnInto: "dead_plant", @@ -1153,8 +1175,6 @@ elements.orange = { category:"food", tempHigh: 100, stateHigh: "dead_plant", - tempLow: -1.66, - stateLow: "frozen_plant", burn:65, burnTime:60, burnInto: "dead_plant", @@ -1436,7 +1456,7 @@ elements.raw_salmon = { "smoke": {elem1: "smoked_salmon"}, "steam": {elem1: "steamed_salmon"}, "water": {elem1: "boiled_salmon", tempMin: 70}, - "cooking_oil": {elem1: "fried_salmon", tempMin: 70} + "nut_oil": {elem1: "fried_salmon", tempMin: 70} } } @@ -1509,7 +1529,7 @@ elements.raw_tuna = { "smoke": {elem1: "smoked_tuna"}, "steam": {elem1: "steamed_tuna"}, "water": {elem1: "boiled_tuna", tempMin: 70}, - "cooking_oil": {elem1: "fried_tuna", tempMin: 70} + "nut_oil": {elem1: "fried_tuna", tempMin: 70} } } @@ -1662,8 +1682,6 @@ elements.watermelon = { category:"food", tempHigh: 100, stateHigh: "dead_plant", - tempLow: -1.66, - stateLow: "frozen_plant", burn:65, burnTime:60, burnInto: "dead_plant", @@ -1762,16 +1780,38 @@ elements.cream_of_tartar = { behavior: behaviors.POWDER, category: "food", state: "solid", - tempHigh: 200, - stateHigh: "caramel", density: 1500, isFood: true, hidden: true, - reaction: { - "sugar_water": {elem2: "corn_syrup", elem1: null, tempMin: 110} + reactions: { + "sugar_water": {elem2: "corn_syrup", elem1: null, tempMin: 80}, + "carbonic_acid": {elem1: null, elem2: "carbon_dioxide"} } } +elements.corn_syrup = { + color: ["#FFCD0C", "#E47F00", "#FEB003"], + behavior: behaviors.LIQUID, + category: "food", + state: "liquid", + tempHigh: 100, + stateHigh: "caramel", + isFood: true, + hidden: true, + viscosity: 10000 +} + +if (!elements.baking_soda.reactions) elements.baking_soda.reactions = {}; +elements.baking_soda.reactions.water = { elem1: "carbonic_acid", elem2: "carbonic_acid" } + +elements.carbonic_acid = { + color: ["#E0DEA5", "#DFDB9C", "#EBE8BC"], + behavior: behaviors.LIQUID, + category: "liquids", + state: "liquid", + hidden: true, +} + elements.wine = { color: ["#6F0013", "#6D0112"], behavior: behaviors.LIQUID, @@ -1785,18 +1825,6 @@ elements.wine = { tempLow: 0 } -elements.corn_syrup = { - color: ["#FFCD0C", "#E47F00", "#FEB003"], - behavior: behaviors.LIQUID, - category: "food", - state: "liquid", - tempHigh: 100, - stateHigh: "caramel", - isFood: true, - hidden: true, - viscosity: 10000 -} - elements.shrimp = { color: ["#EE5422", "#E9683C", "#F3583F", "#EDA270"], behavior: [ @@ -2024,8 +2052,6 @@ elements.coconut = { category:"food", tempHigh: 100, stateHigh: "dead_plant", - tempLow: -1.66, - stateLow: "frozen_plant", burn:65, burnTime:60, burnInto: "dead_plant", @@ -2058,7 +2084,7 @@ elements.coconut_milk = { viscosity: 1.5, category: "liquids", state: "liquid", - density: 1036.86, + density: 825, isFood: true } @@ -2081,8 +2107,6 @@ elements.cut_coconut = { category:"food", tempHigh: 100, stateHigh: "dead_plant", - tempLow: -1.66, - stateLow: "frozen_plant", burn:65, burnTime:60, burnInto: "dead_plant", @@ -2188,8 +2212,6 @@ elements.lemon = { category:"food", tempHigh: 100, stateHigh: "dead_plant", - tempLow: -1.66, - stateLow: "frozen_plant", burn:65, burnTime:60, burnInto: "dead_plant", @@ -2624,10 +2646,6 @@ elements.corn_starch = { "juice": { elem1: "dough", elem2: null }, "yolk": { elem1: "batter", elem2: null }, "yogurt": { elem1: "batter", elem2: null }, - "honey": { elem1:"gingerbread", elem2:null }, - "molasses": { elem1:"gingerbread", elem2:null }, - "sap": { elem1:"gingerbread", elem2:null }, - "caramel": { elem1:"gingerbread", elem2:null }, "broth": { elem1:"dough", elem2:null }, "soda": { elem1:"dough", elem2:null }, "tea": { elem1:"dough", elem2:null }, @@ -2934,7 +2952,10 @@ elements.strawberry_juice = { density: 825, hidden: true, temp: 30, - tempLow: 0 + tempLow: 0, + reactions: { + "sugar": { elem1:"strawberry_jam", elem2:null, chance:0.35 }, + }, }; elements.cream = { @@ -3148,3 +3169,341 @@ elements.ginger_juice = { "bread": { elem1:"gingerbread", elem2:null }, }, }; + + +elements.blueberry_seed = { + color: "#7a7133", + behavior: behaviors.STURDYPOWDER, + reactions: { + "vinegar": { elem1:"dead_plant", elem2:null, chance:0.035 }, + "baking_soda": { elem1:"dead_plant", elem2:null, chance:0.01 }, + "bleach": { elem1:"dead_plant", elem2:null, chance:0.05 }, + "alcohol": { elem1:"dead_plant", elem2:null, chance:0.035 }, + "mercury": { elem1:"dead_plant", elem2:null, chance:0.01 }, + "stench": { elem2:null, chance:0.25 }, + }, + tick: function(pixel) { + if (isEmpty(pixel.x,pixel.y+1)) { + movePixel(pixel,pixel.x,pixel.y+1); + } + else { + if (Math.random() < 0.02 && pixel.temp < 100) { + if (!outOfBounds(pixel.x,pixel.y+1)) { + var dirtPixel = pixelMap[pixel.x][pixel.y+1]; + if (dirtPixel.element === "dirt" || dirtPixel.element === "mud" || dirtPixel.element === "sand" || dirtPixel.element === "wet_sand" || dirtPixel.element === "clay_soil" || dirtPixel.element === "mycelium") { + changePixel(pixel,"blueberry_stem"); + } + } + } + pixel.age++; + } + doDefaults(pixel); + }, + category:"life", + tempHigh: 100, + stateHigh: "dead_plant", + tempLow: -1.66, + stateLow: "frozen_plant", + burn:15, + burnTime:60, + burnInto: "dead_plant", + breakInto: "dead_plant", + state: "solid", + density: 1050, + cooldown: defaultCooldown +} +elements.blueberry_stem = { + color: "#419c2f", + behavior: [ + "CR:blueberry_stem,blueberry_leaves,blueberry_leaves,blueberry_leaves,blueberry_leaves%3|CR:blueberry_stem,blueberry_leaves,blueberry_leaves,blueberry_leaves,blueberry_leaves%3|CR:blueberry_stem,blueberry_leaves,blueberry_leaves,blueberry_leaves,blueberry_leaves%3", + "CR:blueberry_stem,blueberry_leaves,blueberry_leaves,blueberry_leaves,blueberry_leaves%3|XX|CR:blueberry_stem,blueberry_leaves,blueberry_leaves,blueberry_leaves,blueberry_leaves%3", + "XX|M1|XX", + ], + tick: function(pixel) { + if (isEmpty(pixel.x,pixel.y+1)) { + movePixel(pixel,pixel.x,pixel.y+1); + } + else { + if (Math.random() < 0.02 && pixel.age > 50 && pixel.temp < 100) { + if (!outOfBounds(pixel.x,pixel.y+1)) { + var dirtPixel = pixelMap[pixel.x][pixel.y+1]; + if (dirtPixel.element === "dirt" || dirtPixel.element === "mud" || dirtPixel.element === "sand" || dirtPixel.element === "wet_sand" || dirtPixel.element === "clay_soil" || dirtPixel.element === "mycelium") { + changePixel(dirtPixel,"root"); + } + } + } + pixel.age++; + } + doDefaults(pixel); + }, + reactions: { + "vinegar": { elem1:"dead_plant", elem2:null, chance:0.035 }, + "baking_soda": { elem1:"dead_plant", elem2:null, chance:0.01 }, + "bleach": { elem1:"dead_plant", elem2:null, chance:0.05 }, + "alcohol": { elem1:"dead_plant", elem2:null, chance:0.035 }, + "mercury": { elem1:"dead_plant", elem2:null, chance:0.01 }, + "stench": { elem2:null, chance:0.25 }, + }, + properties: { + "age":0 + }, + category:"life", + tempHigh: 100, + stateHigh: "dead_plant", + tempLow: -1.66, + stateLow: "frozen_plant", + burn:15, + burnTime:60, + burnInto: "dead_plant", + breakInto: "dead_plant", + state: "solid", + density: 1050, +} +elements.blueberry_leaves = { + color: "#4bad37", + behavior: [ + "XX|CR:blueberry%2|XX", + "CR:blueberry%2|XX|CR:blueberry%2", + "M2|M1|M2", + ], + reactions: { + "vinegar": { elem1:"dead_plant", elem2:null, chance:0.035 }, + "baking_soda": { elem1:"dead_plant", elem2:null, chance:0.01 }, + "bleach": { elem1:"dead_plant", elem2:null, chance:0.05 }, + "alcohol": { elem1:"dead_plant", elem2:null, chance:0.035 }, + "mercury": { elem1:"dead_plant", elem2:null, chance:0.01 }, + "stench": { elem2:null, chance:0.25 }, + }, + category:"life", + tempHigh: 100, + stateHigh: "dead_plant", + tempLow: -1.66, + stateLow: "frozen_plant", + burn:15, + burnTime:60, + burnInto: "dead_plant", + breakInto: "dead_plant", + state: "solid", + density: 1050 +} +elements.blueberry = { + color: "#5d4bc4", + behavior: [ + "XX|ST:blueberry_stem,blueberry_leaves|XX", + "ST:blueberry_stem,blueberry_leaves|XX|ST:blueberry_stem,blueberry_leaves", + "M2|M1|M2", + ], + reactions: { + "vinegar": { elem1:"dead_plant", elem2:null, chance:0.035 }, + "baking_soda": { elem1:"dead_plant", elem2:null, chance:0.01 }, + "bleach": { elem1:"dead_plant", elem2:null, chance:0.05 }, + "alcohol": { elem1:"dead_plant", elem2:null, chance:0.035 }, + "mercury": { elem1:"dead_plant", elem2:null, chance:0.01 }, + "stench": { elem2:null, chance:0.25 }, + }, + category:"food", + tempHigh: 100, + stateHigh: "dead_plant", + burn:15, + burnTime:60, + burnInto: "dead_plant", + breakInto: "blueberry_juice", + state: "solid", + density: 1050, + cutInto: "cut_blueberry" +} +elements.blueberry_juice = { + color: "#5030a1", + behavior: behaviors.LIQUID, + category: "liquids", + tempHigh: 100, + stateHigh: ["steam","sugar"], + burn: 70, + burnTime: 300, + burnInto: ["steam", "smoke"], + state: "liquid", + density: 825, + hidden: true, + temp: 30, + tempLow: 0, + reactions: { + "sugar": { elem1:"blueberry_jam", elem2:null, chance:0.35 }, + "milk": { elem1:"fruit_milk", elem2:null, chance:0.35, color1: "#995fb3" }, + }, +}; +/* +elements.fruit_slushie = { + color: "#ffcc54", + behavior: behaviors.LIQUID, + reactions: { + "dirt": { elem1: null, elem2: "mud" }, + "sand": { elem1: null, elem2: "wet_sand" } + }, + temp: -5, + tempHigh: 18, + tempLow: -20, + stateLow: "ice", + stateHigh: "water", + category: "food", + state: "liquid", + density: 95, + viscosity: 100, + hidden: true +} +*/ + +elements.strawberry_jam = { + color: "#c73c3e", + behavior: behaviors.LIQUID, + category: "food", + tempHigh: 400, + stateHigh: ["sugar","smoke"], + burn: 70, + burnTime: 300, + viscosity: 750, + state: "liquid", + density: 825, + hidden: true +}; +elements.blueberry_jam = { + color: "#281C4B", + behavior: behaviors.LIQUID, + category: "food", + tempHigh: 400, + stateHigh: ["sugar","smoke"], + burn: 70, + burnTime: 300, + viscosity: 750, + state: "liquid", + density: 825, + hidden: true +}; +elements.cut_blueberry = { + color: "#d4ed8a", + behavior: [ + "XX|XX|XX", + "XX|XX|XX", + "M2|M1|M2", + ], + reactions: { + "vinegar": { elem1:"dead_plant", elem2:null, chance:0.035 }, + "baking_soda": { elem1:"dead_plant", elem2:null, chance:0.01 }, + "bleach": { elem1:"dead_plant", elem2:null, chance:0.05 }, + "alcohol": { elem1:"dead_plant", elem2:null, chance:0.035 }, + "mercury": { elem1:"dead_plant", elem2:null, chance:0.01 }, + "stench": { elem2:null, chance:0.25 }, + }, + category:"food", + tempHigh: 100, + stateHigh: "dead_plant", + burn:15, + burnTime:60, + burnInto: "dead_plant", + breakInto: "blueberry_juice", + state: "solid", + density: 1050, + hidden: true +} + +if (!elements.yeast.reactions) elements.yeast.reactions = {}; +elements.yeast.reactions.flour = { elem1: "advanced_dough", elem2: null } + +elements.advanced_dough = { + color: "#c49f58", + behavior: behaviors.STURDYPOWDER, + reactions: { + "milk": { elem2:"broth", color2:"#ECC891", tempMin:70 }, + "cream": { elem2:"broth", color2:"#ECC891", tempMin:70 }, + }, + category: "food", + tempHigh: 94, + stateHigh: "bread", + stateHighColorMultiplier: 0.9, + burn:40, + burnTime:25, + burnInto:"ash", + state: "solid", + density: 526.9, + isFood: true, + hidden: true +} + +if (!elements.melted_chocolate.reactions) elements.melted_chocolate.reactions = {}; +elements.melted_chocolate.reactions.flour = { elem1: "cookie_dough", elem2: null } + +elements.cookie_dough = { + color: ["#946826","#9e783f","#8a6d41","#614925"], + behavior: behaviors.STURDYPOWDER, + category: "food", + tempHigh: 94, + stateHigh: "cookie", + stateHighColorMultiplier: 0.8, + burn:40, + burnTime:25, + burnInto:"ash", + state: "solid", + density: 526.9, + isFood: true, + hidden: true +} + +elements.cookie = { + color: "#7d5f2e", + behavior: behaviors.STURDYPOWDER, + tempHigh: 605, + stateHigh: "ash", + category: "food", + burn: 30, + burnTime: 200, + burnInto: ["smoke","smoke","smoke","ash"], + breakInto: "crumb", + breakIntoColor: "#7d6216", + state: "solid", + density: 233.96, + isFood: true +} + +elements.nut_oil.name = "cooking_oil" + +// elements.fire.temp = 130 + +elements.bread.behavior = behaviors.SUPPORT + +elements.toast.behavior = behaviors.SUPPORT + +if (!elements.caramel.reactions) elements.caramel.reactions = {}; +elements.caramel.reactions.corn_starch = { elem1: "boba_dough", elem2: null, chance: 0.35, tempMin: 70} + +elements.boba_dough = { + color: ["#4a2007","#2b1304"], + behavior: behaviors.STURDYPOWDER, + category: "food", + tempHigh: 400, + stateHigh: "ash", + stateHighColorMultiplier: 0.8, + burn:40, + burnTime:25, + burnInto:"ash", + state: "solid", + density: 526.9, + reactions: { + "water": { elem1:"boba", tempMin:60}, + }, + isFood: true, + hidden: true +} + +elements.boba = { + color: "#59290c", + behavior: behaviors.POWDER, + tempHigh: 300, + stateHigh: "fire", + category: "food", + burn: 30, + burnTime: 200, + burnInto: ["smoke","smoke","smoke","ash"], + breakIntoColor: "#7d6216", + state: "solid", + density: 644, + isFood: true +} diff --git a/mods/a_mod_by_alice.js b/mods/a_mod_by_alice.js index a2573f05..ddd46a35 100644 --- a/mods/a_mod_by_alice.js +++ b/mods/a_mod_by_alice.js @@ -738,7 +738,7 @@ try { }; }; - function rgbObjectToString(color) { + function rgbObjectToString(color,stripAlpha=false) { if(typeof(color) !== "object") { throw new Error("Input color is not an object"); }; @@ -757,15 +757,20 @@ try { return `rgb(${red},${green},${blue})` }; - function convertColorFormats(color,outputType="rgb") { //Hex triplet and object to rgb(), while rgb() is untouched + function convertColorFormats(color,outputType="rgb",stripAlpha=false) { if(typeof(color) === "undefined") { //console.log("Warning: An element has an undefined color. Unfortunately, due to how the code is structured, I can't say which one."); //color = "#FF00FF"; throw new Error("Color is undefined!"); }; //console.log("Logged color for convertColorFormats: " + color); + var oldColor = color; + var bytes,r,g,b,a; if(typeof(color) === "string") { - if(typeof(color) === "string" && color.length < 10) { + //Hex input case + + if(color.length < 10) { + //a proper hex quadruplet is still shorter than the shortest proper rgb() string //console.log(`detected as hex: ${color}`); //catch missing octothorpes if(!color.startsWith("#")) { @@ -773,71 +778,118 @@ try { }; //console.log(`octothorpe checked: ${color}`); - var oldColor = color; - color = hexToRGB(color); - if(color === null) { - throw new Error(`hexToRGB(color) was null (${oldColor}, maybe it's an invalid hex triplet?)`); - }; - - switch(outputType.toLowerCase()) { - case "rgb": - return `rgb(${color.r},${color.g},${color.b})`; - break; - case "hex": - return rgbToHex(color); - break; - case "json": - return color; - break; - case "array": - return [color.r, color.g, color.b]; - break; - default: - throw new Error("outputType must be \"rgb\", \"hex\", \"json\", or \"array\""); - }; - } else { - if(typeof(color) === "string" && color.startsWith("rgb(")) { - //console.log(`convertColorFormats: calling rgbStringToObject on color ${color}`); - color = rgbStringToObject(color,true,false); - switch(outputType.toLowerCase()) { - case "rgb": - if(typeof(color) === "string") { color = rgbStringToObject(color) }; - return `rgb(${color.r},${color.g},${color.b})`; - break; - case "hex": - return rgbToHex(color); - break; - case "json": - return color; - break; - case "array": - return [color.r, color.g, color.b]; - break; - default: - throw new Error("outputType must be \"rgb\", \"hex\", \"json\", or \"array\""); - }; + if(oldColor.length < 6) { + bytes = oldColor.toLowerCase().match(/[a-z0-9]/g).map(x => parseInt(x.concat(x),16)); } else { - throw new Error('Color must be of the type "rgb(red,green,blue)"'); + bytes = oldColor.toLowerCase().match(/[a-z0-9]{2}/g).map(x => parseInt(x,16)); }; + r = bytes[0]; + g = bytes[1]; + b = bytes[2]; + if(bytes.length > 3) { + a = bytes[3] / 255; + } else { + a = null + }; + if(stripAlpha) { a = null }; + //to JSON for ease of use + color = {"r": r, "g": g, "b": b}; + if(typeof(a) == "number") { color["a"] = a }; + } else { + //otherwise assume rgb() input + bytes = color.match(/[\d\.]+/g); + if(typeof(bytes?.map) == "undefined") { + console.log(bytes); + bytes = [255,0,255] + } else { + bytes = bytes.map(x => Number(x)); + }; + r = bytes[0]; + g = bytes[1]; + b = bytes[2]; + if(bytes.length > 3) { + a = bytes[3]; + if(a > 1) { + a /= 255 + } + } else { + a = null + }; + if(stripAlpha) { a = null }; + //to JSON for ease of use + color = {"r": r, "g": g, "b": b} + if(typeof(a) == "number") { color["a"] = a }; }; - } else if(typeof(color) === "object") { - switch(outputType.toLowerCase()) { - case "rgb": - return `rgb(${color.r},${color.g},${color.b})`; - break; - case "hex": - return rgbToHex(color); - break; - case "json": - return color; - break; - case "array": - return [color.r, color.g, color.b]; - break; - default: - throw new Error("outputType must be \"rgb\", \"hex\", \"json\", or \"array\""); + } else if(Array.isArray(color)) { + bytes = color; + r = bytes[0]; + g = bytes[1]; + b = bytes[2]; + if(bytes.length > 3) { + a = bytes[3]; + if(a > 1) { + a /= 255 + } + } else { + a = null }; + if(stripAlpha) { a = null }; + //to JSON for ease of use + color = {"r": r, "g": g, "b": b} + if(typeof(a) == "number") { color["a"] = a }; + } else if(typeof(color) == "object") { + //variable mappings only + r = color.r; + g = color.g; + b = color.b; + if(typeof(color.a) == "number") { + a = color.a; + } else { + a = null + }; + if(stripAlpha) { a = null } }; + //Colors are now objects + + switch(outputType.toLowerCase()) { + case "rgb": + case "rgba": + var _r,_g,_b,_a; + _r = r; + _g = g; + _b = b; + if(typeof(a) == "number") { _a = a } else { _a = null }; + var values; + if(stripAlpha || _a == null) { + values = [_r,_g,_b]; + } else { + values = [_r,_g,_b,_a]; + }; + for(var i = 0; i <= 2; i++) { + values[i] = Math.round(values[i]) + }; + return (typeof(a) == "number" ? "rgba" : "rgb") + `(${values.join(",")})` + case "hex": + var _r,_g,_b,_a; + _r = r; + _g = g; + _b = b; + if(typeof(a) == "number") { _a = Math.round(a * 255) } else { _a = null }; + var bytesToBe; + if(stripAlpha || _a == null) { + bytesToBe = [_r,_g,_b]; + } else { + bytesToBe = [_r,_g,_b,_a]; + }; + return "#" + bytesToBe.map(x => Math.round(x).toString(16).padStart(2,"0")).join(""); + case "json": + return color; + case "array": + return Object.values(color); + break; + default: + throw new Error("outputType must be \"rgb\", \"hex\", \"json\", or \"array\""); + } }; function rgbHexCatcher(color) { @@ -2590,6 +2642,7 @@ color1 and color2 spread through striped paint like dye does with itself. col rgbos.push("rgb(255,255,255)") } else if (c.startsWith("#")) { var rgb = hexToRGB(c); + if(rgb == null) { console.log(key,c); rgb = {r: 255, g: 255, b: 255} }; rgbs.push("rgb("+rgb.r+","+rgb.g+","+rgb.b+")"); rgbos.push(rgb); } @@ -2622,7 +2675,7 @@ color1 and color2 spread through striped paint like dye does with itself. col if (!(newcolor instanceof Array)) { newcolor = [newcolor]; } // for every color in the newcolor array, add a new color with the same value, but with the r and g values increased for (var i = 0; i < newcolor.length; i++) { - var c = newcolor[i]; + var c = newcolor[i] ?? "#ff00ff"; for (var j = 0; j < autoInfo.rgb.length; j++) { var newc = autoInfo.rgb[j]; r = Math.floor(c.r * newc[0]); @@ -3553,22 +3606,24 @@ color1 and color2 spread through striped paint like dye does with itself. col velocityBlacklist = []; - function explodeAtPlus(x,y,radius,fire="fire",smoke="smoke",beforeFunction=null,afterFunction=null,changeTemp=true) { + function explodeAtPlus(x,y,radius,firee="fire",smokee="smoke",beforeFunction=null,afterFunction=null,changeTemp=true) { // if fire contains , split it into an array - if(fire !== null) { - if (fire.indexOf(",") !== -1) { - fire = fire.split(","); + if(firee !== null) { + if (firee.indexOf(",") !== -1) { + firee = firee.split(","); }; }; - if(smoke !== null) { - if (smoke.indexOf(",") !== -1) { - smoke = smoke.split(","); + if(smokee !== null) { + if (smokee.indexOf(",") !== -1) { + smokee = smokee.split(","); }; }; var coords = circleCoords(x,y,radius); var power = radius/10; //for (var p = 0; p < Math.round(radius/10+1); p++) { for (var i = 0; i < coords.length; i++) { + var fire = firee; + var smoke = smokee; // damage value is based on distance from x and y var damage = Math.random() + (Math.floor(Math.sqrt(Math.pow(coords[i].x-x,2) + Math.pow(coords[i].y-y,2)))) / radius; // invert @@ -3581,24 +3636,17 @@ color1 and color2 spread through striped paint like dye does with itself. col else if (damage < 0.2) { // if smoke is an array, choose a random item if(smoke !== null) { - if (Array.isArray(smoke)) { - createPixel(smoke[Math.floor(Math.random() * smoke.length)],coords[i].x,coords[i].y); - } - else { - createPixel(smoke,coords[i].x,coords[i].y); - } + while (Array.isArray(smoke)) { + smoke = randomChoice(smoke); + }; + if(smoke !== null) { createPixel(smoke,coords[i].x,coords[i].y) }; } } else { - if(fire !== null) { - // if fire is an array, choose a random item - if (Array.isArray(fire)) { - createPixel(fire[Math.floor(Math.random() * fire.length)],coords[i].x,coords[i].y); - } - else { - createPixel(fire,coords[i].x,coords[i].y); - } - } + while (Array.isArray(fire)) { + fire = randomChoice(fire); + }; + if(fire !== null) { createPixel(fire,coords[i].x,coords[i].y) }; } } else if (!outOfBounds(coords[i].x,coords[i].y)) { @@ -3619,13 +3667,10 @@ color1 and color2 spread through striped paint like dye does with itself. col } if (damage > 0.9) { if(fire !== null) { - if (Array.isArray(fire)) { - var newfire = fire[Math.floor(Math.random() * fire.length)]; - } - else { - var newfire = fire; - } - changePixel(pixel,newfire,changeTemp); + while (Array.isArray(fire)) { + fire = randomChoice(fire); + }; + if(fire !== null) { changePixel(pixel,fire,changeTemp) }; } else { deletePixel(pixel.x,pixel.y); } @@ -3637,13 +3682,10 @@ color1 and color2 spread through striped paint like dye does with itself. col if (info.breakInto !== undefined) { breakPixel(pixel); } else { - if (Array.isArray(fire)) { - var newfire = fire[Math.floor(Math.random() * fire.length)]; - } - else { - var newfire = fire; - } - changePixel(pixel,newfire); + while (Array.isArray(fire)) { + fire = randomChoice(fire); + }; + if(fire !== null) { changePixel(pixel,fire,changeTemp) }; } if(info.onExplosionBreakOrSurvive) { info.onExplosionBreakOrSurvive(pixel,x,y,radius,fire,smoke,power,damage); @@ -3652,13 +3694,10 @@ color1 and color2 spread through striped paint like dye does with itself. col } else { if(fire !== null) { - if (Array.isArray(fire)) { - var newfire = fire[Math.floor(Math.random() * fire.length)]; - } - else { - var newfire = fire; - } - changePixel(pixel,newfire,changeTemp); + while (Array.isArray(fire)) { + fire = randomChoice(fire); + }; + if(fire !== null) { changePixel(pixel,fire,changeTemp) }; } else { deletePixel(pixel.x,pixel.y); } @@ -3696,7 +3735,7 @@ color1 and color2 spread through striped paint like dye does with itself. col //MORE CONFIGURABLE REACTION TEMPERATURE CHANGES ## function reactPixels(pixel1,pixel2) { - var r = elements[pixel1.element].reactions[pixel2.element]; + var r = elements[pixel1?.element]?.reactions?.[pixel2?.element]; if(!r) { return false }; if (r.setting && !(settings[r.setting])) { return false; @@ -5134,6 +5173,12 @@ color1 and color2 spread through striped paint like dye does with itself. col none: function(number) { return number } }; + var tickBehaviorStringCache = { + POWDER: behaviors.POWDER.toString(), + LIQUID: behaviors.LIQUID.toString(), + UL_UR_OPTIMIZED: behaviors.UL_UR_OPTIMIZED.toString() + }; + //I hate overwriting drawPixels runAfterAutogen(function() { //rAA because velocity.js already puts its redef in a rAL and rAA comes after that @@ -5294,6 +5339,94 @@ color1 and color2 spread through striped paint like dye does with itself. col ctx.fillStyle = averageRGB(colorlist); } } + else if (view === 5) { // velocity view + var data = elements[pixel.element]; + + var vx = pixel.vx ?? 0; + var vy = pixel.vy ?? 0; + /* + var pseudoVelocity = 0; + var coordsToCheck; + var behaviorCoordsToCheck; + + if(Array.isArray(data.behavior)) { + switch((pixel.r ?? 0) % 4) { + default: + case 0: + coordsToCheck = [0,1]; + behaviorCoordsToCheckOffset = [2,1]; + break; + case 1: + coordsToCheck = [-1,0]; + behaviorCoordsToCheckOffset = [1,0]; + break; + case 2: + coordsToCheck = [0,-1]; + behaviorCoordsToCheckOffset = [0,1]; + break; + case 3: + coordsToCheck = [1,0]; + behaviorCoordsToCheckOffset = [1,2]; + break; + }; + if(data.behavior[behaviorCoordsToCheckOffset[0]][behaviorCoordsToCheckOffset[1]] == "M1") { + if(isEmpty(pixel.x+coordsToCheck[0],pixel.y+coordsToCheck[1])) { + pseudoVelocity = 1; + } else { + if(!(isEmpty(pixel.x+behaviorCoordsToCheckOffset[0],pixel.y+behaviorCoordsToCheckOffset[1],true))) { + newPixel = pixelMap[pixel.x+behaviorCoordsToCheckOffset[0]][pixel.y+behaviorCoordsToCheckOffset[1]]; + newData = elements[newPixel.element]; + if(newData.id !== data.id && typeof(data.density) === "number" && typeof(newData.density) === "number") { + var chance = (data.density - newData.density)/(data.density + newData.density); + pseudoVelocity = chance + } + } + } + }; + if(pseudoVelocity) { + switch((pixel.r ?? 0) % 4) { + default: + case 0: + vy += pseudoVelocity; + break; + case 1: + vx -= pseudoVelocity; + break; + case 2: + vy -= pseudoVelocity; + break; + case 3: + vx += pseudoVelocity; + break; + } + }; + } else { + if(data.tick && [behaviors.POWDER,behaviors.LIQUID].includes(data.tick)) { + pseudoVelocity = 1; + } else if(data.tick == behaviors.UL_UR_OPTIMIZED) { + pseudoVelocity = -1; + } else if(pixel.element == "hail") { + pseudoVelocity = 2; + }; + vy += pseudoVelocity; + }; + */ + + if(vx === 0 && vy === 0) { + ctx.fillStyle = "rgb(15,15,15)" + } else { + var magnitude = Math.sqrt ((vx ** 2) + (vy ** 2)); + + var direction = Math.atan2(pixel.vy ?? 0,pixel.vx ?? 0)*180/Math.PI; + if(direction < 0) { direction = scale(direction,-180,0,360,180) }; + + hue = direction; + sat = 100; + lig = bound(scale(magnitude,0,100,10,100),0,100); + + ctx.fillStyle = "hsl("+hue+","+sat+"%,"+lig+"%)"; + } + } if(find) { //if find and matching, override fill style with the find coloration if(findElement instanceof Array ? findElement.includes(pixel.element) : pixel.element === findElement) { @@ -5446,6 +5579,22 @@ color1 and color2 spread through striped paint like dye does with itself. col }); //I hate overwriting drawPixels + viewKey = { + 2: "thermal", + 3: "basic", + 4: "smooth", + 5: "velocity" + }; + + function setView(n) { + if (viewKey[n]) { // range of number keys with valid views + view = n; + } + else { // reset view + view = null; + } + }; + runAfterLoad(function() { //Setting var settingsMenu = document.getElementById("settingsMenu").getElementsByClassName("menuText")[0]; @@ -7920,7 +8069,7 @@ color1 and color2 spread through striped paint like dye does with itself. col if(isEmpty(pixel.x+1,pixel.y-1) && isEmpty(pixel.x+1,pixel.y-2) && !outOfBounds(pixel.x+1,pixel.y-1) && !outOfBounds(pixel.x+1,pixel.y-2)) { tryMove(pixelMap[pixel.x][pixel.y-1],pixel.x+1,pixel.y-1) tryMove(pixelMap[pixel.x][pixel.y-2],pixel.x+1,pixel.y-2) - } + } //7989 yay soshi! } } else { if(isEmpty(pixel.x+1,pixel.y-1) && !outOfBounds(pixel.x+1,pixel.y-1)) { @@ -8202,7 +8351,7 @@ color1 and color2 spread through striped paint like dye does with itself. col behavior: behaviors.GAS, category: "gases", state: "gas", - density: 550, //7989 yay soshi! + density: 550, tick: function(pixel) { if(pixel.y % 6 == 0) { if(pixel.x % 6 == 0) { @@ -10690,10 +10839,11 @@ color1 and color2 spread through striped paint like dye does with itself. col var lifeEaterCategories = ["life","auto creepers","shit","cum","food","fantastic creatures","fey","auto_fey"]; var lifeEaterBlacklist = ["life_eater_virus","life_eater_slurry","life_eater_infected_dirt"]; - var lifeEaterWhitelist = ["blood","poop","blood_ice","wood","wood_plank","sawdust","straw","paper","birthpool","dried_poop","gloomfly","meat_monster","rotten_ravager","bone_beast","withery","withery_plant","banana","apple","rotten_apple","apioform_player","apioform_bee","apioform","apiodiagoform","sugar_cactus","sugar_cactus_seed","flowering_sugar_cactus","tree_branch","sap","silk","red_velvet","silk_velvet","ketchup", "enchanted_ketchup", "frozen_ketchup", "poisoned_ketchup", "frozen_poisoned_ketchup", "ketchup_spout", "ketchup_cloud", "poisoned_ketchup_cloud", "ketchup_snow", "ketchup_snow_cloud", "poisoned_ketchup_snow", "poisoned_ketchup_snow_cloud", "ketchup_gas", "poisoned_ketchup_gas", "ketchup_powder", "poisoned_ketchup_powder", "eketchup_spout", "ketchup_metal", "antiketchup", "dirty_ketchup", "ketchup_gold", "molten_ketchup_metal", "ketchup_fairy", "ketchup_metal_scrap", "ketchup_gold_scrap", "molten_ketchup_gold", "mycelium","vaccine","antibody","infection","sap","caramel","molasses","melted_chocolate","soda","mustard","fry_sauce","tomato_sauce","sugary_tomato_sauce","bio_ooze","zombie_blood","feather","tooth","decayed_tooth","plaque","tartar","bacteria","replacer_bacteria","pop_rocks"]; + var lifeEaterWhitelist = ["blood","skin","hair","poop","blood_ice","wood","wood_plank","sawdust","straw","paper","birthpool","dried_poop","gloomfly","meat_monster","rotten_ravager","bone_beast","withery","withery_plant","banana","apple","rotten_apple","apioform_player","apioform_bee","apioform","apiodiagoform","sugar_cactus","sugar_cactus_seed","flowering_sugar_cactus","tree_branch","sap","silk","red_velvet","silk_velvet","ketchup", "enchanted_ketchup", "frozen_ketchup", "poisoned_ketchup", "frozen_poisoned_ketchup", "ketchup_spout", "ketchup_cloud", "poisoned_ketchup_cloud", "ketchup_snow", "ketchup_snow_cloud", "poisoned_ketchup_snow", "poisoned_ketchup_snow_cloud", "ketchup_gas", "poisoned_ketchup_gas", "ketchup_powder", "poisoned_ketchup_powder", "eketchup_spout", "ketchup_metal", "antiketchup", "dirty_ketchup", "ketchup_gold", "molten_ketchup_metal", "ketchup_fairy", "ketchup_metal_scrap", "ketchup_gold_scrap", "molten_ketchup_gold", "mycelium","vaccine","antibody","infection","sap","caramel","molasses","melted_chocolate","soda","mustard","fry_sauce","tomato_sauce","sugary_tomato_sauce","bio_ooze","zombie_blood","feather","tooth","decayed_tooth","plaque","tartar","bacteria","replacer_bacteria","pop_rocks"]; var lifeEaterSubstitutions = { "dirt": "life_eater_infected_dirt", - "crimsoil": "life_eater_infected_dirt" + "crimsoil": "life_eater_infected_dirt", + "rainbow_dirt": "life_eater_infected_dirt" }; @@ -14543,35 +14693,37 @@ Pixel size (rendering only): (Use if the save looks cut o //Hydrogen sulfide (in chem.js) _h_2s = ["hydrogen_sulfide","liquid_hydrogen_sulfide","hydrogen_sulfide_ice"]; - elements.hydrogen_sulfide.density = 1.19 * airDensity; - elements.hydrogen_sulfide.reactions ??= {}; - elements.hydrogen_sulfide.reactions.head = { elem2: "rotten_meat", chance: 0.4}; - elements.hydrogen_sulfide.fireColor = { elem2: "rotten_meat", chance: 0.4}; - elements.hydrogen_sulfide.tempHigh = 1200; - elements.hydrogen_sulfide.stateHigh = ["sulfur_gas","steam"]; - delete elements.sulfur_dioxide.reactions.water; - delete elements.sulfur_dioxide.reactions.steam; - delete elements.water.reactions.sulfur; - elements.sulfur_dioxide.tick = function(pixel) { - var neighbors = adjacentCoords.map(offsetPair => pixelMap[pixel.x+offsetPair[0]]?.[pixel.y+offsetPair[1]]).filter(function(pixelOrUndefined) { return typeof(pixelOrUndefined) == "object" }); - if(neighbors.length < 2) { return }; - var neighboringElements = neighbors.filter(function(px) { return !!px }).map(x => x.element); - var waterNeighbor = null; - var sulfideNeighbor = null; - for(var i = 0; i < neighboringElements.length; i++) { - if(_h_2s.includes(neighboringElements[i])) { - sulfideNeighbor = adjacentCoords[i]; - }; - if(wateroids.includes(neighboringElements[i])) { - waterNeighbor = adjacentCoords[i]; - }; - if(sulfideNeighbor && waterNeighbor) { - if(!sulfideNeighbor || isEmpty(sulfideNeighbor.x,sulfideNeighbor.y,true)) { return }; - changePixel(sulfideNeighbor,getStateAtTemp("sulfur",pixel.temp)); - changePixel(pixel,getStateAtTemp("water",pixel.temp)); + runAfterLoad(function() { + elements.hydrogen_sulfide.density = 1.19 * airDensity; + elements.hydrogen_sulfide.reactions ??= {}; + elements.hydrogen_sulfide.reactions.head = { elem2: "rotten_meat", chance: 0.4}; + elements.hydrogen_sulfide.fireColor = { elem2: "rotten_meat", chance: 0.4}; + elements.hydrogen_sulfide.tempHigh = 1200; + elements.hydrogen_sulfide.stateHigh = ["sulfur_gas","steam"]; + delete elements.sulfur_dioxide.reactions.water; + delete elements.sulfur_dioxide.reactions.steam; + delete elements.water.reactions.sulfur; + elements.sulfur_dioxide.tick = function(pixel) { + var neighbors = adjacentCoords.map(offsetPair => pixelMap[pixel.x+offsetPair[0]]?.[pixel.y+offsetPair[1]]).filter(function(pixelOrUndefined) { return typeof(pixelOrUndefined) == "object" }); + if(neighbors.length < 2) { return }; + var neighboringElements = neighbors.filter(function(px) { return !!px }).map(x => x.element); + var waterNeighbor = null; + var sulfideNeighbor = null; + for(var i = 0; i < neighboringElements.length; i++) { + if(_h_2s.includes(neighboringElements[i])) { + sulfideNeighbor = adjacentCoords[i]; + }; + if(wateroids.includes(neighboringElements[i])) { + waterNeighbor = adjacentCoords[i]; + }; + if(sulfideNeighbor && waterNeighbor) { + if(!sulfideNeighbor || isEmpty(sulfideNeighbor.x,sulfideNeighbor.y,true)) { return }; + changePixel(sulfideNeighbor,getStateAtTemp("sulfur",pixel.temp)); + changePixel(pixel,getStateAtTemp("water",pixel.temp)); + } } } - }; + }); //Carbon monoxide @@ -15728,7 +15880,7 @@ Pixel size (rendering only): (Use if the save looks cut o behavior: [ "XX|XX|XX", "M2|XX|M2", - "M1|M1|M1", + "M1|SW:dust AND M1|M1", ], tick: function(pixel) { //Code from R74n/vanilla "smash" tool var pX = pixel.x; @@ -16959,7 +17111,9 @@ Pixel size (rendering only): (Use if the save looks cut o //https://www.jamieswhiteshirt.com/minecraft/mods/gases/information/?Licensing //Coal exists in NM - elements.coal.breakInto = "coal_dust"; + runAfterLoad(function() { + elements.coal.breakInto = "coal_dust" + }); elements.coal_dust = { color: "#363023", @@ -20860,7 +21014,7 @@ Pixel size (rendering only): (Use if the save looks cut o if(crimsonObject[elementToCheck]) { changePixel(destPixel,crimsonObject[elementToCheck]); }; - grassSpread(pixel,["dirt","crimsoil"],"crimson_grass",0.5); + grassSpread(pixel,["dirt","crimsoil","rainbow_dirt"],"crimson_grass",0.5); }; }; }; @@ -21813,7 +21967,7 @@ Pixel size (rendering only): (Use if the save looks cut o return color; }; - var sands = ["sand", "dirt", "crimsoil"]; //Some sources suggest the existence of topsoil sediment, so for the purposes of sedimentary rock generation, dirt is now a sand /hj + var sands = ["sand", "dirt", "crimsoil", "rainbow_dirt"]; //Some sources suggest the existence of topsoil sediment, so for the purposes of sedimentary rock generation, dirt is now a sand /hj var wetSands = ["wet_sand", "mud"]; var sandSuspensions = []; var sandSediments = ["radioactive_sand_sediment","clay_sediment"]; @@ -23036,11 +23190,18 @@ Pixel size (rendering only): (Use if the save looks cut o sandstoneName = "soilstone"; //differentiated from mudstone, which is actually the *packed* dirt (analogously to sand's relationship to packed sand) dustName = "dirt_dust"; break; + case "rainbow_dirt": + suspensionName = "rainbow_muddy_water"; + wetSandName = "rainbow_mud"; + sedimentName = "rainbow_soil_sediment"; + sandstoneName = "rainbow_soilstone"; + dustName = "rainbow_dirt_dust"; + break; case "crimsoil": suspensionName = "crimmuddy_water"; - wetSandName = "crimmud"; //needs special code to not generate a wet dirt and instead use vanilla mud as the wet "sand" here + wetSandName = "crimmud"; sedimentName = "crimsoil_sediment"; - sandstoneName = "crimsoilstone"; //differentiated from mudstone, which is actually the *packed* dirt (analogously to sand's relationship to packed sand) + sandstoneName = "crimsoilstone"; dustName = "crimsoil_dust"; break; case 143: //sorry, i had to @@ -23126,7 +23287,7 @@ Pixel size (rendering only): (Use if the save looks cut o density: 1000 + (sandInfo.density * 0.06), conduct: 0.02, stain: 0.01, - _data: [sandInfo._data[0], sandInfo._data[1], "suspension"], + _data: [sandInfo?._data?.[0] ?? "unknown", sandInfo?._data?.[1] ?? "unknown", "suspension"], } if(elements[dustName]) { @@ -23193,7 +23354,7 @@ Pixel size (rendering only): (Use if the save looks cut o state: "solid", density: elements[wetSandName].density + 150, breakInto: sandName, - _data: [sandInfo._data[0], sandInfo._data[1], "sediment"], + _data: [sandInfo?._data?.[0] ?? "unknown", sandInfo?._data?.[1] ?? "unknown", "sediment"] }; //Final rock @@ -23209,6 +23370,8 @@ Pixel size (rendering only): (Use if the save looks cut o return elements.dry_dirt.tempHigh; case "crimsoil": return elements.crimsoil.tempHigh; + case "rainbow_dirt": + return elements.rainbow_dirt.tempHigh; default: return elements[sandName].tempHigh } @@ -23221,6 +23384,8 @@ Pixel size (rendering only): (Use if the save looks cut o return "magma"; case "dirt": return "hot_soilstone"; + case "rainbow_dirt": + return "hot_rainbow_dirt"; case "crimsoil": return "hot_crimsoilstone"; default: @@ -23238,7 +23403,7 @@ Pixel size (rendering only): (Use if the save looks cut o hardness: 0.5, breakInto: sandName, maxColorOffset: 30, - _data: [sandInfo._data[0], sandInfo._data[1]+"_sandstone", "sedimentary_rock"], + _data: [sandInfo?._data?.[0] ?? "unknown", (sandInfo?._data?.[1] ?? "unknown") + "_sandstone", "sedimentary_rock"], }; }; @@ -23463,9 +23628,14 @@ Pixel size (rendering only): (Use if the save looks cut o break; case "crimsoil": sandSuspensions.push("crimmuddy_water"); - sandSediments.push("scrimoil_sediment"); + sandSediments.push("crimsoil_sediment"); sandstones.push("crimsoilstone"); break; + case "rainbow_dirt": + sandSuspensions.push("rainbow_muddy_water"); + sandSediments.push("rainbow_soil_sediment"); + sandstones.push("rainbow_soilstone"); + break; default: sandSuspensions.push(sands[i] + "y_water"); sandSediments.push(sands[i] + "_sediment"); @@ -24229,6 +24399,7 @@ Pixel size (rendering only): (Use if the save looks cut o if(Math.random() < 0.02) { breakPixel(pixel) }; var colorWasHSL = pixel.color.startsWith("hsl"); var oldColor = convertHslObjects(normalizeColorToHslObject(pixel.color),"rgbjson"); + if(oldColor == null) { oldColor = pixelColorPick(pixel) }; oldColor.r += 81/2; oldColor.g += 60/2; oldColor.b += 56/2; @@ -24238,6 +24409,7 @@ Pixel size (rendering only): (Use if the save looks cut o if(Math.random() < 0.04) { breakPixel(pixel) }; var colorWasHSL = pixel.color.startsWith("hsl"); var oldColor = convertHslObjects(normalizeColorToHslObject(pixel.color),"rgbjson"); + if(oldColor == null) { oldColor = pixelColorPick(pixel) }; oldColor.r += 81/4; oldColor.g += 60/4; oldColor.b += 56/4; @@ -24247,6 +24419,7 @@ Pixel size (rendering only): (Use if the save looks cut o if(Math.random() < 0.06) { breakPixel(pixel) }; var colorWasHSL = pixel.color.startsWith("hsl"); var oldColor = convertHslObjects(normalizeColorToHslObject(pixel.color),"rgbjson"); + if(oldColor == null) { oldColor = pixelColorPick(pixel) }; oldColor.r += 81/7; oldColor.g += 60/7; oldColor.b += 56/7; @@ -24256,6 +24429,7 @@ Pixel size (rendering only): (Use if the save looks cut o if(Math.random() < 0.08) { breakPixel(pixel) }; var colorWasHSL = pixel.color.startsWith("hsl"); var oldColor = convertHslObjects(normalizeColorToHslObject(pixel.color),"rgbjson"); + if(oldColor == null) { oldColor = pixelColorPick(pixel) }; oldColor.r += 81/8; oldColor.g += 60/8; oldColor.b += 56/8; @@ -24790,13 +24964,21 @@ Pixel size (rendering only): (Use if the save looks cut o function newDirtType(names,dirtColor,density,meltingPoint,frostingPoint) { if(!(dirtColor instanceof Array)) { dirtColor = [dirtColor] }; - var mudColor = dirtColor.map(x => colorToHsl(x,"json")); mudColor.forEach(function(x) { x.s *= (41/21); x.l *= (26/15) }); mudColor = mudColor.map(function(x) { return hslToHex(...Object.values(x)) }); + var mudColor = dirtColor.map(x => colorToHsl(x,"json")); mudColor.forEach(function(x) { x.s *= (41/21); x.l *= (15/26) }); mudColor = mudColor.map(function(x) { return hslToHex(...Object.values(x)) }); if(mudColor.length == 1) { mudColor = mudColor[0] }; - var mudstoneColor = dirtColor.map(x => colorToHsl(x,"json")); mudstoneColor.forEach(function(x) { x.h += 6; x.s *= (41/21); x.l *= (26/15); x.l += 5 }); mudstoneColor = mudstoneColor.map(function(x) { return hslToHex(...Object.values(x)) }); + var mudstoneColor = dirtColor.map(x => colorToHsl(x,"json")); mudstoneColor.forEach(function(x) { x.h += 6; x.s *= (31/41); x.l *= (26/15); x.l += 5 }); mudstoneColor = mudstoneColor.map(function(x) { return hslToHex(...Object.values(x)) }); if(mudstoneColor.length == 1) { mudstoneColor = mudstoneColor[0] }; - var dryDirtColor = dirtColor.map(x => colorToHsl(x,"json")); dryDirtColor.forEach(function(x) { x.h += 4; x.s *= (8/11); x.l *= (34/50); x.l += 5 }); dryDirtColor = dryDirtColor.map(function(x) { return hslToHex(...Object.values(x)) }); + var dryDirtColor = dirtColor.map(x => colorToHsl(x,"json")); dryDirtColor.forEach(function(x) { x.h += 4; x.s *= (8/11); x.l *= (34/50); x.l += 5 }); dryDirtColor = dryDirtColor.map(function(x) { + x = convertHslObjects(x,"rgbjson"); + x.r += 10; + x.g += 5; //XG??!?!??!?!?!??!?!!??!?!?!?!??!?!?!?!/1/1/1?!/!?!?1?1??!/!1//! + x.b -= 10; + x.g *= 0.94; + x.b *= 0.88; + return convertColorFormats(x,"hex"); + }); if(dryDirtColor.length == 1) { dryDirtColor = dryDirtColor[0] }; var permafrostColor = dirtColor.map(x => colorToHsl(x,"json")); permafrostColor.forEach(function(x) { x.h -= 6; x.s *= (3/5); x.l -= 3 }); permafrostColor = permafrostColor.map(function(x) { return hslToHex(...Object.values(x)) }); @@ -24966,7 +25148,8 @@ Pixel size (rendering only): (Use if the save looks cut o elements.molten_crimsoil = { tempLow: elements.dry_crimsoil.tempHigh, - stateLow: "dry_crimsoil" + stateLow: "dry_crimsoil", + stateHigh: "crimson_magma" }; crimsonObject.dirt = "crimsoil"; crimsonObject.dry_dirt = "dry_crimsoil"; @@ -24976,6 +25159,7 @@ Pixel size (rendering only): (Use if the save looks cut o crimsonObject.molten_dirt = "molten_crimsoil"; crimsonObject.dry_permafrost = "dry_crimson_permafrost"; runAfterLoad(function() { + elements.molten_crimsoil.tempHigh = elements.crimson_magma.tempHigh; elements.crimsandy_water.color = ["#985460", "#a8606c", "#a05864", "#b46c74", "#84404c", "#985460", "#a8606c", "#a05864", "#b46c74", "#84404c", "#903844", "#b44450" ] //manual: use crimwater for the lerp in crimsand suspension's color elements.crimmuddy_water.color = ["#ed4154", "#f25259", "#f2444c", "#f25a62", "#df428d" ]; //same for crimsoil (crimmud) susp. elements.crimwater.reactions.crimsand = elements.water.reactions.crimsand; @@ -24993,6 +25177,7 @@ Pixel size (rendering only): (Use if the save looks cut o if(e2 == "water") { reactionObject.elem2 = "crimwater" }; }; elements.crimmuddy_water.reactions.crimmuddy_water.elem2 = "crimsoil_sediment"; + elements.rainbow_muddy_water.reactions.rainbow_muddy_water.elem2 = "rainbow_soil_sediment" elements.crimsoilstone.tempHigh = 800; }); @@ -25113,6 +25298,31 @@ Pixel size (rendering only): (Use if the save looks cut o nellfireImmune: true, }; + + + newDirtType( + {dirt: "rainbow_dirt", mud: "rainbow_mud", permafrost: "rainbow_permafrost", mudstone: "rainbow_mudstone"}, + "#b09eac #b0bfa1 #d9c0b6 #b09eac #b0bfa1 #d9c0b6 #ed7777 #a7d975 #7bd4d4 #ab77e0 #e0cf77".split(" "), + 1533, 942, -110 + ); + + elements.rainbow_dirt._data = ["iridian","soil","particulate"]; + elements.dry_rainbow_dirt._data = ["iridian","soil","particulate"]; + elements.rainbow_mud._data = ["iridian","soil","wet_particulate"]; + elements.rainbow_mudstone._data = ["iridian","soil","packed_particulate"]; + elements.rainbow_permafrost._data = ["iridian","soil","icy_particulate"]; + elements.dry_rainbow_permafrost._data = ["iridian","soil","particulate"]; + + elements.molten_rainbow_dirt = { + tempLow: elements.dry_rainbow_dirt.tempHigh, + stateLow: "dry_rainbow_dirt", + stateHigh: "rainbow_magma" + }; + runAfterLoad(function() { + elements.rainbow_soilstone.tempHigh = 800; + elements.molten_rainbow_dirt.tempHigh = elements.rainbow_magma.tempHigh; + }); + //Vanilla changes elements.water.reactions.rainbow_sand = { elem1: null, elem2: "wet_rainbow_sand" }; elements.water.reactions.wet_rainbow_sand = { "elem1": "rainbow_sand_water", "elem2": [ "rainbow_sand", "rainbow_sand", "rainbow_sand", "rainbow_sand_water" ], "chance": 0.01 }; @@ -25649,6 +25859,15 @@ Pixel size (rendering only): (Use if the save looks cut o break; }; break; + case "crystalline_sandstone": + case "soil_sandstone": + nellburnObject[name] = "nell_ash" + break; + case "sedimentary": + if(info._data[0] == "calcium") { + nellburnObject[name] = "black_limestone"; + break + }; default: console.log("Nellburn assignment: Unknown _data[1] value for element",name,info._data); }; @@ -26033,6 +26252,9 @@ Pixel size (rendering only): (Use if the save looks cut o case "soil_sandstone": crimsonObject[name] = "crimsoilstone" break; + case "rainbow_soil_sandstone": + crimsonObject[name] = "crimsoilstone" + break; case "magma": switch(info._data[2]) { case "liquid": @@ -26619,6 +26841,9 @@ Pixel size (rendering only): (Use if the save looks cut o elements.hot_crimsoilstone.stateHigh = "molten_crimsoil"; elements.crimsoil.tempHigh = 100; elements.crimsoil.stateHigh = "dry_crimsoil"; + elements.hot_rainbow_soilstone.stateHigh = "molten_rainbow_dirt"; + elements.rainbow_dirt.tempHigh = 100; + elements.rainbow_dirt.stateHigh = "dry_rainbow_dirt"; }); //Generation @@ -27230,7 +27455,7 @@ Pixel size (rendering only): (Use if the save looks cut o for(var name in customWorldTypes) { worldgentypes[name] = customWorldTypes[name] }; - rebuildWorldgenList() + runAfterLoad(rebuildWorldgenList) }; var promptInputNullishes = ["null","none","","n/a"]; @@ -29680,6 +29905,7 @@ Make sure to save your command in a file if you want to add this preset again.` }, insulate: true, onTryMoveInto: function(pixel,otherPixel) { + try { if(pixel._correspondingPortals == null) { return; }; @@ -29739,6 +29965,13 @@ Make sure to save your command in a file if you want to add this preset again.` } else { tryMove(otherPixel,destination.x,destination.y); }; + } catch(error) { + //ignore stack overflows + if(error.toString().includes("call stack")) { + } else { + throw new Error("error") + } + } }, tick: function(pixel) { pixel._channel = Math.floor(pixel.temp / 100); @@ -29758,6 +29991,8 @@ Make sure to save your command in a file if you want to add this preset again.` }, category: "machines", state: "solid", + breakInto: ["radiation","laser","iridium","essence","ionized_deuterium","electron","magic","steel","pop","unstable_mistake","explosion","magic","steel","proton","electron","radiation","laser","iridium"], + hardness: 0.999 }, elements.portal_out = { @@ -29770,6 +30005,8 @@ Make sure to save your command in a file if you want to add this preset again.` category: "machines", state: "solid", insulate: true, + breakInto: ["radiation","laser","iridium","essence","ionized_deuterium","electron","magic","steel","pop","unstable_mistake","explosion","magic","steel","proton","electron","radiation","laser","iridium"], + hardness: 0.999 } //MOBS ## @@ -34969,7 +35206,7 @@ Make sure to save your command in a file if you want to add this preset again.` bomb: { panicChange: 0.2, panicChangeChance: 0.4, moodChange: -0.3 }, tnt: { panicChange: 0.2, panicChangeChance: 0.4, moodChange: 0 }, dynamite: { panicChange: 0.2, panicChangeChance: 0.4, moodChange: -0.3 }, - anti_bomb: { panicChange: 0.2, panicChangeChance: 0.4, moodChange: -0.3 }, + upward_bomb: { panicChange: 0.2, panicChangeChance: 0.4, moodChange: -0.3 }, cluster_bomb: { panicChange: 0.2, panicChangeChance: 0.4, moodChange: -0.4 }, landmine: { panicChange: 0.25, panicChangeChance: 0.1, moodChange: -0.3 }, fireball: { panicChange: 0.25, panicChangeChance: 0.45, moodChange: -0.35 }, @@ -35861,6 +36098,39 @@ Make sure to save your command in a file if you want to add this preset again.` }; }; + elements.disappear = { + color: "#7f7f7f", + behavior: behaviors.SELFDELETE, + insulate: true, + temp: -273.15, + hardness: 0, + excludeRandom: true, + category: "other" + }; + + function forcebombVelocity(pixel,x,y,radius,fire,smoke,power,damage) { + var coords = circleCoords(pixel.x,pixel.y,radius); + for (var i = 0; i < coords.length; i++) { + var coordX = coords[i].x; + var coordY = coords[i].y; + if(!isEmpty(coordX,coordY,true)) { + let pixelle = pixelMap[coordX]?.[coordY]; + if(typeof(pixelle) !== "object" || pixelle === null) { continue }; + if(coordX === x && coordY === y) { + if(pixelle.element === "force_bomb") { fuckingDeletePixel(pixelle); continue } + }; + // set the pixelle.vx and pixelle.vy depending on the angle and power + var angle = Math.atan2(pixelle.y-y,pixelle.x-x); + pixelle.vx = Math.round(4 * (pixelle.vx|0) + (5 * Math.cos(angle) * (radius * power/5))); + pixelle.vx += (3 * Math.sign(pixelle.vx)); + pixelle.vx = Math.sign(pixelle.vx) == -1 ? bound(pixelle.vx,-100,0) : bound(pixelle.vx,0,100); + pixelle.vy = Math.round(4 * (pixelle.vy|0) + (5 * Math.sin(angle) * (radius * power/5))); + pixelle.vy += (3 * Math.sign(pixelle.vy)); + pixelle.vy = Math.sign(pixelle.vx) == -1 ? bound(pixelle.vy,-100,0) : bound(pixelle.vy,0,100); + } + }; + }; + function hotterBomb(pixel,x,y,radius,fire,smoke,power,damage) { //console.log(`Radius: ${radius}\nPower: ${power}\nPixel: (${pixel.x},${pixel.y})\nDamage: ${damage}`); //console.log(`Expected temperature increase for pixel at (${pixel.x},${pixel.y}): ${800 * ((1 + (7 * damage)) ** 2) * ((power ** 2) * 1.5)}`); @@ -36139,7 +36409,7 @@ Make sure to save your command in a file if you want to add this preset again.` tryBreak(newPixel,true,j == 0); if(!newPixel) { break } }; - //water reaction steal + //lava reaction steal if(data.reactions?.magma) { var magmaRxn = data.reactions.magma; var elem2 = magmaRxn.elem2; @@ -36149,6 +36419,18 @@ Make sure to save your command in a file if you want to add this preset again.` if(elem2 !== null) { changePixel(newPixel,elem2,true) } + } else if(elements.magma.reactions[newPixel.element]) { + var magmaRxn2 = elements.magma.reactions?.[newPixel.element]; + if(!magmaRxn2) { + } else { + elem2 = magmaRxn2.elem2; + while(Array.isArray(elem2)) { + elem2 = randomChoice(elem2) + }; + if(elem2 !== null) { + changePixel(newPixel,elem2,true) + } + } }; if(!newPixel) { continue }; newPixel.temp = Math.max(newPixel.temp,1400); pixelTempCheck(newPixel); @@ -36172,6 +36454,102 @@ Make sure to save your command in a file if you want to add this preset again.` density: elements.magma.density }; + elements.lava_megatsunami = { + color: ["#b32b10","#c24d1f","#d66924"], + behavior: behaviors.WALL, + properties: { + active: true, + }, + tick: function(pixel) { + //Iteration initial checks + if(!pixel) { + return; + }; + if(!pixel.active) { + deletePixel(pixel.x,pixel.y); + }; + + //Initial property-setting + var pixelIsOnLeft = (pixel.x < (width/2)); + pixel.fromX ??= pixelIsOnLeft ? 1 : width - 1; + pixel.direction ??= pixelIsOnLeft ? 1 : -1; + + var floorHeight = pixel.y + 1; + while(isEmpty(pixel.x,floorHeight,false)) { + floorHeight++ + }; + pixel.floorHeight ??= floorHeight; + + //Actual doer code + var bottomY = (pixel.floorHeight + 9); //extend 10 pixels below + var topY = bottomY - 43; //topY < bottomY because in this game +Y is *downward* + for(var h = 0; h < 2; h++) { + var newX = pixel.fromX + pixel.direction; + + if(outOfBounds(newX,1)) { + pixel.active = false; + return + }; + + for(var i = bottomY; i >= topY; i--) { + var fc = {x: newX, y: i}; + if(outOfBounds(fc.x,fc.y)) {continue}; + if(isEmpty(fc.x,fc.y,false)) { + //fill with lava + createPixelReturn("magma",fc.x,fc.y).temp = 1450; + } else { + var newPixel = pixelMap[fc.x]?.[fc.y]; + if(!newPixel) { continue }; + var data = elements[newPixel.element]; + //break + for(var j = 0; j < 3; j++) { + tryBreak(newPixel,true,j == 0); + if(!newPixel) { break } + }; + if(!newPixel) { continue }; + //lave reaction steal + if(data.reactions?.magma) { + var magmaRxn = data.reactions.magma; + var elem2 = magmaRxn.elem2; + while(Array.isArray(elem2)) { + elem2 = randomChoice(elem2) + }; + if(elem2 !== null) { + changePixel(newPixel,elem2,true) + } + } else if(elements.magma.reactions[newPixel.element]) { + var magmaRxn2 = elements.magma.reactions[newPixel.element]; + elem2 = magmaRxn2.elem2; + while(Array.isArray(elem2)) { + elem2 = randomChoice(elem2) + }; + if(elem2 !== null) { + changePixel(newPixel,elem2,true) + } + }; + if(!newPixel) { continue }; + newPixel.temp = Math.max(newPixel.temp,1450); pixelTempCheck(newPixel); + if(!newPixel) { continue }; + if(newPixel.element == "fire") { changePixelReturn(newPixel,"magma",true).temp = 1400 }; + if(data.burn) { newPixel.burning = true; newPixel.burnStart = pixelTicks }; + if(Math.random() < 0.1 && newPixel.burnInto) { finishBurn(newPixel) }; + if(newPixel.element == "fire") { changePixelReturn(newPixel,"magma",true).temp = 1400 }; + if(!newPixel) { continue }; + //add velocity; + newPixel.vx ??= 0; + newPixel.vy ??= 0; + newPixel.vx += (pixel.direction * 8) + newPixel.vy += 5; + }; + }; + pixel.fromX += pixel.direction + }; + }, + state: "solid", + category: "special", + density: elements.magma.density + }; + function empCharge(pixel,x,y,radius,fire,smoke,power,damage) { var info = elements[pixel.element]; if(info.conduct) { @@ -36906,7 +37284,7 @@ Make sure to save your command in a file if you want to add this preset again.` //Bombs - elements.anti_bomb = { + elements.upward_bomb = { color: "#625c71", behavior: [ "M2|M1 AND EX:10|M2", @@ -36929,6 +37307,7 @@ Make sure to save your command in a file if you want to add this preset again.` var newInfo = elements[newElement]; if(newInfo.state !== "gas" && newElement !== pixel.element) { explodeAtPlus(pixel.x,pixel.y,10,"fire,fire,fire,fire,fire,greek_fire","fire",null,firebombFire); + changePixel(pixel,"disappear"); }; }; if(!isEmpty(pixel.x,pixel.y+1,true)) { //[2][1] EX (don't ignore bounds, non-bound case) @@ -36937,10 +37316,12 @@ Make sure to save your command in a file if you want to add this preset again.` var newInfo = elements[newElement]; if(newInfo.state !== "gas" && newElement !== pixel.element) { explodeAtPlus(pixel.x,pixel.y,10,"fire,fire,fire,fire,fire,greek_fire","fire",null,firebombFire); + changePixel(pixel,"disappear"); }; }; if(outOfBounds(pixel.x,pixel.y+1)) { //[2][1] EX (don't ignore bounds, bound case) explodeAtPlus(pixel.x,pixel.y,10,"fire,fire,fire,fire,fire,greek_fire","fire",null,firebombFire); + changePixel(pixel,"disappear"); }; if(!tryMove(pixel,pixel.x,pixel.y+1)) { //behaviors.POWDER Math.random() < 0.5 ? tryMove(pixel,pixel.x-1,pixel.y+1) : tryMove(pixel,pixel.x+1,pixel.y+1); @@ -36953,6 +37334,69 @@ Make sure to save your command in a file if you want to add this preset again.` desc: "An advanced incendiary weapon.
To enable automatic bomb generation, set the generateBombs query parameter.", }; + function fuckingDeletePixel(pixel) { + if( + typeof(pixel) === "object" && + pixel !== null && + typeof(pixel?.x) === "number" && + typeof(pixel?.y) === "number" + ) { + var pX = pixel.x; + var pY = pixel.y; + deletePixel(pX,pY); + if(typeof(pixel) === "object" && pixel !== null) { + var index = currentPixels.indexOf(pixel); + if(index > 0) { + currentPixels.splice(index) + }; + pixelMap[pX][pY] = undefined + pixel = undefined + return + } + return + }; + return + }; + + elements.force_bomb = { + color: ["#7a6749", "#828680", "#89a6b6", "#91c5ed"], + tick: function(pixel) { + var radius = 8; + var fire = ["light",null,null,null,null,null,null,null]; + if(!isEmpty(pixel.x,pixel.y-1,true)) { //[0][1] EX (ignore bounds) + var newPixel = pixelMap[pixel.x][pixel.y-1]; + var newElement = newPixel.element; + var newInfo = elements[newElement]; + if(newInfo.state !== "gas" && newElement !== pixel.element) { + explodeAtPlus(pixel.x,pixel.y,radius+7,fire,null,null,forcebombVelocity); + fuckingDeletePixel(pixel); return + }; + }; + if(!isEmpty(pixel.x,pixel.y+1,true)) { //[2][1] EX (don't ignore bounds, non-bound case) + var newPixel = pixelMap[pixel.x][pixel.y+1]; + var newElement = newPixel.element; + var newInfo = elements[newElement]; + if(newInfo.state !== "gas" && newElement !== pixel.element) { + explodeAtPlus(pixel.x,pixel.y,radius+7,fire,null,null,forcebombVelocity); + fuckingDeletePixel(pixel); return + }; + }; + if(outOfBounds(pixel.x,pixel.y+1)) { //[2][1] EX (don't ignore bounds, bound case) + explodeAtPlus(pixel.x,pixel.y,radius+7,fire,null,null,forcebombVelocity); + fuckingDeletePixel(pixel); return + }; + if(!tryMove(pixel,pixel.x,pixel.y+1)) { //behaviors.POWDER + Math.random() < 0.5 ? tryMove(pixel,pixel.x-1,pixel.y+1) : tryMove(pixel,pixel.x+1,pixel.y+1); + }; + return + }, + category: "weapons", + state: "solid", + density: 2000, + excludeRandom: true, + desc: "A bomb that sends pixels flying.
To enable automatic bomb generation, set the generateBombs query parameter.", + }; + elements.cluster_nuke = { color: "#e3f636", behavior: [ @@ -36967,7 +37411,7 @@ Make sure to save your command in a file if you want to add this preset again.` desc: "It's a nuke that drops more nukes.
To enable automatic bomb generation, set the generateBombs query parameter.", }; - elements.anti_bomb = { + elements.upward_bomb = { color: "#525c61", behavior: [ "M2|M1 AND EX:10|M2", @@ -37246,7 +37690,7 @@ Make sure to save your command in a file if you want to add this preset again.` }; for (var i = 2; i <= bombAmount + 1; i++) { - elements[`anti_bomb_${i}`] = { + elements[`upward_bomb_${i}`] = { color: "#625c71", behavior: [ `M2|M1 AND EX:${5*(i+1)}>fire|M2`, @@ -37260,7 +37704,7 @@ Make sure to save your command in a file if you want to add this preset again.` desc: `${5*(i+1)/10} times the radius of the regular anti-bomb`, cooldown: defaultCooldown, }; - eLists.BOMB.push(`anti_bomb_${i}`); + eLists.BOMB.push(`upward_bomb_${i}`); }; //Fairies @@ -41519,13 +41963,7 @@ Make sure to save your command in a file if you want to add this preset again.` elements.global_heater = { color: "#ff6666", tick: function(pixel) { - for (var i = 1; i < width; i++) { - for (var j = 1; j < height; j++) { - if (!isEmpty(i,j)) { - pixelMap[i][j].temp++ - } - } - } + currentPixels.forEach(function(newPixel) {newPixel.temp++; pixelTempCheck(newPixel)}) }, category:"machines", insulate: true, @@ -41537,13 +41975,7 @@ Make sure to save your command in a file if you want to add this preset again.` elements.global_cooler = { color: "#6666ff", tick: function(pixel) { - for (var i = 1; i < width; i++) { - for (var j = 1; j < height; j++) { - if (!isEmpty(i,j)) { - pixelMap[i][j].temp <= -272 ? pixelMap[i][j].temp = -273 : pixelMap[i][j].temp -= 1 - } - } - } + currentPixels.forEach(function(newPixel) {newPixel.temp = Math.max(-273.15,newPixel.temp - 1); pixelTempCheck(newPixel)}) }, category:"machines", insulate: true, @@ -41555,13 +41987,7 @@ Make sure to save your command in a file if you want to add this preset again.` elements.global_warmer = { color: "#66ff66", tick: function(pixel) { - for (var i = 1; i < width; i++) { - for (var j = 1; j < height; j++) { - if (!isEmpty(i,j)) { - pixelMap[i][j].temp = 20 - } - } - } + currentPixels.forEach(function(newPixel) {newPixel.temp = 20; pixelTempCheck(newPixel)}) }, category: "machines", insulate: true, @@ -41570,24 +41996,18 @@ Make sure to save your command in a file if you want to add this preset again.` excludeRandom: true, }, - elements.agw = { //adjustable global warmer - name: "Adjustable Global Warmer", + elements.adjustable_global_heater = { color: "#66ff66", tick: function(pixel) { - for (var i = 1; i < width; i++) { - for (var j = 1; j < height; j++) { - if (!isEmpty(i,j)) { - pixelMap[i][j].temp = pixel.temp - doHeat(pixelMap[i][j]) - } - } - } + var thisPixel = pixel; + currentPixels.forEach(function(newPixel) {if(newPixel.element !== thisPixel.element) {newPixel.temp += thisPixel.temp; pixelTempCheck(newPixel)}}) }, category: "machines", insulate: true, state: "solid", hidden: true, excludeRandom: true, + temp: 1 }, elements.super_heater_3 = { @@ -42375,6 +42795,8 @@ Make sure to save your command in a file if you want to add this preset again.` hidden: true, }; + elements.paper.behavior = behaviors.SUPPORT; + elements.support_glass = JSON.parse(JSON.stringify(elements.glass)); elements.support_glass.stateHigh = "molten_glass"; elements.support_glass.behavior = behaviors.SUPPORT; @@ -42396,6 +42818,27 @@ Make sure to save your command in a file if you want to add this preset again.` hidden: true, }; + elements.hanging_bulb = { + color: "#a8a897", + behavior: [ + "XX|SP|XX", + "XX|XX|XX", + "M2|M1|M2" + ], + behaviorOn: [ + "XX|SP|XX", + "CR:light|XX|CR:light", + "M2|CR:light AND M1|M2" + ], + colorOn: "#ebebc3", + category: "machines", + tempHigh: 1500, + stateHigh: ["molten_glass","molten_glass","molten_copper"], + conduct: 1, + breakInto: "glass_shard", + hidden: true, + }; + elements.support_plastic = { color: "#c5dede", behavior: behaviors.SUPPORT, @@ -42485,16 +42928,57 @@ Make sure to save your command in a file if you want to add this preset again.` elements.steel.movable = false; elements.support_steel = { - color: "#71797E", + color: elements.steel.color, behavior: behaviors.SUPPORT, - tempHigh: 1455.5, + tempHigh: elements.steel.tempHigh, stateHigh: "molten_steel", category: "solids", - density: 7850, - conduct: 0.42, - hardness: 0.8, + density: elements.steel.density, + conduct: elements.steel.conduct, + hardness: elements.steel.hardness, }; + elements.support_aluminum = { + color: elements.aluminum.color, + behavior: behaviors.SUPPORT, + tempHigh: elements.aluminum.tempHigh, + stateHigh: "molten_aluminum", + category: "solids", + density: elements.aluminum.density, + conduct: elements.aluminum.conduct, + hardness: elements.aluminum.hardness, + }; + + elements.support_copper = { + color: elements.copper.color, + behavior: behaviors.SUPPORT, + tempHigh: elements.copper.tempHigh, + stateHigh: "molten_copper", + category: "solids", + density: elements.copper.density, + conduct: elements.copper.conduct, + hardness: elements.copper.hardness, + }; + + runAfterAutogen(function() { + for(var name in elements) { + var rxns = elements[name].reactions; + if(!rxns) { continue }; + if(typeof(rxns) == "object" && typeof(rxns["steel"]) === "object") { + rxns.support_steel = rxns.steel + }; + if(typeof(rxns) == "object" && typeof(rxns["aluminum"]) === "object") { + rxns.support_aluminum = rxns.aluminum + } + if(typeof(rxns) == "object" && typeof(rxns["copper"]) === "object") { + rxns.support_copper = rxns.copper + } + }; + elements.support_steel.reactions = elements.steel.reactions; + elements.support_aluminum.reactions = elements.aluminum.reactions; + elements.support_copper.reactions = elements.copper.reactions; + }); + var newAcidIgnores = ["glass_pane", "rad_glass_pane", "rad_glass_shard", "hanging_plastic"]; for(i = 0; i < newAcidIgnores.length; i++) { elements.acid.ignore.push(newAcidIgnores[i]); @@ -43772,7 +44256,7 @@ Make sure to save your command in a file if you want to add this preset again.` pixel._correspondingWifi = currentPixels.filter(function(pixelToCheck) { return ( pixelToCheck !== pixel && //should work if this pixel is the same as the other one by reference - ["wifi","receiver"].includes(pixelToCheck.element) && + ["wifi","receiver","support_receiver"].includes(pixelToCheck.element) && pixelToCheck._channel == pixelChannel ); },pixelChannel=pixel._channel).map(pixel => [pixel.x,pixel.y]); @@ -43839,17 +44323,53 @@ Make sure to save your command in a file if you want to add this preset again.` }, category: "machines", state: "solid", - } + }; + elements.support_receiver = { + color: "#bfff00", + behavior: behaviors.SUPPORT, + properties: { + _channel: 0 + }, + hardness: 0.8, + breakInto: ["plastic","steel","copper"], + conduct: 1, + insulate: true, + tick: function(pixel) { + pixel._channel = Math.floor(pixel.temp / 100); + + var colorBase = (pixel._channel + 3); + if(colorBase < 0 || colorBase > 124) { + pixel.color = "rgb(212,185,222)"; + } else { + colorBase = colorBase.toString(5).padStart(3,"0").split("").map(x => parseInt(x) * 64); + pixel.color = `rgb(${colorBase.join(",")})` + }; + + if(typeof(pixel.chargeCD) !== "undefined") { + pixel.chargeCD = Math.min(pixel.chargeCD,5); + pixel.chargeCD--; + if(pixel.chargeCD <= 0) { delete pixel.chargeCD }; + }; + if(pixel.charge) { + pixel.charge -= 0.25; + if(pixel.charge <= 0) { delete pixel.charge }; + }; + }, + category: "machines", + state: "solid", + }; + // SPINEL'S INJECTOR ## var injectorPoisonCategories = ["life","auto creepers","shit","cum","food","fantastic creatures","fey","auto_fey"]; var injectorPoisonBlacklist = ["injector_poison","dead_matter","poisoned_dirt"]; - var injectorPoisonWhitelist = ["blood","poop","blood_ice","wood","wood_plank","sawdust","straw","paper","birthpool","dried_poop","gloomfly","meat_monster","rotten_ravager","bone_beast","withery","withery_plant","banana","apple","rotten_apple","apioform_player","apioform_bee","apioform","apiodiagoform","sugar_cactus","sugar_cactus_seed","flowering_sugar_cactus","tree_branch","sap","silk","red_velvet","silk_velvet","ketchup", "enchanted_ketchup", "frozen_ketchup", "poisoned_ketchup", "frozen_poisoned_ketchup", "ketchup_spout", "ketchup_cloud", "poisoned_ketchup_cloud", "ketchup_snow", "ketchup_snow_cloud", "poisoned_ketchup_snow", "poisoned_ketchup_snow_cloud", "ketchup_gas", "poisoned_ketchup_gas", "ketchup_powder", "poisoned_ketchup_powder", "eketchup_spout", "ketchup_metal", "antiketchup", "dirty_ketchup", "ketchup_gold", "molten_ketchup_metal", "ketchup_fairy", "ketchup_metal_scrap", "ketchup_gold_scrap", "molten_ketchup_gold", "mycelium","vaccine","antibody","infection","sap","caramel","molasses","melted_chocolate","soda","mustard","fry_sauce","tomato_sauce","sugary_tomato_sauce","bio_ooze","zombie_blood","feather","tooth","decayed_tooth","plaque","tartar","bacteria","replacer_bacteria","pop_rocks"]; + var injectorPoisonWhitelist = ["blood","skin","hair","poop","blood_ice","wood","wood_plank","sawdust","straw","paper","birthpool","dried_poop","gloomfly","meat_monster","rotten_ravager","bone_beast","withery","withery_plant","banana","apple","rotten_apple","apioform_player","apioform_bee","apioform","apiodiagoform","sugar_cactus","sugar_cactus_seed","flowering_sugar_cactus","tree_branch","sap","silk","red_velvet","silk_velvet","ketchup", "enchanted_ketchup", "frozen_ketchup", "poisoned_ketchup", "frozen_poisoned_ketchup", "ketchup_spout", "ketchup_cloud", "poisoned_ketchup_cloud", "ketchup_snow", "ketchup_snow_cloud", "poisoned_ketchup_snow", "poisoned_ketchup_snow_cloud", "ketchup_gas", "poisoned_ketchup_gas", "ketchup_powder", "poisoned_ketchup_powder", "eketchup_spout", "ketchup_metal", "antiketchup", "dirty_ketchup", "ketchup_gold", "molten_ketchup_metal", "ketchup_fairy", "ketchup_metal_scrap", "ketchup_gold_scrap", "molten_ketchup_gold", "mycelium","vaccine","antibody","infection","sap","caramel","molasses","melted_chocolate","soda","mustard","fry_sauce","tomato_sauce","sugary_tomato_sauce","bio_ooze","zombie_blood","feather","tooth","decayed_tooth","plaque","tartar","bacteria","replacer_bacteria","pop_rocks"]; var injectorPoisonSubstitutions = { "dirt": "poisoned_dirt", "dry_dirt": "poisoned_dirt", "crimsoil": "poisoned_dirt", + "rainbow_dirt": "poisoned_dirt", "sand": "poisoned_dirt", "wet_sand": "poisoned_dirt", "mud": "poisoned_dirt", @@ -45401,13 +45921,15 @@ maxPixels (default 1000): Maximum amount of pixels/changes (if xSpacing and ySpa var notActuallyMovable = ["pipe","e_pipe","steel","vivite"]; - for(var i = 0; i < notActuallyMovable.length; i++) { - var name = notActuallyMovable[i]; - Object.defineProperty(elements[name], "movable", { - value: false, - writable: false //**** you, you're not changing it to true. - }); - }; + runAfterLoad(function() { + for(var i = 0; i < notActuallyMovable.length; i++) { + var name = notActuallyMovable[i]; + Object.defineProperty(elements[name], "movable", { + value: false, + writable: false //**** you, you're not changing it to true. + }); + } + }); elements.unknown = { color: "#FFFFFF", diff --git a/mods/flowers_and_forests.js b/mods/flowers_and_forests.js new file mode 100644 index 00000000..2ed866ce --- /dev/null +++ b/mods/flowers_and_forests.js @@ -0,0 +1,205 @@ +/* Flowers And Forests +Created by Pixelegend4 and SquareScreamYT +*/ + +elements.nutmeg = { + color: "#b86d42", + behavior: behaviors.POWDER, + category: "land", + state: "solid", + breakInto: "nutmeg_ground", +}; + +elements.nutmeg_drink = { + color: "#b86d42", + behavior: behaviors.LIQUID, + category: "land", + state: "solid", + reactions: { + "baked_batter": { elem1: "nutmeg_cake", elem2: "nutmeg_cake" }, + }, +}; +elements.nutmeg_cake = { + color: "#b86d42", + behavior: behaviors.SOLID, + category: "land", + state: "solid", +}; + +elements.nutmeg_ground = { + color: "#804d2f", + behavior: behaviors.POWDER, + category: "land", + state: "solid", + reactions: { + "water": { elem1: "nutmeg_drink", elem2: "nutmeg_drink" }, + }, +}; +elements.cactus = { + color: "#35ff08", + behavior: behaviors.SOLID, + category: "land", + state: "solid", + reactions: { + "human": { elem1: "blood", elem2: "blood" }, + "fly": { elem1: "blood", elem2: "blood" }, + "bee": { elem1: "honey", elem2: "honey" }, + }, +}; +elements.blue_cactus = { + color: "#0033FF", + behavior: behaviors.SOLID, + category: "land", + state: "solid", + reactions: { + "human": { elem1: null, elem2: "blood" }, + "fly": { elem1: null, elem2: "blood" }, + "bee": { elem1: null, elem2: "honey" }, + }, +}; +elements.sycamore_wood = { + color: "#632e1f", + behavior: behaviors.WALL, + tempHigh: 400, + stateHigh: ["ember","charcoal","fire","fire","fire"], + category: "solids", + burn: 5, + burnTime: 300, + burnInto: ["ember","charcoal","fire"], + state: "solid", + hardness: 0.15, + breakInto: "sawdust", + breakIntoColor: ["#dba66e","#cc8a64"], + hidden: true +} +elements.sycamore_branch = { + color: "#632e1f", + behavior: [ + "CR:sycamore_leaves,sycamore_branch%2|CR:sycamore_leaves,sycamore_branch%2|CR:sycamore_leaves,sycamore_branch%2", + "XX|XX|XX", + "XX|XX|XX", + ], + tempHigh: 100, + stateHigh: "sycamore_wood", + tempLow: -30, + stateLow: "sycamore_wood", + category: "life", + burn: 40, + burnTime: 50, + burnInto: ["sap","ember","charcoal"], + hidden: true, + state: "solid", + density: 1500, + hardness: 0.15, + breakInto: ["sap","sawdust"], +}; +elements.sycamore_leaves = { + color: ["#00d404","#0ec911","#109e12"], + behavior: [ + "XX|XX|XX", + "XX|XX|XX", + "XX|XX|XX", + ], + reactions: { + "vinegar": { elem1:"dead_plant", elem2:null, chance:0.035 }, + "baking_soda": { elem1:"dead_plant", elem2:null, chance:0.01 }, + "bleach": { elem1:"dead_plant", elem2:null, chance:0.05 }, + "alcohol": { elem1:"dead_plant", elem2:null, chance:0.035 } + }, + category:"life", + tempHigh: 100, + stateHigh: "dead_plant", + tempLow: -1.66, + stateLow: "frozen_plant", + burn:65, + burnTime:60, + burnInto: "dead_plant", + breakInto: "dead_plant", + state: "solid", + density: 1050, + hidden: true +} + +elements.sycamore_seed = { + color: "#854610", + tick: function(pixel) { + if (isEmpty(pixel.x,pixel.y+1)) { + movePixel(pixel,pixel.x,pixel.y+1); + } + else { + if (Math.random() < 0.02 && pixel.age > 50 && pixel.temp < 100) { + if (!outOfBounds(pixel.x,pixel.y+1)) { + var dirtPixel = pixelMap[pixel.x][pixel.y+1]; + if (dirtPixel.element === "dirt" || dirtPixel.element === "mud" || dirtPixel.element === "sand" || dirtPixel.element === "wet_sand" || dirtPixel.element === "clay_soil" || dirtPixel.element === "mycelium") { + changePixel(dirtPixel,"root"); + } + } + if (isEmpty(pixel.x,pixel.y-1)) { + movePixel(pixel,pixel.x,pixel.y-1); + createPixel(Math.random() > 0.5 ? "sycamore_wood" : "sycamore_branch",pixel.x,pixel.y+1); + } + } + else if (pixel.age > 1000) { + changePixel(pixel,"sycamore_wood"); + } + pixel.age++; + } + doDefaults(pixel); + }, + properties: { + "age":0 + }, + tempHigh: 100, + stateHigh: "dead_plant", + tempLow: -2, + stateLow: "frozen_plant", + burn: 65, + burnTime: 15, + category: "life", + state: "solid", + density: 1500, + cooldown: defaultCooldown, + seed: true, + behavior: [ + "XX|XX|XX", + "XX|FX%10|XX", + "XX|M1|XX", + ], +}; + +worldgentypes.fields = { + layers: [ + [0.75, "dirt"], + [0.05, "rock"], + [0, "basalt"], + ], + decor: [ + ["sapling", 0.04, 20], + ["grass", 0.25, 30], + ["grass", 0.25, 30], + ["bee", 0.02, 25], + ["cloud", 1, 2], + ], + baseHeight: 0.25 +} + +worldgentypes.sycamore_forest = { + layers: [ + [0.75, "dirt"], + [0.05, "dirt"], + ], + decor: [ + ["sycamore_seed", 0.04, 20], + ["sycamore_seed", 0.10, 20], + ["sycamore_seed", 0.13, 20], + ["grass", 0.25, 30], + ["cloud", 1, 2], + ], + baseHeight: 0.25 +}; +elements.onion = { + color: "#f5b042", + behavior: behaviors.POWDER, + category: "land", + state: "solid", +}; 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 diff --git a/mods/nousersthings.js b/mods/nousersthings.js index 5fc77088..003d7061 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'); @@ -2010,6 +2006,7 @@ elemfillerVar = 0; elements.element_filler = { category: "special", color: elements.filler.color, + excludeRandom: true, state: "solid", movable: "false", onSelect: function() { @@ -2039,4 +2036,59 @@ 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, + 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 } + 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) + } + } +} +textures.transparency = [ + "wwwggg", + "wwwggg", + "wwwggg", + "gggwww", + "gggwww", + "gggwww" +] +elements.transparency = { + color: ["#d4d4d4", "#ffffff"], + colorPattern: textures.transparency, + colorKey: { + "g": "#D4D4D4", + "w": "#ffffff" + }, + behavior: behaviors.WALL, + category: "special", + state: "solid" +} \ No newline at end of file diff --git a/mods/onecolor.js b/mods/onecolor.js new file mode 100644 index 00000000..2820328c --- /dev/null +++ b/mods/onecolor.js @@ -0,0 +1,47 @@ +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; + } +}); diff --git a/mods/singleColor.js b/mods/singleColor.js new file mode 100644 index 00000000..7d6e23a4 --- /dev/null +++ b/mods/singleColor.js @@ -0,0 +1,3 @@ +for (var element in elements) { + elements[element].singleColor = true; +} \ No newline at end of file diff --git a/mods/weapons.js b/mods/weapons.js index 04ed8a20..deeae4e4 100644 --- a/mods/weapons.js +++ b/mods/weapons.js @@ -96,4 +96,67 @@ elements.right_missile = { category: "weapons", state: "solid", density: 1300, +}, + elements.RL_cluster_munition = { + color: "#444444", + behavior: [ + "XX|XX|XX", + "CRcluster%20|XX|CR:cluster%20", + "M2|M1|M2", + ], + category: "weapons", + state: "solid", + density: 1300, +}, + elements.cluster = { + color: "#444444", + behavior: [ + "XX|EX:10%10|XX", + "XX|XX|XX", + "M2|M1 AND EX:10%10|M2", + ], + category: "weapons", + state: "solid", + density: 1300, + hidden: true, +}, + elements.machine_gun_left = { + color: "#C0C0C0", + behavior: [ + "XX|XX|XX", + "CR:left_bullet|XX|XX", + "XX|XX|XX", + ], + category: "weapons", + state: "solid", + density: 1300, +}, + elements.machine_gun_right = { + color: "#C0C0C0", + behavior: [ + "XX|XX|XX", + "XX|XX|CR:right_bullet", + "XX|XX|XX", + ], + category: "weapons", + state: "solid", + density: 1300, +}, +elements.left_bullet = { + color: "#4c4e42", + behavior: [ + "M2|XX|XX", + "M1 AND EX:5|XX|XX", + "M2|XX|XX", + ], + category:"weapons", +}, + elements.right_bullet = { + color: "#4c4e42", + behavior: [ + "XX|XX|M2", + "XX|XX|M1 AND EX:5", + "XX|XX|M2", + ], + category:"weapons", }; \ No newline at end of file