From 9f684cea36ef1a5dce20e2e5fe979b8bc3a50939 Mon Sep 17 00:00:00 2001 From: Retorta1 <165048795+Retorta1@users.noreply.github.com> Date: Tue, 26 Mar 2024 15:56:59 +0100 Subject: [PATCH 01/14] hu.json --- lang/hu.json | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/lang/hu.json b/lang/hu.json index 19ff0198..76076396 100644 --- a/lang/hu.json +++ b/lang/hu.json @@ -167,7 +167,7 @@ "clay":"agyag", "clay_soil":"agyagos_talaj", "brick":"tégla", -"ruins":"romok", +"ruins":"romos_tégla", "porcelain":"porcelán", "sapling":"csemete", "pinecone":"toboz", @@ -319,8 +319,8 @@ "particleboard":"farostlemez", "skin":"bőr", "hair":"haj", -"alcohol":"szesz", -"alcohol_gas":"szeszgőz", +"alcohol":"alkohol", +"alcohol_gas":"alkoholgőz", "basalt":"bazalt", "tuff":"tufa", "molten_tuff":"olvadt_tufa", @@ -452,7 +452,7 @@ "nuke":"atombomba", "h_bomb":"hidrogénbomba", "dirty_bomb":"piszkos_bomba", -"emp_bomb":"EMI-bomba", +"emp_bomb":"EMP-bomba", "nitro":"nitroglicerin", "greek_fire":"görögtűz", "fireball":"tűzgolyó", @@ -504,7 +504,7 @@ "broth_ice":"fagyott_leves_leve", "frozen_vinegar":"fagyott_ecet", "sauce_ice":"fagyott_szósz", -"alcohol_ice":"fagyott_szesz", +"alcohol_ice":"fagyott_alkohol", "bleach_ice":"fagyott_fehérítő", "chlorine_ice":"fagyott_klór", "frozen_ink":"fagyott_tinta", @@ -519,25 +519,25 @@ "molten_alga":"olvadt_alumínium-gallim_ötvözet", "molten_metal_scrap":"olvadt_fémtörmelék", "molten_borax":"olvadt_borax", -"molten_epsom_salt":"olvadt-epsom-só", -"molten_potassium_salt":"olvadt:kálium_só", +"molten_epsom_salt":"olvadt_epsom-só", +"molten_potassium_salt":"olvadt_kálium_só", "molten_sodium_acetate":"olvadt_nátrium-acetát", "frozen_nitro":"fagyott_nitroglicerin", -"cured_meat": "", -"nut_oil": "", -"grease": "", -"fat": "", -"potassium": "", -"molten_potassium": "", -"magnesium": "", -"molten_magnesium": "", -"sandstorm": "", -"caustic_potash": "", -"antibomb": "", -"tornado": "", -"earthquake": "", -"tsunami": "", -"blaster": "", -"propane_ice": "", -"molten_caustic_potash": "" -} \ No newline at end of file +"cured_meat": "sózott_hús", +"nut_oil": "mogyoró_olaj", +"grease": "zsiradék", +"fat": "zsír", +"potassium": "kálium", +"molten_potassium": "olvadt_kálium", +"magnesium": "magnézium", +"molten_magnesium": "olvadt_magnézium", +"sandstorm": "homokvihar", +"caustic_potash": "kálium-hidroxid", +"antibomb": "antibomba", +"tornado": "tornádó", +"earthquake": "földrengés", +"tsunami": "cunami", +"blaster": "plazmavető", +"propane_ice": "fagyott-propán", +"molten_caustic_potash": "olvadt_kálium-hidroxid" +} From 7d5dbbf9b0455bd5d7f6131d72659af9bf60fae6 Mon Sep 17 00:00:00 2001 From: Retorta1 <165048795+Retorta1@users.noreply.github.com> Date: Tue, 26 Mar 2024 16:37:34 +0100 Subject: [PATCH 02/14] Update hu.json --- lang/hu.json | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/lang/hu.json b/lang/hu.json index 19ff0198..7633a5d9 100644 --- a/lang/hu.json +++ b/lang/hu.json @@ -319,8 +319,8 @@ "particleboard":"farostlemez", "skin":"bőr", "hair":"haj", -"alcohol":"szesz", -"alcohol_gas":"szeszgőz", +"alcohol":"alkohol", +"alcohol_gas":"alkoholgőz", "basalt":"bazalt", "tuff":"tufa", "molten_tuff":"olvadt_tufa", @@ -504,7 +504,7 @@ "broth_ice":"fagyott_leves_leve", "frozen_vinegar":"fagyott_ecet", "sauce_ice":"fagyott_szósz", -"alcohol_ice":"fagyott_szesz", +"alcohol_ice":"fagyott_alkohol", "bleach_ice":"fagyott_fehérítő", "chlorine_ice":"fagyott_klór", "frozen_ink":"fagyott_tinta", @@ -519,25 +519,25 @@ "molten_alga":"olvadt_alumínium-gallim_ötvözet", "molten_metal_scrap":"olvadt_fémtörmelék", "molten_borax":"olvadt_borax", -"molten_epsom_salt":"olvadt-epsom-só", -"molten_potassium_salt":"olvadt:kálium_só", +"molten_epsom_salt":"olvadt_epsom-só", +"molten_potassium_salt":"olvadt_kálium_só", "molten_sodium_acetate":"olvadt_nátrium-acetát", "frozen_nitro":"fagyott_nitroglicerin", -"cured_meat": "", -"nut_oil": "", -"grease": "", -"fat": "", -"potassium": "", -"molten_potassium": "", -"magnesium": "", -"molten_magnesium": "", +"cured_meat": "sózott_hús", +"nut_oil": "mogyoróolaj", +"grease": "zsiradék", +"fat": "zsír", +"potassium": "kálium", +"molten_potassium": "olvadt_kálium", +"magnesium": "magnézium", +"molten_magnesium": "olvadt_magnézium", "sandstorm": "", -"caustic_potash": "", -"antibomb": "", -"tornado": "", -"earthquake": "", -"tsunami": "", -"blaster": "", -"propane_ice": "", -"molten_caustic_potash": "" -} \ No newline at end of file +"caustic_potash": "kálium-hidroxid", +"antibomb": "antibomba", +"tornado": "tornádó", +"earthquake": "földrengés", +"tsunami": "cunami", +"blaster": "plazmavető", +"propane_ice": "fagyott_propán", +"molten_caustic_potash": "Olvadt_kálium-hidroxid" +} From edb222d34edc0969c668d1ebca0a0f87ce9ad1e2 Mon Sep 17 00:00:00 2001 From: Tisquares <129683151+Tisquares@users.noreply.github.com> Date: Tue, 2 Apr 2024 22:09:43 -0500 Subject: [PATCH 03/14] Added community desserts mod This mod will continuously grow as community members pitch in with their favorite desserts to be added in! --- mods/community_desserts.js | 141 +++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 mods/community_desserts.js diff --git a/mods/community_desserts.js b/mods/community_desserts.js new file mode 100644 index 00000000..990f085a --- /dev/null +++ b/mods/community_desserts.js @@ -0,0 +1,141 @@ +/* + * Mod created by Tisquares + * Every dessert idea is provided by the community. + * Don't see your favorite dessert? Let me know! + * + * Got questions? Contact tisqbisque on Discord! + */ +// Dulce de leche items +elements.dulce_de_leche = { + color: ["#c56600","#f7a204","#ca6400","#893604"], + category: "Community", + behavior: behaviors.STURDYPOWDER, + tempHigh: 250, + stateHigh: ["fragrance","smoke","smoke"], + hidden: true, +} +elements.sweetened_condensed_milk = { + color: ["#ffe9ba","#fbd396","#fde2a9"], + category: "Community", + behavior: behaviors.LIQUID, + tempHigh: 175, + stateHigh: "dulce_de_leche", + hidden: true, +} + +// Chocotorta items +elements.cream_cheese = { + color: ["#ebe9ea","#e4dfdd","#eeeeee"], + category: "Community", + behavior: behaviors.SUPPORTPOWDER, + hidden: true, +} +elements.cocoa_bean = { + color: ["#e16f51","#e28e67","#e18550","#84574d"], + category: "Community", + behavior: behaviors.STURDYPOWDER, + breakInto: "cocoa_powder", +} +elements.cocoa_powder = { + color: ["#855344","#6d4c41","#40271d"], + behavior: behaviors.POWDER, + onMix: function(powder, doughcheck) { + if (doughcheck.name == "dough" && shiftDown && Math.random() < 0.01) { + changePixel(powder,"chocolate_biscuit_dough"); + changePixel(doughcheck,"chocolate_biscuit_dough"); + } + }, + category: "Community", + hidden: true, +} +elements.chocolate_biscuit_dough = { + name: "chocoBiscuitDough", + color: "#623727", + category: "Community", + behavior: behaviors.STURDYPOWDER, + tempHigh: 94, + stateHigh: "chocolate_biscuit", + burn: 40, + burnTime: 25, + burnInto: "ash", + state: "solid", + density: 526.9, + isFood: true, + hidden: true, +} +elements.chocolate_biscuit = { + name: "chocoBiscuit", + color: "#864B36", + behavior: behaviors.STURDYPOWDER, + tempHigh: 550, + stateHigh: ["smoke","smoke","smoke","ash"], + breakInto: "crumb", + state: "solid", + density: 233.96, + isFood: true, + category: "Community", + hidden: true, +} + +elements.dough.reactions = { + "water": { elem1: "dough", elem2: null }, + "salt_water": { elem1: "dough", elem2: null }, + "sugar_water": { elem1: "dough", elem2: null }, + "seltzer": { elem1: "dough", elem2: null }, + "pool_water": { elem1: "dough", elem2: null }, + "juice": { elem1: "dough", elem2: null }, + "vinegar": { 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 }, + "blood": { elem1:"dough", elem2:null }, + "infection": { elem1:"dough", elem2:null }, + "antibody": { elem1:"dough", elem2:null }, + "milk": { elem1:"dough", elem2:null }, + "cream": { elem1:"dough", elem2:null }, + // Start mod items here + "cocoa_powder": { elem1:"chocolate_biscuit_dough", elem2:null }, +} + +elements.milk.reactions = { + "melted_chocolate": { elem1:"chocolate_milk", elem2:null }, + "chocolate": { elem1:"chocolate_milk", elem2:"melted_chocolate", chance:0.05 }, + "coffee_ground": { elem1:"chocolate_milk", chance:0.05 }, + "juice": { elem1:"fruit_milk", elem2:null, chance:0.05 }, + "soda": { elem1:"pilk", elem2:null, chance:0.1 }, + "yolk": { elem1:"eggnog", elem2:null, chance:0.1 }, + "cell": { elem1:"yogurt", chance:0.1 }, + "ash": { elem1:"soap", chance:0.1 }, + "dirt": { elem1: null, elem2: "mud" }, + "sand": { elem1: null, elem2: "wet_sand" }, + "clay_soil": { elem1: null, elem2: "clay" }, + "caramel": { color1:"#C8B39A", elem2:null, chance:0.05 }, + // Start mod items here + "sugar": { elem1:"sweetened_condensed_milk", elem2:null, chance:0.05, tempMin:85 }, + "acid": { elem1:null, elem2:"cream_cheese", chance:0.8 }, +} + +elements.cream.reactions = { + "dirt": { elem1: null, elem2: "mud" }, + "sand": { elem1: null, elem2: "wet_sand" }, + "clay_soil": { elem1: null, elem2: "clay" }, + "melted_chocolate": { color1:"#664934", elem2:null }, + "chocolate": { color1:"#664934", elem2:"melted_chocolate", chance:0.05 }, + "juice": { elem1:"fruit_milk", elem2:null, chance:0.05 }, + "soda": { elem1:"pilk", elem2:null, chance:0.1 }, + "yolk": { elem1:"#eggnog", elem2:null, chance:0.1 }, + "caramel": { color1:"#C8B39A", chance:0.05 }, + "sugar": { elem2:null, chance:0.005}, + // Start mod items here + "acid": { elem1:null, elem2:"cream_cheese", chance:0.8 }, +} + +// Mod items first +elements.acid.ignore = ["cream_cheese","cream","milk", + "glass","rad_glass","glass_shard","rad_shard","stained_glass","baked_clay","acid_gas","neutral_acid","acid_cloud","water","salt_water","sugar_water","dirty_water","copper","gold","porcelain","plastic","bead","microplastic","molten_plastic","pool_water","chlorine","hydrogen","gold_coin","silver","nickel","calcium","bone"]; \ No newline at end of file From dac63ee5ed2591f7eb0c6e01955b3148bf484689 Mon Sep 17 00:00:00 2001 From: CarbonMonoxida <164758530+CarbonMonoxida@users.noreply.github.com> Date: Wed, 3 Apr 2024 13:56:15 +0700 Subject: [PATCH 04/14] Update and rename CoCpu.js to aScientistsWish.js Changelog: - 1. Add Blueberry stuffs and Gelatin - 2. Add Radioactive stuffs - 3. Rename CoCpu.js into aScientistWish.js --- mods/CoCpu.js | 111 ------------------- mods/aScientistsWish.js | 239 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 239 insertions(+), 111 deletions(-) delete mode 100644 mods/CoCpu.js create mode 100644 mods/aScientistsWish.js diff --git a/mods/CoCpu.js b/mods/CoCpu.js deleted file mode 100644 index 58bfe7da..00000000 --- a/mods/CoCpu.js +++ /dev/null @@ -1,111 +0,0 @@ -elements.carbon_monoxide = { - color: "#b5b5b5", - behavior: behaviors.GAS, - behaviorOn: [ - "XX|XX|XX", - "XX|CH:fire|XX", - "XX|XX|XX", - ], - category: "gases", - state: "gas", - density: 1.14, - burn: 75, - tempHigh: 609, - stateHigh: "fire", - tempLow: -192, - stateLow: "liquid_carbon_monoxide", - burntime: 5, - fireColor: "#ebba34", - reactions: { - "head": { elem2:"rotten_meat", chance:0.5 }, - "body": { elem2:"rotten_meat", chance:0.5 }, - "human": { elem2:"rotten_meat", chance:0.5 }, - "plant": { elem1: null }, - "bird": { elem2: "rotten_meat", }, - "frog": { elem2: "slime", }, - "grass": {elem1: null }, - "water": {elem1: null }, - } -}; -elements.liquid_carbon_monoxide = { - color: "#b5b5b5", - behavior: behaviors.LIQUID, - category: "liquids", - state: "liquid", - density: 1.14, - tempHigh: 190, - tempLow: -199, - stateLow: "ice_carbon_monoxide", - stateHigh: "carbon_monoxide", - temp: -192, -}; -elements.ice_carbon_monoxide = { - color: "#b5b5b5", - behavior: behaviors.WALL, - category: "solids", - state: "solid", - density: 1.14, - tempHigh: -192, - stateHigh: "liquid_carbon_monoxide", - temp: -199, -}; -elements.cpu = { - color: "#575757", - behavior: behaviors.SOLID, - category: "machines", - state: "solid", - density: 75, - tempHigh: 1414, - stateHigh: "explosion", -reactions: { - "virus": { elem1 : null , elem2:"malware", chance:0.9 }, - "battery": { elem2:"computer" }, - - } -}; - -elements.computer = { - color: "#2b2b2a", - behavior: behaviors.SOLID, - category: "machines", - state: "solid", - density: 8908, - tempHigh: 1414, - stateHigh: "explosion", -reactions: { - "virus": { elem1 : null , elem2:"malware", chance:0.9 }, - "water": { elem1: null , elem2: "electric" }, - } -}; -elements.carbon_monoxide_detector = { - behavior: behaviors.WALL, - desc: "give red light and electric when found Carbon Monoxide touch", - color: "#ffffff", - reactions: { - "carbon_monoxide": {"charge1":1}, - }, - conduct: 1, - tempHigh: 1550, - stateHigh: ["molten_metal_scrap","electric","molten_plastic"], - colorOn: "#ff0000", - movable: false, - category:"machines", - darkText: true, - hardness: 1, -}; - -elements.electrons = { - color: "#b80606", - behavior: [ - "XX|SH|XX", // shocks (adds charge) - "SH|DL%0.25|SH", - "XX|SH|XX", - ], - tick: behaviors.BOUNCY, - reactions: {}, - temp: 20, - category: "energy", - state: "gas", - density: 0.000003, - ignoreAir: true -} diff --git a/mods/aScientistsWish.js b/mods/aScientistsWish.js new file mode 100644 index 00000000..25e2647d --- /dev/null +++ b/mods/aScientistsWish.js @@ -0,0 +1,239 @@ +elements.carbon_monoxide = { + color: "#b5b5b5", + behavior: behaviors.GAS, + behaviorOn: [ + "XX|XX|XX", + "XX|CH:fire|XX", + "XX|XX|XX", + ], + category: "gases", + state: "gas", + density: 1.14, + burn: 75, + tempHigh: 609, + stateHigh: "fire", + tempLow: -192, + stateLow: "liquid_carbon_monoxide", + burntime: 5, + fireColor: "#ebba34", + reactions: { + "head": { elem1:"rotten_meat", chance:0.5 }, + "body": { elem1:"rotten_meat", chance:0.5 }, + "human": { elem1:"rotten_meat", chance:0.5 }, + } +}; +elements.liquid_carbon_monoxide = { + color: "#b5b5b5", + behavior: behaviors.LIQUID, + category: "liquids", + state: "liquid", + density: 1.14, + tempHigh: -190, + temp: -192, + tempLow: -199, + stateLow: "ice_carbon_monoxide", + stateHigh: "carbon_monoxide", +}; +elements.ice_carbon_monoxide = { + color: "#b5b5b5", + behavior: behaviors.WALL, + category: "solids", + state: "solid", + temp: -199, + density: 1.14, + tempHigh: -192, + stateHigh: "liquid_carbon_monoxide", +}; +elements.carbon_monoxide_detector = { + behavior: behaviors.WALL, + desc: "give red light and electric when found Carbon Monoxide touch", + color: "#ffffff", + reactions: { + "carbon_monoxide": {"charge1":1}, + }, + conduct: 1, + tempHigh: 1550, + stateHigh: ["molten_metal_scrap","electric","molten_plastic"], + colorOn: "#ff0000", + movable: false, + insulate: true, + noMix: true, + category:"machines", + darkText: true, + hardness: 1, +}; +elements.cpu = { + color: "#575757", + behavior: behaviors.SOLID, + category: "machines", + state: "solid", + insulate: true, + movable: false, + noMix: true, + density: 75, + tempHigh: 1414, + stateHigh: ["explosion","metal_scrap"], +reactions: { + "virus": { elem1 : null , elem2:"malware", chance:0.9 }, + "metal_scrap": { elem2:"computer" }, + + } +}; +elements.computer = { + color: "#2b2b2a", + behavior: behaviors.SOLID, + category: "machines", + state: "solid", + density: 8908, + insulate: true, + noMix: true, + movable: false, + tempHigh: 1414, + stateHigh: ["explosion","metal_scrap"], +reactions: { + "virus": { elem1 : null , elem2:"malware", chance:0.9 }, + "water": { elem1: null , elem2: "electric" }, + } +} +elements.electrons = { + color: "#b80606", + behavior: [ + "XX|SH|XX", // shocks (adds charge) + "SH|DL%0.25|SH", + "XX|SH|XX", + ], + tick: behaviors.BOUNCY, + reactions: {}, + temp: 20, + category: "energy", + state: "gas", + density: 0.000003, + ignoreAir: true, +}; +elements.gelatin = { + behavior: behaviors.SOLID, + category: "food", + state: "solid", + color: "#faf8ca", + breakInto: "gelatin_powder", + ignoreAir: true, + isFood: true, +}; +elements.gelatin_powder = { + behavior: behaviors.POWDER, + category: "food", + state: "powder", + color: "#edeb9f", + hidden: true, + ignoreAir: true, + isFood: true, +}; +elements.blueberries = { + behavior: behaviors.POWDER, + category: "food", + state: "solid", + color: ["#464196","#2e2b64"], + breakInto: "blueberries_juice", + ignoreAir: true, + isFood: true, + reactions: { + "sugar": { elem1: "blueberries_jam" }, + }, +}; +elements.blueberries_juice = { + behavior: behaviors.LIQUID, + category: "food", + state: "liquid", + color: "#1f1c42", + hidden: true, + tempHigh: 170, + stateHigh: ["steam","sugar"], + reactions: { + ignoreAir: true, + isFood: true, + "gelatin": { elem1: "blueberries_jelly", elem2: null }, + "gelatin_powder": { elem1: "blueberries_jelly", elem2: null }, + }, +}; +elements.blueberries_jam = { + behavior: behaviors.LIQUID, + category: "food", + viscosity: 5000, + state: "liquid", + tempHigh: 200, + stateHigh: ["smoke","sugar"], + color: "#080629", + hidden: true, + ignoreAir: true, + isFood: true, +}; +elements.blueberries_jelly = { + behavior: behaviors.LIQUID, + category: "food", + viscosity: 200000, + state: "liquid", + color: "#59559e", + hidden: true, + tempHigh: 200, + stateHigh: ["smoke","sugar"], + tempLow: -5, + stateLow: ["sugar_ice","sugar_ice","juice_ice"], + ignoreAir: true, + isFood: true, +}; +elements.fallout_drum = { + behavior: behaviors.WALL, + category: "radiated", + state: "solid", + density: 9000, + color: "#e3cc34", + breakInto: ["fallout","fallout"], + reactions: { + "water": { elem1:"fallout_drum", elem2:"radiated_water" }, + } +}; + +elements.radiated_water = { + behavior: behaviors.LIQUID, + category: "radiated", + state:"liquid", + density :1300, + color: ["#23d959","#29d65d"], + hidden: true, + reactions: { + "human": { elem2:"rotten_meat" }, + "body": { elem2:"rotten_meat" }, + "head": { elem2:"ash" }, + "bird": { elem2:"rotten_meat"}, + "cell": { elem2:"cancer"}, + } +}; + +elements.polluted_air = { + behavior: behaviors.GAS, + category: "radiated", + state:"gas", + density :10, + color: ["#60f53b","#65ba50"], + reactions: { + "body": { elem2:"rotten_meat" }, + "head": { elem2:"rotten_meat" }, + "human": { elem2:"rotten_meat" }, + "bird": { elem2:"rotten_meat" }, + "cell": { elem2:"cancer"}, + } +}; + +elements.siren = { + desc: "Detecting Nuclear Radiation Residues", + behavior: behaviors.WALL, + category: "machines", + state:"solid", + density :500, + color: "#808080", + reactions: { + "fallout": {"charge1":1}, + "radiated_water": {"charge1":1}, + "polluted_air": {"charge1":1}, + } +} From 7769259c9c53c84f0d7343f8bcf5e63ad3b7ff1f Mon Sep 17 00:00:00 2001 From: Tisquares <129683151+Tisquares@users.noreply.github.com> Date: Wed, 3 Apr 2024 19:00:50 -0500 Subject: [PATCH 05/14] Delete mods/community_desserts.js Gonna replace --- mods/community_desserts.js | 141 ------------------------------------- 1 file changed, 141 deletions(-) delete mode 100644 mods/community_desserts.js diff --git a/mods/community_desserts.js b/mods/community_desserts.js deleted file mode 100644 index 990f085a..00000000 --- a/mods/community_desserts.js +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Mod created by Tisquares - * Every dessert idea is provided by the community. - * Don't see your favorite dessert? Let me know! - * - * Got questions? Contact tisqbisque on Discord! - */ -// Dulce de leche items -elements.dulce_de_leche = { - color: ["#c56600","#f7a204","#ca6400","#893604"], - category: "Community", - behavior: behaviors.STURDYPOWDER, - tempHigh: 250, - stateHigh: ["fragrance","smoke","smoke"], - hidden: true, -} -elements.sweetened_condensed_milk = { - color: ["#ffe9ba","#fbd396","#fde2a9"], - category: "Community", - behavior: behaviors.LIQUID, - tempHigh: 175, - stateHigh: "dulce_de_leche", - hidden: true, -} - -// Chocotorta items -elements.cream_cheese = { - color: ["#ebe9ea","#e4dfdd","#eeeeee"], - category: "Community", - behavior: behaviors.SUPPORTPOWDER, - hidden: true, -} -elements.cocoa_bean = { - color: ["#e16f51","#e28e67","#e18550","#84574d"], - category: "Community", - behavior: behaviors.STURDYPOWDER, - breakInto: "cocoa_powder", -} -elements.cocoa_powder = { - color: ["#855344","#6d4c41","#40271d"], - behavior: behaviors.POWDER, - onMix: function(powder, doughcheck) { - if (doughcheck.name == "dough" && shiftDown && Math.random() < 0.01) { - changePixel(powder,"chocolate_biscuit_dough"); - changePixel(doughcheck,"chocolate_biscuit_dough"); - } - }, - category: "Community", - hidden: true, -} -elements.chocolate_biscuit_dough = { - name: "chocoBiscuitDough", - color: "#623727", - category: "Community", - behavior: behaviors.STURDYPOWDER, - tempHigh: 94, - stateHigh: "chocolate_biscuit", - burn: 40, - burnTime: 25, - burnInto: "ash", - state: "solid", - density: 526.9, - isFood: true, - hidden: true, -} -elements.chocolate_biscuit = { - name: "chocoBiscuit", - color: "#864B36", - behavior: behaviors.STURDYPOWDER, - tempHigh: 550, - stateHigh: ["smoke","smoke","smoke","ash"], - breakInto: "crumb", - state: "solid", - density: 233.96, - isFood: true, - category: "Community", - hidden: true, -} - -elements.dough.reactions = { - "water": { elem1: "dough", elem2: null }, - "salt_water": { elem1: "dough", elem2: null }, - "sugar_water": { elem1: "dough", elem2: null }, - "seltzer": { elem1: "dough", elem2: null }, - "pool_water": { elem1: "dough", elem2: null }, - "juice": { elem1: "dough", elem2: null }, - "vinegar": { 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 }, - "blood": { elem1:"dough", elem2:null }, - "infection": { elem1:"dough", elem2:null }, - "antibody": { elem1:"dough", elem2:null }, - "milk": { elem1:"dough", elem2:null }, - "cream": { elem1:"dough", elem2:null }, - // Start mod items here - "cocoa_powder": { elem1:"chocolate_biscuit_dough", elem2:null }, -} - -elements.milk.reactions = { - "melted_chocolate": { elem1:"chocolate_milk", elem2:null }, - "chocolate": { elem1:"chocolate_milk", elem2:"melted_chocolate", chance:0.05 }, - "coffee_ground": { elem1:"chocolate_milk", chance:0.05 }, - "juice": { elem1:"fruit_milk", elem2:null, chance:0.05 }, - "soda": { elem1:"pilk", elem2:null, chance:0.1 }, - "yolk": { elem1:"eggnog", elem2:null, chance:0.1 }, - "cell": { elem1:"yogurt", chance:0.1 }, - "ash": { elem1:"soap", chance:0.1 }, - "dirt": { elem1: null, elem2: "mud" }, - "sand": { elem1: null, elem2: "wet_sand" }, - "clay_soil": { elem1: null, elem2: "clay" }, - "caramel": { color1:"#C8B39A", elem2:null, chance:0.05 }, - // Start mod items here - "sugar": { elem1:"sweetened_condensed_milk", elem2:null, chance:0.05, tempMin:85 }, - "acid": { elem1:null, elem2:"cream_cheese", chance:0.8 }, -} - -elements.cream.reactions = { - "dirt": { elem1: null, elem2: "mud" }, - "sand": { elem1: null, elem2: "wet_sand" }, - "clay_soil": { elem1: null, elem2: "clay" }, - "melted_chocolate": { color1:"#664934", elem2:null }, - "chocolate": { color1:"#664934", elem2:"melted_chocolate", chance:0.05 }, - "juice": { elem1:"fruit_milk", elem2:null, chance:0.05 }, - "soda": { elem1:"pilk", elem2:null, chance:0.1 }, - "yolk": { elem1:"#eggnog", elem2:null, chance:0.1 }, - "caramel": { color1:"#C8B39A", chance:0.05 }, - "sugar": { elem2:null, chance:0.005}, - // Start mod items here - "acid": { elem1:null, elem2:"cream_cheese", chance:0.8 }, -} - -// Mod items first -elements.acid.ignore = ["cream_cheese","cream","milk", - "glass","rad_glass","glass_shard","rad_shard","stained_glass","baked_clay","acid_gas","neutral_acid","acid_cloud","water","salt_water","sugar_water","dirty_water","copper","gold","porcelain","plastic","bead","microplastic","molten_plastic","pool_water","chlorine","hydrogen","gold_coin","silver","nickel","calcium","bone"]; \ No newline at end of file From b09e0a7d5ca29c169d01625ad65bf9b2ccf050cb Mon Sep 17 00:00:00 2001 From: Tisquares <129683151+Tisquares@users.noreply.github.com> Date: Wed, 3 Apr 2024 19:03:50 -0500 Subject: [PATCH 06/14] Uploaded improved file New first version for approval --- mods/community_desserts.js | 164 +++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 mods/community_desserts.js diff --git a/mods/community_desserts.js b/mods/community_desserts.js new file mode 100644 index 00000000..54307048 --- /dev/null +++ b/mods/community_desserts.js @@ -0,0 +1,164 @@ +/* + * Mod created by Tisquares + * Every dessert idea is provided by the community. + * Don't see your favorite dessert? Let me know! + * + * Got questions? Contact tisqbisque on Discord! + */ +// Dulce de leche items - BASE COMPLETE +elements.dulce_de_leche = { + color: ["#c56600","#f7a204","#ca6400","#893604"], + category: "Community", + behavior: behaviors.STURDYPOWDER, + tempHigh: 250, + stateHigh: ["fragrance","smoke","smoke"], + hidden: true, + desc: "Added in the first version of the mod. From undexconocidox_26419.\n" +} +elements.sweetened_condensed_milk = { + color: ["#ffe9ba","#fbd396","#fde2a9"], + category: "Community", + behavior: behaviors.LIQUID, + tempHigh: 175, + stateHigh: "dulce_de_leche", + hidden: true, + desc: "Added in the first version of the mod. Made by mixing Milk and Sugar at 85°C+.\n", +} + +// Chocotorta items - BASE COMPLETE +elements.cream_cheese = { + color: ["#ebe9ea","#e4dfdd","#eeeeee"], + category: "Community", + behavior: behaviors.SUPPORTPOWDER, + hidden: true, + desc: "Added in the first version of the mod. Made by mixing Acid with Milk or Cream.\n", +} +elements.cocoa_bean = { + color: ["#e16f51","#e28e67","#e18550","#84574d"], + category: "Community", + behavior: behaviors.STURDYPOWDER, + breakInto: "cocoa_powder", + desc: "Added in the first version of the mod.\n", +} +elements.cocoa_powder = { + color: ["#855344","#6d4c41","#40271d"], + behavior: behaviors.POWDER, + onMix: function(powder, doughcheck) { + if (doughcheck.name == "dough" && shiftDown && Math.random() < 0.01) { + changePixel(powder,"chocolate_biscuit_dough"); + changePixel(doughcheck,"chocolate_biscuit_dough"); + } + }, + reactions: { + "dough": { elem1:null, elem2:"chocolate_biscuit_dough" }, + }, + category: "Community", + hidden: true, + desc: "Added in the first version of the mod. Made by Smashing Cocoa Bean.\n", +} +elements.chocolate_biscuit_dough = { + name: "choco_Biscuit_Dough", + color: "#623727", + category: "Community", + behavior: behaviors.STURDYPOWDER, + tempHigh: 94, + stateHigh: "chocolate_biscuit", + burn: 40, + burnTime: 25, + burnInto: "ash", + state: "solid", + density: 526.9, + isFood: true, + hidden: true, + desc: "Added in the first version of the mod. Made by mixing Cocoa Powder with Dough.\n", +} +elements.chocolate_biscuit = { + name: "choco_Biscuit", + color: "#864B36", + behavior: behaviors.STURDYPOWDER, + tempHigh: 550, + stateHigh: ["smoke","smoke","smoke","ash"], + breakInto: "crumb", + state: "solid", + density: 233.96, + isFood: true, + category: "Community", + hidden: true, + desc: "Added in the first version of the mod. Made by cooking Choco Biscuit Dough at 94°C+. Can be layered with other items to make chocotorta, from undexconocidox_26419.\n", +} + +// Haupia items - BASE COMPLETE +elements.coconut = { + color: ["#793b1e","#995c31","#5f3015"], + behavior: behaviors.POWDER, + breakInto: ["coconut_milk","tinder"], + category: "Community", + desc: "Added in the first version of the mod.\n", +} +elements.coconut_milk = { + color: ["#f3f3f3","#e4ddcb","#f8f8f8"], + behavior: behaviors.LIQUID, + category: "Community", + reactions: { + "sugar": { elem1:null, elem2:"haupia_mix", tempMin:90 }, + }, + density: 1031.33, + hidden: true, + desc: "Added in the first version of the mod. Made by smashing Coconut.\n", +} +elements.haupia_mix = { + color: ["#f3f3f3","#e4ddcb","#f8f8f8"], + behavior: behaviors.LIQUID, + tempLow: 3, + category: "Community", + stateLow: "haupia", + density: 1242.67, + hidden: true, + desc: "Added in the first version of the mod. Made by mixing Coconut Milk and Sugar at 90°C+.\n", +} +elements.haupia = { + color: ["#ffffff","#f8f8f8","#f7f9f8"], + behavior: behaviors.SUPPORT, + density: 1300, + category: "Community", + hidden: true, + desc: "Added in the first version of the mod. Made by cooling Haupia Mix at 3°C-. From tisqbisque.\n" +} + +// Adjusting existing elements here +elements.milk.reactions = { + "melted_chocolate": { elem1:"chocolate_milk", elem2:null }, + "chocolate": { elem1:"chocolate_milk", elem2:"melted_chocolate", chance:0.05 }, + "coffee_ground": { elem1:"chocolate_milk", chance:0.05 }, + "juice": { elem1:"fruit_milk", elem2:null, chance:0.05 }, + "soda": { elem1:"pilk", elem2:null, chance:0.1 }, + "yolk": { elem1:"eggnog", elem2:null, chance:0.1 }, + "cell": { elem1:"yogurt", chance:0.1 }, + "ash": { elem1:"soap", chance:0.1 }, + "dirt": { elem1: null, elem2: "mud" }, + "sand": { elem1: null, elem2: "wet_sand" }, + "clay_soil": { elem1: null, elem2: "clay" }, + "caramel": { color1:"#C8B39A", elem2:null, chance:0.05 }, + // Start mod items here + "sugar": { elem1:"sweetened_condensed_milk", elem2:null, chance:0.05, tempMin:85 }, + "acid": { elem1:null, elem2:"cream_cheese", chance:0.8 }, +} + +elements.cream.reactions = { + "dirt": { elem1: null, elem2: "mud" }, + "sand": { elem1: null, elem2: "wet_sand" }, + "clay_soil": { elem1: null, elem2: "clay" }, + "melted_chocolate": { color1:"#664934", elem2:null }, + "chocolate": { color1:"#664934", elem2:"melted_chocolate", chance:0.05 }, + "juice": { elem1:"fruit_milk", elem2:null, chance:0.05 }, + "soda": { elem1:"pilk", elem2:null, chance:0.1 }, + "yolk": { elem1:"#eggnog", elem2:null, chance:0.1 }, + "caramel": { color1:"#C8B39A", chance:0.05 }, + "sugar": { elem2:null, chance:0.005}, + // Start mod items here + "acid": { elem1:null, elem2:"cream_cheese", chance:0.8 }, +} + +// Mod items first +elements.acid.ignore = ["cream_cheese","cream","milk", + "glass","rad_glass","glass_shard","rad_shard","stained_glass","baked_clay","acid_gas","neutral_acid","acid_cloud","water","salt_water","sugar_water","dirty_water","copper","gold","porcelain","plastic","bead","microplastic","molten_plastic","pool_water","chlorine","hydrogen","gold_coin","silver","nickel","calcium","bone"]; \ No newline at end of file From e870d6dbd374c7bcb46b6821e5c3c7c81f8a503a Mon Sep 17 00:00:00 2001 From: Mecoolnotcool <106288499+Mecoolnotcool@users.noreply.github.com> Date: Wed, 3 Apr 2024 19:33:52 -0500 Subject: [PATCH 07/14] Update ExtraMachines.js --- mods/ExtraMachines.js | 785 +++++++++++++++++++++++++++++------------- 1 file changed, 539 insertions(+), 246 deletions(-) diff --git a/mods/ExtraMachines.js b/mods/ExtraMachines.js index 56cf9d9a..25520dd7 100644 --- a/mods/ExtraMachines.js +++ b/mods/ExtraMachines.js @@ -1,24 +1,25 @@ // this is a epic mod -let heatSen = null; +heatSen = null; elements.heatSensor = { - + color: "#ff0000", - conduct: 1, + conduct: 0.1, category:"test", behavior: behaviors.WALL, onSelect: function(pixel){ - setTemp = parseInt(prompt("Enter the temperature you want it to sense. zero will not work", (heatSen || undefined))); + heatSen = prompt("Enter the temperature you want it to sense" ); }, tick: function(pixel) { - + if (pixel.temp >= heatSen ) { pixel.charge = 1; + } @@ -26,15 +27,13 @@ elements.heatSensor = { }; -let itemA = "steam"; + elements.SteamTurbine = { behavior: behaviors.WALL, desc: "When steam touches it, it conducts electricity and the steam pixel is deleted", - color: "#826c6e", + color: "#826c6e", tick: function(pixel) { - if(pixel.start == pixelTicks){ - pixel.clone = itemA; - } + for (var i = 0; i < adjacentCoords.length; i++) { var coords = adjacentCoords[i]; @@ -42,7 +41,7 @@ elements.SteamTurbine = { var y = pixel.y + coords[1]; if (!isEmpty(x,y,true)) { var sensed = pixelMap[x][y]; - if (sensed.element == pixel.clone) { + if (sensed.element == 'steam' ||sensed.element == 'rad_steam' ) { deletePixel(x,y); pixel.charge = 5; break; @@ -131,15 +130,13 @@ elements.gasoline = { stain: -0.25, } -let itemB = "light"; + elements.solar_panel = { behavior: behaviors.WALL, desc: "When light touches it, it conducts electricity and the light pixel is deleted", color: "#bebfa3", tick: function(pixel) { - if(pixel.start == pixelTicks){ - pixel.clone = itemB; - } + for (var i = 0; i < adjacentCoords.length; i++) { var coords = adjacentCoords[i]; @@ -147,7 +144,7 @@ elements.solar_panel = { var y = pixel.y + coords[1]; if (!isEmpty(x,y,true)) { var sensed = pixelMap[x][y]; - if (sensed.element == pixel.clone) { + if (sensed.element == 'light') { deletePixel(x,y); pixel.charge = 5; break; @@ -367,9 +364,10 @@ elements.Android = { elements.AndroidBody = { + color: ["#a1ada5","#ebf5ee","#bac2bc","#848a86","#505251"], category: "life", - breakInto: ["oil","metal_scrap","explosion"], + breakInto: ["oil","metal_scrap","pop"], properties: { dead: false, dir: 1, @@ -395,7 +393,7 @@ elements.AndroidBody = { if (pixel.dead) { // Turn into rotten_meat if pixelTicks-dead > 500 if (pixelTicks-pixel.dead > 200 && Math.random() < 0.1) { - changePixel(pixel,"rotten_meat"); + changePixel(pixel,"rust"); } return } @@ -465,7 +463,7 @@ elements.AndroidHead = { state: "solid", conduct: .05, temp: 69, - breakInto: ["oil","metal_scrap","explosion"], + breakInto: ["oil","metal_scrap","pop"], }; listPipes = "pipe" @@ -506,71 +504,10 @@ elements.ajustableHeater = { insulate:true }; -//old grinder -// elements.grinder = { - // color: ["#a1ada5","#ebf5ee","#bac2bc","#848a86","#505251"], - // category: "machines", - // density: 1080, - // state: "solid", - // conduct: 1, - // movable: false, - - // ignore: "grinder", - - // tick: function(pixel) { - // for (var i = 0; i < adjacentCoords.length; i++) { - // var coords = adjacentCoords[i]; - // var x = pixel.x + coords[0]; - // var y = pixel.y + coords[1]; - // if (!isEmpty(x,y,true)) { - // var sensed = pixelMap[x][y]; - // if (sensed.con || elements[sensed.element].movable && pixel.charge > 0) { - // breakPixel(sensed); - // } - // } - // } - // doDefaults(pixel); - // }, - // insulate:true - - - -// }; - elements.dead_plant.conduct = 1; -// let compact = "dead_plant"; -// elements.compacter = { - // behavior: behaviors.WALL, - // color: "#bebfa3", - // tick: function(pixel) { - // if(pixel.start == pixelTicks){ - // pixel.clone = compact; - // } - - // for (var i = 0; i < adjacentCoords.length; i++) { - // var coords = adjacentCoords[i]; - // var x = pixel.x + coords[0]; - // var y = pixel.y + coords[1]; - // if (!isEmpty(x,y,true)) { - // var sensed = pixelMap[x][y]; - // if (sensed.element == pixel.clone && pixel.charge > 0) { - // sensed.element = "coal" - // sensed.color = elements.coal.color - // break; - // } - // } - // } - // doDefaults(pixel); - // }, - // conduct: 1, - // movable: false, - // category:"machines", - // darkText: true, - // hardness: 1, -// } compactPi = "dead_plant"; compactPi2 = "coal"; elements.compacter = { @@ -703,60 +640,66 @@ elements.compacter = { // thx to nousersthings mod for the filter // only adding this bc my freind told me so -// im not good at javascript and coding so yeah +// new and improved version which is not 100% copied from nouser but only about 5-10% filterTypeVar = 0; elements.filter = { - color: "#599fc2", + desc: "A filter made by nouser", onSelect: function() { + logMessage("Needs to be 1 pixel thick"); var answer4 = prompt("Please input the desired element of this filter. It is case senstive.",(filterTypeVar||undefined)); if (!answer4) { return } filterTypeVar = answer4; }, + color: "#414c4f", + tick: function(pixel) { - if (pixel.start === pixelTicks) { - pixel.filterType = filterTypeVar - } - if (1 === 2) { - 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)) { -// createPixel("brick",x,y); -// pixelMap[x][y].color = pixelColorPick(pixel,"#808080"); - } - } - // pixel.stage = 1; - } - else if (1 === 2) { //uninitialized - for (var i = 0; i < adjacentCoords.length; i++) { - var coord = adjacentCoords[i]; - var x = pixel.x+coord[0]; - var y = pixel.y+coord[1]; - if (isEmpty(x,y)) { - // pixel.stage = 2; //blue - // pixel.color = pixelColorPick(pixel,"#000036"); - break; - } - } - } - else if (1 === 1) { //initialized + + if (!pixel.stage && pixelTicks-pixel.start > 60) { 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) && listPipes.includes(pixelMap[x][y].element)) { + // delete this bc it makes the pipe walls + // if (!isEmpty(x,y,true) && elements[pixelMap[x][y].element].movable) { + // deletePixel(x,y) + // } + // if (isEmpty(x,y)) { + // createPixel("pipe_wall",x,y); + // } + } + pixel.stage = 2; + } + else if (pixel.stage === 1 && pixelTicks-pixel.start > 70) { //uninitialized + for (var i = 0; i < adjacentCoords.length; i++) { + var coord = adjacentCoords[i]; + var x = pixel.x+coord[0]; + var y = pixel.y+coord[1]; + pixel.stage = 2; + // this makes the thing blue and keep pixel.stage = 2 cuz without it it breaks the code + // if (isEmpty(x,y)) { + // pixel.stage = 2; //blue + // pixel.color = pixelColorPick(pixel,"#000036"); + // break; + // } + } + } + else if (pixel.stage > 1 && pixelTicks % 3 === pixel.stage-2) { //initialized + 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) && pixelMap[x][y].element === "pipe") { var newPixel = pixelMap[x][y]; if (newPixel.stage === 1) { var newColor; switch (pixel.stage) { -// case 2: newPixel.stage = 3; newColor = "#003600"; break; //green - // case 3: newPixel.stage = 4; newColor = "#360000"; break; //red -// case 4: newPixel.stage = 2; newColor = "#000036"; break; //blue + case 2: newPixel.stage = 3; newColor = "#003600"; break; //green + case 3: newPixel.stage = 4; newColor = "#360000"; break; //red + case 4: newPixel.stage = 2; newColor = "#000036"; break; //blue } - // newPixel.color = pixelColorPick(newPixel,newColor); + newPixel.color = pixelColorPick(newPixel,newColor); } } } @@ -768,14 +711,12 @@ elements.filter = { var y = pixel.y+coord[1]; if (!isEmpty(x,y,true)) { var newPixel = pixelMap[x][y]; - if (listPipes.includes(newPixel.element)) { + if (newPixel.element === "pipe") { var nextStage; switch (pixel.stage) { - // case 2: nextStage = 4; break; //green -// case 3: nextStage = 2; break; //red - // case 4: nextStage = 3; break; //blue + } - if (pixel.con && !newPixel.con) { //transfer to adjacent pipe + if (pixel.con && !newPixel.con && newPixel.stage === nextStage) { //transfer to jacent pipe newPixel.con = pixel.con; newPixel.con.x = newPixel.x; newPixel.con.y = newPixel.y; @@ -784,18 +725,14 @@ elements.filter = { break; } } - else if (!pixel.con ) { //suck up pixel - if (newPixel.element == pixel.filterType ) { - + else if (!pixel.con && elements[newPixel.element].movable && newPixel.element == filterTypeVar) { //suck up pixel pixel.con = newPixel; - deletePixel(newPixel.x,newPixel.y); pixel.con.x = pixel.x; pixel.con.y = pixel.y; pixel.con.del; moved = true; break; - } } } } @@ -804,7 +741,7 @@ elements.filter = { var coord = squareCoordsShuffle[i]; var x = pixel.x+coord[0]; var y = pixel.y+coord[1]; - if (isEmpty(x,y)) { + if (isEmpty(x,y)) { delete pixel.con.del; pixel.con.x = x; pixel.con.y = y; @@ -813,9 +750,9 @@ elements.filter = { pixel.con = null; break; } - if (!isEmpty(x,y,true) && listPipes.includes(pixelMap[x][y].element)) { + if (!isEmpty(x,y,true) && pixelMap[x][y].element === "pipe") { var newPixel = pixelMap[x][y]; - if (pixel.con && !newPixel.con) { + if (pixel.con && !newPixel.con && newPixel.stage === pixel.stage) { newPixel.con = pixel.con; newPixel.con.x = newPixel.x; newPixel.con.y = newPixel.y; @@ -831,8 +768,6 @@ elements.filter = { category: "machines", movable: false, canContain: true, - noMix: true, - insulate: true, } filterTypeVar2 = 0; @@ -926,11 +861,7 @@ elements.Destructive_Filter = { moved = true; break; } - else if(!(newPixel.element == "filter") && !(newPixel.element == "Destructive_Filter") && !doNotEF.includes(newPixel.element) ) { - deletePixel(newPixel.x, newPixel.y); - break; - - } + } } } @@ -1256,6 +1187,7 @@ elements.Acid_Bomb = { } elements.E_Spout = { + name: "E-Spout", color: "#606378", behavior: behaviors.WALL, behaviorOn: [ @@ -1269,7 +1201,6 @@ elements.E_Spout = { conduct: 1, } - elements.DestroyableWire = { color: "#4d0a03", behavior: behaviors.WALL, @@ -1356,54 +1287,6 @@ elements.pusherRight = { }, category: "tools", }; - -elements.missile = { - behavior: behaviors.WALL, - maxSize: 1, - - properties: { - luanched : false, - }, - ignore: "pushTest", - tick: function(pixel) { - - for (var i = 0; i < adjacentCoords.length; i++) { - var coords = adjacentCoords[i]; - var x = pixel.x + coords[0]; - var y = pixel.y + coords[1]; - if (!isEmpty(x,y,true)) { - let sensed = pixelMap[x][y]; - if (!(sensed.element == "missile") && sensed.element && !(sensed.element == "fire") && !(sensed.element == "smoke") && pixel.luanched == true || pixel.y ==1 ||outOfBounds(pixel.x,pixel.y) ) { - explodeAt(x, y, 13, ["fire","fire","plasma","plasma","plasma","plasma"]); - explodeAt(x, y, 5, "molten_metal_scrap"); - deletePixel(pixel.x,pixel.y); - } - - } else if(pixel.temp >= 100) { - - pixel.luanched = true; - pixel.clone = "fire"; - var newX = pixel.x ; - var newY = pixel.y - 0.5; - let test = createPixel("fire",pixel.x,pixel.y+2); - tryMove(pixel,newX,newY,test); - - - - } - - } - doDefaults(pixel); - }, - conduct: 1, - movable: true, - category:"weapons", - darkText: true, - hardness: 1, - - - } - elements.NewWater = { color: elements.water.color, behavior : behaviors.LIQUID, @@ -1645,78 +1528,209 @@ elements.guided_missile = { }, properties: { luanched : false, - speed :1, + speed :2, AtY : false, }, tick: function(pixel) { - if(pixel.start == pixelTicks){ + + if(pixel.temp >= 100) { + + pixel.luanched = true; + pixel.clone = "fire"; + var newX = pixel.x ; + var newY = pixel.y - pixel.speed; - } - for (var i = 0; i < adjacentCoords.length; i++) { - var coords = adjacentCoords[i]; - var x = pixel.x + coords[0]; - var y = pixel.y + coords[1]; - if (!isEmpty(x,y,true)) { - let sensed = pixelMap[x][y]; - if (!(sensed.element == "missile") &&!(sensed.element == "guided_missile") && sensed.element && !(sensed.element == "fire") && !(sensed.element == "smoke") && pixel.luanched == true || pixel.y ==1 ||outOfBounds(pixel.x,pixel.y)) { - explodeAt(x, y, 13, ["fire","fire","plasma","plasma","plasma","plasma"]); - explodeAt(x, y, 5, "molten_metal_scrap"); - deletePixel(pixel.x,pixel.y); - } - - } else if(pixel.temp >= 100) { - - pixel.luanched = true; - pixel.clone = "fire"; - var newX = pixel.x ; - var newY = pixel.y - pixel.speed; - - - if (!(pixel.y == tarY) && pixel.y > tarY ) { - let test = createPixel("fire",pixel.x,pixel.y+2); - tryMove(pixel,newX,newY,test); - pixel.AtY = true; - - } - else if(!(pixel.y == tarY) && pixel.y < tarY ){ - let test = createPixel("fire",pixel.x,pixel.y-2); - tryMove(pixel,pixel.x,pixel.y + pixel.speed,test); - pixel.AtY = true; + + if (!(pixel.y == tarY) && pixel.y > tarY ) { + if((!tarY-pixel.y === 1) || (!tarY-pixel.y === -1)) { + let test = createPixel("fire",pixel.x,pixel.y+3); + if(isEmpty(newX,newY)) { + tryMove(pixel,newX,newY,); + } else { + explodeAt(pixel.x, pixel.y, 13, ["fire","fire","plasma","plasma","plasma","plasma"]); - } - else if(pixel.AtY = true) { - if(pixel.x > tarX) { - let test = createPixel("fire",pixel.x,pixel.y); - tryMove(pixel,pixel.x-pixel.speed,pixel.y,test); + deletePixel(pixel.x,pixel.y); + } + + pixel.AtY = true; + } else { + pixel.speed = 1; + let test = createPixel("fire",pixel.x,pixel.y+3); + if(isEmpty(newX,newY)) { + tryMove(pixel,newX,newY,); + } else { + explodeAt(pixel.x, pixel.y, 13, ["fire","fire","plasma","plasma","plasma","plasma"]); + + deletePixel(pixel.x,pixel.y); + } + + //pixel.AtY = true; + } + + } + else if(!(pixel.y == tarY) && pixel.y < tarY ){ + if((!tarY-pixel.y === 1) || (!tarY-pixel.y === -1)) { + let test = createPixel("fire",pixel.x,pixel.y-3); + if(isEmpty(pixel.x,pixel.y+pixel.speed)) { + tryMove(pixel,pixel.x,pixel.y + pixel.speed,); + } else { + explodeAt(pixel.x, pixel.y, 13, ["fire","fire","plasma","plasma","plasma","plasma"]); + + deletePixel(pixel.x,pixel.y); } - else if(pixel.x < tarX) { - let test = createPixel("fire",pixel.x,pixel.y); - tryMove(pixel,pixel.x+pixel.speed,pixel.y,test); - + + pixel.AtY = true; + } else { + pixel.speed = 1; + let test = createPixel("fire",pixel.x,pixel.y-3); + if(isEmpty(pixel.x,pixel.y+pixel.speed)) { + tryMove(pixel,pixel.x,pixel.y - pixel.speed,); + } else { + explodeAt(pixel.x, pixel.y, 13, ["fire","fire","plasma","plasma","plasma","plasma"]); + + deletePixel(pixel.x,pixel.y); } - else if (pixel.x == tarX){ - explodeAt(x, y, 13, ["fire","fire","plasma","plasma","plasma","plasma"]); - explodeAt(x, y, 5, "molten_metal_scrap"); - deletePixel(pixel.x,pixel.y); - } - - + + //pixel.AtY = true; } - - - - - - - } + } + else if(pixel.AtY = true) { + if(pixel.x > tarX) { + pixel.speed = 2; + let test = createPixel("fire",pixel.x,pixel.y); + if(isEmpty(pixel.x-1,pixel.y)) { + tryMove(pixel,pixel.x-pixel.speed,pixel.y,test); + } else { + explodeAt(pixel.x, pixel.y, 13, ["fire","fire","plasma","plasma","plasma","plasma"]); + + deletePixel(pixel.x,pixel.y); + } + + } + else if(pixel.x < tarX) { + pixel.speed = 2; + let test = createPixel("fire",pixel.x,pixel.y); + if(isEmpty(pixel.x+2,pixel.y)) { + tryMove(pixel,pixel.x+pixel.speed,pixel.y,test ); + } else { + explodeAt(pixel.x, pixel.y, 13, ["fire","fire","plasma","plasma","plasma","plasma"]); + + deletePixel(pixel.x,pixel.y); + } + + + } + else if (pixel.x == tarX){ + explodeAt(pixel.x, pixel.y, 13, ["fire","fire","plasma","plasma","plasma","plasma"]); + + deletePixel(pixel.x,pixel.y); + } + if(tarX-pixel.x == 1 || tarX-pixel.x == -1) { + explodeAt(pixel.x, pixel.y, 13, ["fire","fire","plasma","plasma","plasma","plasma"]); + deletePixel(pixel.x,pixel.y); + } + + } - } - doDefaults(pixel); + + + + + + + + + + } }, + conduct: 1, + movable: true, + category:"test", + darkText: true, + hardness: 1, + + + } + + + elements.room_temp.category = "tools" + elements.uncharge.category = "tools" + elements.unburn.category = "tools" + + +textures.Reniforced_Titanuim = { + REINFORCEDTITANIUM: [ + "GiGgggGiGGg", + "gggGGGGgggg", + "iiiiiiiiiii", + "GgGGggggGGg", + "GggGGgggGGg", + "igGGGgggggi", + "GggggggGGGG", + "GggGGgggggg", + "Ggggggggggg", + "ggggggGGggg", + "Ggggggggggg", + "iiiiiiiiiii",], + + +} + +elements.Reniforced_Titanuim = { + color: "#787878", + colorPattern: textures.Reniforced_Titanuim.REINFORCEDTITANIUM, + colorKey: { + "g": "#787878", + "G": "#606060", + "i": "#332f2f"}, + behavior: behaviors.WALL, + + tempHigh: 4000, + stateHigh : "molten_titanium", + category: "solids", + state: "solid", + density: 5000, + hardness:1, + noMix: true +} + + + +elements.Missile_Up = { + + maxSize: 1, + + properties: { + luanched : false, + }, + + + + tick: function(pixel) { + if(pixel.temp >= 100) { + pixel.luanched = true; + if(isEmpty(pixel.x,pixel.y-1) ) { + let exguast = createPixel("fire",pixel.x,pixel.y + 3) + tryMove(pixel,pixel.x,pixel.y-2,); + } else if(!isEmpty(pixel.x, pixel.y-1)) { + + explodeAt(pixel.x,pixel.y, 13 ,["fire","plasma","plasma","plasma"]); + deletePixel(pixel.x,pixel.y) + if(!(pixelMap[pixel.x][pixel.y-1] == "Missile_Down") || !(pixelMap[pixel.x][pixel.y-1] == "fire") ) { + + explodeAt(pixel.x,pixel.y, 13 ,["fire","plasma","plasma","plasma"]); + deletePixel(pixel.x,pixel.y) + + } + } + } + + +}, conduct: 1, movable: true, category:"weapons", @@ -1726,7 +1740,286 @@ elements.guided_missile = { } - - elements.room_temp.category = "tools" - elements.uncharge.category = "tools" - elements.unburn.category = "tools" + elements.Missile_Down = { + + maxSize: 1, + + properties: { + luanched : false, + }, + + + tick: function(pixel) { + if(pixel.temp >= 100) { + pixel.luanched = true; + if(isEmpty(pixel.x,pixel.y+2) ) { + let exguast = createPixel("fire",pixel.x,pixel.y - 3) + tryMove(pixel,pixel.x,pixel.y+2,); + } else if(!isEmpty(pixel.x, pixel.y+1)) { + + explodeAt(pixel.x,pixel.y, 13 ,["fire","plasma","plasma","plasma"]); + deletePixel(pixel.x,pixel.y) + if(!(pixelMap[pixel.x][pixel.y+1] == "Missile_Down") || !(pixelMap[pixel.x][pixel.y-1] == "fire") ) { + + explodeAt(pixel.x,pixel.y, 13 ,["fire","plasma","plasma","plasma"]); + deletePixel(pixel.x,pixel.y) + + } + } + } + + + }, + conduct: 1, + movable: true, + category:"weapons", + darkText: true, + hardness: 1, + + + } + elements.Missile_Left = { + + maxSize: 1, + + properties: { + luanched : false, + }, + + + + tick: function(pixel) { + if(pixel.temp >= 100) { + pixel.luanched = true; + if(isEmpty(pixel.x-1,pixel.y) ) { + let exguast = createPixel("fire",pixel.x+3,pixel.y) + tryMove(pixel,pixel.x-2,pixel.y); + } else if( !isEmpty(pixel.x-1, pixel.y) && !isEmpty(pixel.x-2, pixel.y) && !outOfBounds(pixel.x-1,pixel.y) && !outOfBounds(pixel.x-2,pixel.y) ) { + + explodeAt(pixel.x,pixel.y, 13 ,["fire","plasma","plasma","plasma"]); + deletePixel(pixel.x,pixel.y) + if(!(pixelMap[pixel.x-1][pixel.y] == "Missile_Down") || !(pixelMap[pixel.x][pixel.y-1] == "fire") ) { + + explodeAt(pixel.x,pixel.y, 13 ,["fire","plasma","plasma","plasma"]); + deletePixel(pixel.x,pixel.y) + + } + } + } + + + }, + conduct: 1, + movable: true, + category:"weapons", + darkText: true, + hardness: 1, + + + } + + + elements.Missile_Right = { + + maxSize: 1, + + properties: { + luanched : false, + }, + + + + tick: function(pixel) { + if(pixel.temp >= 100) { + pixel.luanched = true; + if(isEmpty(pixel.x+1,pixel.y) ) { + let exguast = createPixel("fire",pixel.x-3,pixel.y) + tryMove(pixel,pixel.x+2,pixel.y); + } else if( !isEmpty(pixel.x+1, pixel.y) && !isEmpty(pixel.x+2, pixel.y) && !outOfBounds(pixel.x+1,pixel.y) && !outOfBounds(pixel.x+2,pixel.y) ) { + + explodeAt(pixel.x,pixel.y, 13 ,["fire","plasma","plasma","plasma"]); + deletePixel(pixel.x,pixel.y) + if(!(pixelMap[pixel.x+1][pixel.y] == "Missile_Down") || !(pixelMap[pixel.x][pixel.y+1] == "fire") ) { + + explodeAt(pixel.x,pixel.y, 13 ,["fire","plasma","plasma","plasma"]); + deletePixel(pixel.x,pixel.y) + + } + } + } + + + }, + conduct: 1, + movable: true, + category:"weapons", + darkText: true, + hardness: 1, + + + } + + elements.pancho = { + tempHigh: 300, + stateHigh: "steam", + color: ["#bd8e0d","#0ec930","#ff0000","#fcf800"], + singleColor: true, + behavior: behaviors.STURDYPOWDER, + category: "food", + state: "liquid" + }; + + +//imma finnish rest later + elements.pesticide = { + category: "test", + state: "liquid", + color: elements.plant.color, + behavior:behaviors.LIQUID, + reactions : { + "plant": { elem1: "dead_plant" }, + "algae": { elem1: "dead_plant" }, + "cactus": { elem1: "dead_plant" }, + "hive": { elem1: "dead_plant" }, + "sapling": { elem1: "dead_plant" }, + "pinecone": { elem1: "dead_plant" }, + "evergreen": { elem1: "dead_plant" }, + "hyphae": { elem1: "dead_plant" }, + "petal": { elem1: "dead_plant" }, + "pistil": { elem1: "dead_plant" }, + "tree_branch": { elem1: "wood" }, + } + + } + + elements.uranium_particles = { + color: ["#599e61","#364d3c","#494d4a","#6c8a42","#798d65","#b5e089"], + tick: behaviors.BOUNCY, + reactions: { + "uranium_particles": { elem1:null, elem2:"supernova", chance:0.000001} + }, + category: "???????", + } + + elements.air_filter = { + + + color: "#414c4f", + + tick: function(pixel) { + + if (!pixel.stage && pixelTicks-pixel.start > 60) { + for (var i = 0; i < squareCoords.length; i++) { + var coord = squareCoords[i]; + var x = pixel.x+coord[0]; + var y = pixel.y+coord[1]; + // delete this bc it makes the pipe walls + // if (!isEmpty(x,y,true) && elements[pixelMap[x][y].element].movable) { + // deletePixel(x,y) + // } + // if (isEmpty(x,y)) { + // createPixel("pipe_wall",x,y); + // } + } + pixel.stage = 2; + } + else if (pixel.stage === 1 && pixelTicks-pixel.start > 70) { //uninitialized + for (var i = 0; i < adjacentCoords.length; i++) { + var coord = adjacentCoords[i]; + var x = pixel.x+coord[0]; + var y = pixel.y+coord[1]; + pixel.stage = 2; + // this makes the thing blue and keep pixel.stage = 2 cuz without it it breaks the code + // if (isEmpty(x,y)) { + // pixel.stage = 2; //blue + // pixel.color = pixelColorPick(pixel,"#000036"); + // break; + // } + } + } + else if (pixel.stage > 1 && pixelTicks % 3 === pixel.stage-2) { //initialized + 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) && pixelMap[x][y].element === "pipe") { + var newPixel = pixelMap[x][y]; + if (newPixel.stage === 1) { + var newColor; + switch (pixel.stage) { + case 2: newPixel.stage = 3; newColor = "#003600"; break; //green + case 3: newPixel.stage = 4; newColor = "#360000"; break; //red + case 4: newPixel.stage = 2; newColor = "#000036"; break; //blue + } + newPixel.color = pixelColorPick(newPixel,newColor); + } + } + } + var moved = false; + shuffleArray(squareCoordsShuffle); + for (var i = 0; i < squareCoordsShuffle.length; i++) { + var coord = squareCoordsShuffle[i]; + var x = pixel.x+coord[0]; + var y = pixel.y+coord[1]; + if (!isEmpty(x,y,true)) { + var newPixel = pixelMap[x][y]; + if (newPixel.element === "pipe") { + var nextStage; + switch (pixel.stage) { + + } + if (pixel.con && !newPixel.con && newPixel.stage === nextStage) { //transfer to jacent pipe + newPixel.con = pixel.con; + newPixel.con.x = newPixel.x; + newPixel.con.y = newPixel.y; + pixel.con = null; + moved = true; + break; + } + } + else if (!pixel.con && (newPixel.element == "smoke" || newPixel.element == "carbon_dioxide" || newPixel.element == "smog" || newPixel.element == "rad_steam" || newPixel.element == "oxygen" )) { //suck up pixel + changePixel(newPixel,"oxygen"); + pixel.con = newPixel; + deletePixel(newPixel.x,newPixel.y); + pixel.con.x = pixel.x; + pixel.con.y = pixel.y; + pixel.con.del; + moved = true; + break; + } + } + } + if (pixel.con && !moved) { // move to same stage if none other + for (var i = 0; i < squareCoordsShuffle.length; i++) { + var coord = squareCoordsShuffle[i]; + var x = pixel.x+coord[0]; + var y = pixel.y+coord[1]; + if (isEmpty(x,y)) { + delete pixel.con.del; + pixel.con.x = x; + pixel.con.y = y; + pixelMap[x][y] = pixel.con; + currentPixels.push(pixel.con); + pixel.con = null; + break; + } + if (!isEmpty(x,y,true) && pixelMap[x][y].element === "pipe") { + var newPixel = pixelMap[x][y]; + if (pixel.con && !newPixel.con && newPixel.stage === pixel.stage) { + newPixel.con = pixel.con; + newPixel.con.x = newPixel.x; + newPixel.con.y = newPixel.y; + pixel.con = null; + break; + } + } + } + } + } + doDefaults(pixel); + }, + category: "machines", + movable: false, + canContain: true, + + } From d7612567cecc336f96f094c53d294137dac4301b Mon Sep 17 00:00:00 2001 From: CarbonMonoxida <164758530+CarbonMonoxida@users.noreply.github.com> Date: Thu, 4 Apr 2024 08:23:47 +0700 Subject: [PATCH 08/14] Update mod-list.html add ascientistswish.js --- mod-list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod-list.html b/mod-list.html index b1dcf9b1..38bd3460 100644 --- a/mod-list.html +++ b/mod-list.html @@ -154,6 +154,7 @@
Business inquiries? Education stories? Help needed? Email us at contact@R74n.com!
More links: Help • Tips • Mods • Mobile • Offline • Privacy
-Thanks to: Serioustar, WeiChei, Midi_png, ggod, personman, fnl4y, PitsPower, kaeud, Trent, u2ce
+Thanks to: Serioustar, ggod, Midi_png, personman, fnl4y, PitsPower, swagg boi, kaeud, WeiChei, Trent, u2ce
Sandboxels is developed by R74n. Check out our other projects!