diff --git a/mods/conveyance.js b/mods/conveyance.js new file mode 100644 index 00000000..e4a51dde --- /dev/null +++ b/mods/conveyance.js @@ -0,0 +1,95 @@ +// Sandboxels: Conveyance Mod, v1.0 +// Author: MelecieDiancie + +elements.r_conveyor = { + name: "Right Conveyor", + color: "#2a2a36", + colorOn: "#3b3b4a", + state: "solid", + category: "machines", + conduct: 1, + tick: function(pixel) { + doHeat(pixel) + doBurning(pixel) + doElectricity(pixel) + + let pixelAbove = pixelMap[pixel.x][pixel.y-1] + + if (!isEmpty(pixel.x, pixel.y-1) && pixel.charge > 0.5 && elements[pixelAbove.element].movable == true ) { + tryMove(pixelAbove,pixel.x+1,pixel.y-1) + } + } +}; +elements.l_conveyor = { + name: "Left Conveyor", + color: "#2a2a36", + colorOn: "#3b3b4a", + state: "solid", + category: "machines", + conduct: 1, + tick: function(pixel) { + doHeat(pixel) + doBurning(pixel) + doElectricity(pixel) + + let pixelAbove = pixelMap[pixel.x][pixel.y-1] + + if (!isEmpty(pixel.x, pixel.y-1) && pixel.charge > 0.5 && elements[pixelAbove.element].movable == true ) { + tryMove(pixelAbove,pixel.x-1,pixel.y-1) + } + } +}; +elements.r_autoconveyor = { + name: "Right Autoconveyor", + color: "#3b3b4a", + state: "solid", + category: "machines", + tick: function(pixel) { + doHeat(pixel) + doBurning(pixel) + doElectricity(pixel) + + let pixelAbove = pixelMap[pixel.x][pixel.y-1] + + if (!isEmpty(pixel.x, pixel.y-1) && elements[pixelAbove.element].movable == true ) { + tryMove(pixelAbove,pixel.x+1,pixel.y-1) + } + } +}; +elements.l_autoconveyor = { + name: "Left Autoconveyor", + color: "#3b3b4a", + state: "solid", + category: "machines", + tick: function(pixel) { + doHeat(pixel) + doBurning(pixel) + doElectricity(pixel) + + let pixelAbove = pixelMap[pixel.x][pixel.y-1] + + if (!isEmpty(pixel.x, pixel.y-1) && elements[pixelAbove.element].movable == true ) { + tryMove(pixelAbove,pixel.x-1,pixel.y-1) + } + } +}; + +runAfterLoad(function() { + for (element in elements) { + let behavior = elements[element].behavior + let movable = false + for (line in behavior) { // check if element has a M1 or M2 in their behavior + line = behavior[line] + if (line.includes("M1") || line.includes("M2")) { + movable = true + } + else { + } + } + + if (movable != false) { // if element has M1 or M2, set movable to true, makes them movable by conveyors + elements[element].movable = true + } + + } +}); diff --git a/mods/funny_liquid.js b/mods/funny_liquid.js index 30823472..8ee4fabf 100644 --- a/mods/funny_liquid.js +++ b/mods/funny_liquid.js @@ -9,6 +9,7 @@ elements.cum = { density: 997, tempHigh: 35, stateHigh: "dead_cum", + state: "liquid", reactions: { "water": { "elem1": "cum_water", "elem2": "cum_water", "chance":0.7 }, //cum mixing "sugar": { "elem1": null, "elem2": "cum", "chance":0.7 }, //sperm eat sugar @@ -56,6 +57,7 @@ elements.dead_cum = { tempLow: 0, stateLow: "dead_cum_ice", viscosity: 20, + state: "liquid", category:"cum", conduct: 0.04, hidden:true, @@ -91,6 +93,7 @@ elements.cum_water = { viscosity: 8, category: "cum", conduct: 0.03, + state: "liquid", hidden: true, extraInfo: "Dilute semen.", }, @@ -112,6 +115,7 @@ elements.dead_cum_water = { stateLow: "dead_cum_water_ice", viscosity: 8, category: "cum", + state: "liquid", conduct: 0.03, hidden:true, extraInfo: "Dilute semen whose sperm have died.", @@ -126,6 +130,7 @@ elements.burnt_cum = { "M2 AND SW:steam%35|M1 AND SW:steam%70|M2 AND SW:steam%35", ], category: "solids", + state: "solid", tempHigh: 180, stateHigh: "ash", hidden: true, @@ -146,6 +151,7 @@ elements.cum_ice = { temp: 0, tempHigh: 5, stateHigh: "cum", + state: "solid", category: "cum", extraInfo: "Frozen semen.", breakInto: "cum_snow", @@ -164,6 +170,7 @@ elements.cum_water_ice = { temp: 0, tempHigh: 5, stateHigh: "cum_water", + state: "solid", category: "cum", hidden: true, extraInfo: "Dilute, frozen semen.", @@ -178,6 +185,7 @@ elements.dead_cum_ice = { }, density: 917, temp: 0, + state: "solid", tempHigh: 5, stateHigh: "dead_cum", category: "cum", @@ -196,6 +204,7 @@ elements.dead_cum_water_ice = { temp: 0, tempHigh: 5, stateHigh: "cum_water", + state: "solid", category: "cum", hidden:true, extraInfo: "Dilute, frozen semen whose sperm have died.", @@ -341,6 +350,7 @@ elements.cummy_snake = { "CH:cum_ice>cum%1 AND SW:cum%20|LB:cum_ice AND RT%5|M1 AND BO:1,2,3 AND CH:cum_ice>cum%1 AND SW:cum%20", "XX|CH:cum_ice>cum%1 AND SW:cum%20|XX", ], + state: "solid", rotatable: true, category: "cum", extraInfo: "It moves in a snake-like pattern and leaves a trail of solid semen. It can melt through this semen if it is trapped.", @@ -358,6 +368,7 @@ elements.penis = { "precum_ice%10|precum_ice%10|precum_ice%10", ], rotatable: false, + state: "solid", category: "cum", conduct: 1, tempHigh: 60, @@ -375,6 +386,7 @@ elements.cummy_permafrost = { "radiation": { "elem1": "radiation", "elem2": "dead_cummy_permafrost" }, }, temp: -50, + state: "solid", tempHigh: 0, stateHigh: "cummy_mud", category: "cum", @@ -392,6 +404,7 @@ elements.dead_cummy_permafrost = { tempHigh: 0, stateHigh: "dead_cummy_mud", category: "cum", + state: "solid", hidden: true, extraInfo: "Frozen mud infused with lifeless semen.", } @@ -413,6 +426,7 @@ elements.precum = { stateLow: "precum_ice", viscosity: 20, category:"cum", + state: "liquid", extraInfo: "A sticky fluid that neutralizes acid.", }, elements.precum_ice = { @@ -429,6 +443,7 @@ elements.precum_ice = { temp: -5, category:"cum", hidden: true, + state: "solid", extraInfo: "Frozen pre-ejaculate.", breakInto: "precum_snow", }, @@ -478,7 +493,7 @@ elements.cum_reviver = { category: "special", tempHigh: 50, stateHigh: ["light","sugar","diamond","glitter","honey","flower_seed","dirt","water"], - state: "solid", + state: "liquid", density: 1210, extraInfo: "A magical substance that revives dead semen.", }, diff --git a/mods/funny_liquid_2.js b/mods/funny_liquid_2.js index 1d691798..f625f69b 100644 --- a/mods/funny_liquid_2.js +++ b/mods/funny_liquid_2.js @@ -21,6 +21,7 @@ elements.piss = { stateLow: "piss_ice", viscosity: 1, category: "piss", + state: "liquid", conduct:elements.water.conduct+0.1, extraInfo: "A liquid excreted as waste by many animals.", }, @@ -45,6 +46,7 @@ elements.piss_water = { tempLow: 0, stateLow: "piss_water_ice", viscosity: 1, + state: "liquid", category: "piss", conduct: elements.water.conduct+0.05, hidden: true, @@ -58,6 +60,7 @@ elements.piss_ice = { temp: -10, tempHigh: 0, stateHigh: "piss", + state: "solid", category: "piss", breakInto: "pissed_snow", }, @@ -71,6 +74,7 @@ elements.piss_water_ice = { tempHigh: 0, stateHigh: "piss_water", category: "piss", + state: "solid", hidden: true, breakInto: "pissed_snow", }, @@ -82,9 +86,9 @@ elements.pissed_snow = { temp: -5, tempHigh: 0, stateHigh: "piss", + state: "solid", category: "piss", hidden: true, - state: "solid", density: 100, }, @@ -138,6 +142,7 @@ elements.pissed_permafrost = { tempHigh: 0, stateHigh: "pissed_mud", category: "piss", + state: "solid", hidden: true, }, diff --git a/mods/funny_liquid_3.js b/mods/funny_liquid_3.js index 21c18e34..231eb6b6 100644 --- a/mods/funny_liquid_3.js +++ b/mods/funny_liquid_3.js @@ -63,7 +63,7 @@ elements.frozen_vomit = { temp: -5, tempHigh: 0, stateHigh: "vomit", - state: "solids", + state: "solid", hidden: true, density: 1049, breakInto: "vomit_snow", diff --git a/mods/funny_solid.js b/mods/funny_solid.js index 315280d3..2eccf778 100644 --- a/mods/funny_solid.js +++ b/mods/funny_solid.js @@ -18,7 +18,7 @@ elements.shit = { }, elements.altnull = { - color: ["#000000"], + color: settings.bg, behavior: behaviors.SELFDELETE, reactions: { "altnull": { "elem1": null, "elem2": null } @@ -26,10 +26,6 @@ elements.altnull = { tick: function(pixel) { deletePixel(pixel.x,pixel.y) }, - tempHigh: -273, - stateHigh: null, - tempLow: 999999999999, - stateLow: null, burn: 10000, burnTime: 1, hidden: true, diff --git a/mods/minecraft.js b/mods/minecraft.js new file mode 100644 index 00000000..e05da6f7 --- /dev/null +++ b/mods/minecraft.js @@ -0,0 +1,26 @@ +elements.endstone = { +color: ["#e5edc2", "#bec797"], +behavior: behaviors.WALL, +category: "minecraft", +state: "solid", +stateHigh: "molten_endstone", +tempHigh: 1265 +}; +elements.molten_endstone = { +color: ["#6615d6", "#9651f5", "#d3c3eb"], +behavior: behaviors.LIQUID, +category: "minecraft", +state: "liquid", +stateLow: "endstone", +tempLow: 1265, +temp: 1500, +viscosity: 1000, +density: 1025 +}; +elements.netherrack = { +color: ["#8c2a0a", "#783722"], +behavior: behaviors.WALL, +category: "minecraft", +state: "solid", +tempHigh: 2750 +}; diff --git a/mods/more_breaking.js b/mods/more_breaking.js index ed4728ee..4e52e246 100644 --- a/mods/more_breaking.js +++ b/mods/more_breaking.js @@ -8,8 +8,11 @@ elements.loose_straw = { category: "powders", state: "solid", density: 47.5, + hidden: true, }, +elements.straw.breakInto = ["ash","loose_straw"] + elements.plastic_scrap = { color: "#c3cccc", behavior: behaviors.POWDER, @@ -21,26 +24,12 @@ elements.plastic_scrap = { burnInto: "dioxin", state: "solid", density: 952, + hidden: true, }, -//insulation +elements.plastic.breakInto = ["plastic_scrap","dioxin"] -elements.iron_scrap = { - color: ["#dbdddd","#cdcdcd","#bbbdbd","#adadad","#cbcdcd","#bdbdbd"], - behavior: behaviors.POWDER, - reactions: { - "water": { "elem1":"rust", chance:0.0035 }, - "salt_water": { "elem1":"rust", chance:0.006 }, - "dirty_water": { "elem1":"rust", chance:0.045 }, - "sugar_water": { "elem1":"rust", chance:0.0045 }, - }, - tempHigh: 1538, - stateHigh: "molten_iron", - category: "powders", - density: 4860, - state: "solid", - conduct: 0.43, -}, +elements.insulation.breakInto = ["plastic_scrap","dioxin","glass_shard"] elements.copper_scrap = { color: ["#B96242","#CE5332","#D77045","#994222","#AE3312","#B75025","#A95232","#BE4322","#C76035"], @@ -60,7 +49,9 @@ elements.copper_scrap = { stateHigh: "molten_copper", density: 5960, conduct: 0.90, + hidden: true, }, + elements.oxidized_copper_scrap = { color: ["#507565","#52665A","#618374","#305545","#32463A","#416354","#406555","#42564A","#517364"], behavior: behaviors.POWDER, @@ -70,57 +61,69 @@ elements.oxidized_copper_scrap = { stateHigh: "molten_copper", density: 5960, conduct: 0.80, -}, - -elements.zinc_scrap = { - color: ["#8C8A8B","#ADADAF","#FFFFFF","#7C7A7B","#9D9D9F","#F8F8F3","#6C6A6B","#8D8D8F","#E8E8E3"], - behavior: behaviors.POWDER, - category: "powders", - tempHigh: 419.53, - stateHigh: "molten_zinc", - density: 4068, - conduct: 0.43, -}, - -elements.tin_scrap = { - color: ["#AEADA8","#BEBDB4","#9E9D98","#AEADA4","#8E8D88","#9E9D94"], - behavior: behaviors.POWDER, - tempHigh: 231.9, - stateHigh: "molten_tin", - category: "powders", - density: 4260, - conduct: 0.35, -}, - -elements.nickel_scrap = { - color: ["#828482","#727472","#626462"], - behavior: behaviors.POWDER, - tempHigh: 1455, - stateHigh: "molten_nickel", - category: "powders", - density: 5900, - conduct: 0.41, -}, - -elements.silver_scrap = { - color: ["#DADADA","#CACACA","#BABABA"], - behavior: behaviors.POWDER, - tempHigh: 961.8, - stateHigh: "molten_silver", - category: "powders", - density: 7497, - conduct: 0.89, + hidden: true, } -//gold - -elements.straw.breakInto = ["ash","loose_straw"] -elements.plastic.breakInto = ["plastic_scrap","dioxin"] -elements.insulation.breakInto = ["plastic_scrap","dioxin","glass_shard"] -elements.iron.breakInto = "iron_scrap" elements.copper.breakInto = ["copper_scrap","copper_scrap","copper_scrap","copper_scrap","copper_scrap","oxidized_copper_scrap"] -elements.zinc.breakInto = "zinc_scrap" -elements.tin.breakInto = "tin_scrap" -elements.nickel.breakInto = "nickel_scrap" -elements.silver.breakInto = "silver_scrap" + elements.gold.breakInto = "gold_coin" + +elements.dry_ice.breakInto = "carbon_dioxide" + +regularMetalArray = ["iron", "zinc", "tin", "nickel", "silver", "aluminum", "lead", "tungsten", "brass", "bronze", "sterling", "steel", "rose_gold", "solder"] + +if(enabledMods.includes("mods/Neutronium Mod.js")) { + regularMetalArray.push("mythril") + regularMetalArray.push("mithril_mythril_alloy") + regularMetalArray.push("titanium") + regularMetalArray.push("ilitium") +} + +if(enabledMods.includes("mods/ketchup_mod.js")) { + regularMetalArray.push("ketchup_metal") + regularMetalArray.push("ketchup_gold") + elements.frozen_ketchup.breakInto = "ketchup_snow" + elements.frozen_poisoned_ketchup.breakInto = "poisoned_ketchup_snow" +} + +if(enabledMods.includes("mods/randomness.js")) { + regularMetalArray.push("tungstensteel") +} + +if(enabledMods.includes("mods/fey_and_more.js")) { + regularMetalArray.push("mithril") +} + +if(enabledMods.includes("mods/some_tf_liquids.js")) { + regularMetalArray.push("signalum") +} + +elements.nitrogen_snow = { + color: "#efefef", + behavior: behaviors.POWDER, + category: "solids", + temp: -259.86, + tempHigh: -209.86, + stateHigh: "liquid_nitrogen", + state: "solid", + density: 850, + hidden: true, +} + +elements.nitrogen_ice.breakInto = "nitrogen_snow" + +runAfterLoad(function() { + for(i = 0; i < regularMetalArray.length; i++) { + elements[`${regularMetalArray[i]}_scrap`] = { + color: elements[regularMetalArray[i]].color, + behavior: behaviors.POWDER, + tempHigh: elements[regularMetalArray[i]].tempHigh, + stateHigh: regularMetalArray[i], + category: "powders", + hidden: true, + density: elements[regularMetalArray[i]].density * 0.09, + conduct: elements[regularMetalArray[i]].conduct * 0.4, + }; + elements[regularMetalArray[i]].breakInto = `${regularMetalArray[i]}_scrap` + }; +}); diff --git a/mods/randomness_but_tick.js b/mods/randomness_but_tick.js index f53b5e10..9a674f9c 100644 --- a/mods/randomness_but_tick.js +++ b/mods/randomness_but_tick.js @@ -515,9 +515,9 @@ elements.conveyor_2 = { state: "solid", }, -this.aaa = ["plasma","plasma","plasma","plasma","plasma","plasma","plasma","plasma","plasma","plasma","plasma","plasma","smoke","plasma","plasma","fire","smoke","fire","smoke","plasma","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","acid","acid","oil","oil","oil","oil","oil","oil","oil","plasma","plasma","plasma","plasma","plasma","smoke","plasma","plasma","fire","smoke","plasma","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","flash","flash","flash","flash","flash","acid_gas","acid_gas","acid_gas","acid","oil","oil","oil","oil","oil","oil","oil","oil","oil","oil","plasma","plasma","plasma","plasma","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","acid","acid","oil","oil","oil","oil","oil","oil","oil","plasma","plasma","plasma","plasma","plasma","smoke","plasma","plasma","fire","smoke","plasma","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","seb","seb","flash","flash","flash","flash","flash","acid_gas","acid_gas","acid_gas","acid","oil","oil","oil","oil","oil","oil","oil","oil","oil","oil","plasma","plasma","plasma","plasma","plague","plague","plague","plague","plague","plague","radiation","radiation","radiation","radiation","radiation","radiation","radiation","radiation","uranium","uranium","uranium","uranium","uranium","uranium","greek_fire","greek_fire","greek_fire","greek_fire","greek_fire","antimatter","antimatter","antimatter","antimatter","antimatter","smoke_grenade","antimatter","smoke_grenade","fireball","flash","acid_gas","acid_gas","acid_gas","plague","plague","plague","plague","plague","plague","radiation","radiation","radiation","radiation","radiation","radiation","radiation","radiation","uranium","uranium","uranium","uranium","uranium","uranium","greek_fire","greek_fire","greek_fire","greek_fire","greek_fire","antimatter","antimatter","antimatter","antimatter","antimatter","smoke_grenade","antimatter","flash","acid_gas","acid_gas","acid_gas"] +this.aaa = ["plasma","plasma","plasma","plasma","plasma","plasma","plasma","plasma","plasma","plasma","plasma","plasma","smoke","plasma","plasma","fire","smoke","fire","smoke","plasma","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","acid","acid","oil","oil","oil","oil","oil","oil","oil","plasma","plasma","plasma","plasma","plasma","smoke","plasma","plasma","fire","smoke","plasma","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","flash","flash","flash","flash","flash","acid_gas","acid_gas","acid_gas","acid","oil","oil","oil","oil","oil","oil","oil","oil","oil","oil","plasma","plasma","plasma","plasma","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","acid","acid","oil","oil","oil","oil","oil","oil","oil","plasma","plasma","plasma","plasma","plasma","smoke","plasma","plasma","fire","smoke","plasma","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","seb","seb","flash","flash","flash","flash","flash","acid_gas","acid_gas","acid_gas","acid","oil","oil","oil","oil","oil","oil","oil","oil","oil","oil","plasma","plasma","plasma","plasma","plague","plague","plague","plague","plague","plague","radiation","radiation","radiation","radiation","radiation","radiation","radiation","radiation","uranium","uranium","uranium","uranium","uranium","uranium","greek_fire","greek_fire","greek_fire","greek_fire","greek_fire","antimatter","antimatter","antimatter","antimatter","antimatter","smoke_grenade","antimatter","smoke_grenade","fireball","flash","acid_gas","acid_gas","acid_gas","plague","plague","plague","plague","plague","plague","radiation","radiation","radiation","radiation","radiation","radiation","radiation","radiation","uranium","uranium","uranium","uranium","uranium","uranium","greek_fire","greek_fire","greek_fire","greek_fire","greek_fire","antimatter","antimatter","antimatter","antimatter","antimatter","smoke_grenade","antimatter","flash","acid_gas","acid_gas","acid_gas","radiation","radiation","radiation","radiation","plague","acid_gas","acid_gas","acid_gas"] -this.bbb = ["smoke","smoke","smoke","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","acid","acid","oil","oil","oil","oil","oil","oil","oil","smoke","smoke","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","flash","flash","flash","flash","flash","acid_gas","acid_gas","acid_gas","acid","oil","oil","oil","oil","oil","oil","oil","oil","oil","oil","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","acid","acid","oil","oil","oil","oil","oil","oil","oil","smoke","smoke","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","seb","flash","flash","flash","flash","flash","acid_gas","acid_gas","acid_gas","acid","oil","oil","oil","oil","oil","oil","oil","oil","oil","oil","plague","plague","plague","plague","plague","plague","radiation","radiation","radiation","radiation","radiation","radiation","radiation","radiation","uranium","uranium","uranium","uranium","uranium","uranium","greek_fire","greek_fire","greek_fire","greek_fire","greek_fire","antimatter","antimatter","antimatter","antimatter","antimatter","smoke_grenade","antimatter","smoke_grenade","flash","acid_gas","acid_gas","acid_gas","plague","plague","plague","plague","plague","plague","radiation","radiation","radiation","radiation","radiation","radiation","radiation","radiation","uranium","uranium","uranium","uranium","uranium","uranium","greek_fire","greek_fire","greek_fire","greek_fire","greek_fire","antimatter","smoke_grenade","flash","acid_gas","acid_gas","acid_gas"] +this.bbb = ["smoke","smoke","smoke","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","acid","acid","oil","oil","oil","oil","oil","oil","oil","smoke","smoke","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","flash","flash","flash","flash","flash","acid_gas","acid_gas","acid_gas","acid","oil","oil","oil","oil","oil","oil","oil","oil","oil","oil","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","acid","acid","oil","oil","oil","oil","oil","oil","oil","smoke","smoke","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","metal_scrap","seb","flash","flash","flash","flash","flash","acid_gas","acid_gas","acid_gas","acid","oil","oil","oil","oil","oil","oil","oil","oil","oil","oil","plague","plague","plague","plague","plague","plague","radiation","radiation","radiation","radiation","radiation","radiation","radiation","radiation","uranium","uranium","uranium","uranium","uranium","uranium","greek_fire","greek_fire","greek_fire","greek_fire","greek_fire","antimatter","antimatter","antimatter","antimatter","antimatter","smoke_grenade","antimatter","smoke_grenade","flash","acid_gas","acid_gas","acid_gas","plague","plague","plague","plague","plague","plague","radiation","radiation","radiation","radiation","radiation","radiation","radiation","radiation","uranium","uranium","uranium","uranium","uranium","uranium","greek_fire","greek_fire","greek_fire","greek_fire","greek_fire","antimatter","smoke_grenade","flash","acid_gas","acid_gas","acid_gas","radiation","radiation","radiation","radiation","plague","acid_gas","acid_gas","acid_gas"] elements.amalgamated_bomb = { color: ["#FF0000","#FF0000","#FFFF00","#FFFF00","#00FF00","#00FF00","#0000FF","#0000FF"], @@ -545,7 +545,7 @@ elements.amalgamated_bomb = { if(steppedOn == true || landed == true) { fire = bbb smoke = bbb - radius = 45 + radius = 70 x = pixel.x y = pixel.y //SECONDARY @@ -652,7 +652,7 @@ elements.amalgamated_bomb = { fire = aaa smoke = aaa - radius = 30 + radius = 35 //PRIMARY // if fire contains , split it into an array if (fire.includes(",")) { @@ -1282,6 +1282,12 @@ runAfterLoad(function() { bbb.push("flamebomb") bbb.push("flamer") bbb.push("flamebomb") + bbb.push("toxin") + bbb.push("toxin") + bbb.push("toxin") + bbb.push("chlorine") + bbb.push("chlorine") + bbb.push("chlorine") } if(enabledMods.includes("mods/randomness.js")) { aaa.push("burning_unnamed_gas") @@ -1296,7 +1302,6 @@ runAfterLoad(function() { aaa.push("warp") aaa.push("bomb_2") aaa.push("bomb_2") - aaa.push("bomb_2") aaa.push("op_hottester_bomb") bbb.push("unnamed_gas") bbb.push("unnamed_gas") @@ -1309,4 +1314,85 @@ runAfterLoad(function() { bbb.push("warp") bbb.push("warp") } + if(enabledMods.includes("mods/glenn_gases.js")) { + bbb.push("electric_gas") + bbb.push("electric_gas") + bbb.push("electric_gas") + bbb.push("corrosive_gas") + bbb.push("iocalfaeus_gas") + bbb.push("iocalfaeus_gas") + bbb.push("iocalfaeus_gas") + bbb.push("ignited_gas") + bbb.push("ignited_gas") + bbb.push("ignited_gas") + bbb.push("finine") + bbb.push("finine") + bbb.push("finine") + bbb.push("acidic_vapour") + bbb.push("acidic_vapour") + bbb.push("acidic_vapour") + bbb.push("nitrous_gas") + bbb.push("nitrous_gas") + bbb.push("nitrous_gas") + bbb.push("void_gas") + bbb.push("void_gas") + bbb.push("void_gas") + bbb.push("black_damp") + bbb.push("black_damp") + bbb.push("black_damp") + aaa.push("electric_gas") + aaa.push("electric_gas") + aaa.push("iocalfaeus_gas") + aaa.push("iocalfaeus_gas") + aaa.push("ignited_gas") + aaa.push("ignited_gas") + aaa.push("finine") + aaa.push("finine") + aaa.push("acidic_vapour") + aaa.push("acidic_vapour") + aaa.push("nitrous_gas") + aaa.push("nitrous_gas") + aaa.push("void_gas") + aaa.push("void_gas") + aaa.push("black_damp") + aaa.push("black_damp") + } + if(enabledMods.includes("mods/some_tf_liquids.js")) { + bbb.push("blazing_pyrotheum") + bbb.push("blazing_pyrotheum") + bbb.push("blazing_pyrotheum") + bbb.push("blazing_pyrotheum") + bbb.push("blazing_pyrotheum") + bbb.push("blazing_pyrotheum") + bbb.push("tectonic_petrotheum") + bbb.push("tectonic_petrotheum") + bbb.push("tectonic_petrotheum") + bbb.push("resonant_ender") + bbb.push("resonant_ender") + bbb.push("resonant_ender") + aaa.push("blazing_pyrotheum") + aaa.push("blazing_pyrotheum") + aaa.push("blazing_pyrotheum") + aaa.push("blazing_pyrotheum") + aaa.push("blazing_pyrotheum") + aaa.push("blazing_pyrotheum") + aaa.push("tectonic_petrotheum") + aaa.push("tectonic_petrotheum") + aaa.push("tectonic_petrotheum") + aaa.push("resonant_ender") + aaa.push("resonant_ender") + aaa.push("resonant_ender") + aaa.push("blazing_pyrotheum") + aaa.push("blazing_pyrotheum") + aaa.push("blazing_pyrotheum") + aaa.push("blazing_pyrotheum") + aaa.push("blazing_pyrotheum") + aaa.push("blazing_pyrotheum") + aaa.push("tectonic_petrotheum") + aaa.push("tectonic_petrotheum") + aaa.push("tectonic_petrotheum") + aaa.push("resonant_ender") + aaa.push("resonant_ender") + aaa.push("resonant_ender") + } }); diff --git a/mods/spouts.js b/mods/spouts.js new file mode 100644 index 00000000..f4e4977d --- /dev/null +++ b/mods/spouts.js @@ -0,0 +1,17 @@ +runAfterLoad(function() { + liquidArray = Object.keys(elements).filter(function(e) { + return elements[e].state == "liquid" || elements[e].state == "gas"; + }); + for(i = 0; i < liquidArray.length; i++) { + elements[`${liquidArray[i]}_spout`] = { + color: elements[liquidArray[i]].color, + behavior: [ + `XX|CR:${liquidArray[i]}|XX`, + `CR:${liquidArray[i]}|XX|CR:${liquidArray[i]}`, + `XX|CR:${liquidArray[i]}|X`, + ], + category: "spouts", + temp: elements[liquidArray[i]].temp, + }; + }; +}); diff --git a/mods/ticking_temp_stuff.js b/mods/ticking_temp_stuff.js index 84627c23..4636a942 100644 --- a/mods/ticking_temp_stuff.js +++ b/mods/ticking_temp_stuff.js @@ -489,5 +489,6 @@ elements.color_temp_test = { }, category: "special", state: "solid", + density: 1500, temp: 20, }