diff --git a/mods/chem.js b/mods/chem.js index c1e3b9a1..a4fd8fcc 100644 --- a/mods/chem.js +++ b/mods/chem.js @@ -411,8 +411,8 @@ if (enabledMods.includes("mods/generative_mods.js")) { elements["hydrofluoric_acid_gas"].reactions["pyrocumulus"]= { "elem1": null, "elem2": "hydrofluoric_acid_cloud", "chance":0.4, "y":[0,12], "setting":"clouds" }; elements["hydrofluoric_acid_gas"].reactions["fire_cloud"]= { "elem1": null, "elem2": "hydrofluoric_acid_cloud", "chance":0.4, "y":[0,12], "setting":"clouds" }; - elements["cloud"].reactions["anesthesia"] = { elem1:"acid_cloud", elem2:null, chance:0.05 }; - elements["rain_cloud"].reactions["anesthesia"] = { elem1:"acid_cloud", elem2:null, chance:0.05 }; + elements["cloud"].reactions["anesthesia"] = { elem1:"nitric_acid_cloud", elem2:null, chance:0.05 }; + elements["rain_cloud"].reactions["anesthesia"] = { elem1:"nitric_acid_cloud", elem2:null, chance:0.05 }; } function createAcid(name,reactions, gasReactions, color, category, categoryGas, tempHigh, tempLowGas, tempLow, tempHighGas, density, densityGas) @@ -462,6 +462,7 @@ function createAcid(name,reactions, gasReactions, color, category, categoryGas, if (enabledMods.includes("mods/generative_mods.js")) { runAfterLoad(function() { generateCloud(name); + console.log(name); }); elements[name+"_gas"].reactions[name+"_gas"]= { "elem1": null, "elem2": name + "_cloud", "chance":0.3, "y":[0,12], "setting":"clouds" }; elements[name+"_gas"].reactions["rain_cloud"]= { "elem1": null, "elem2": name + "_cloud", "chance":0.4, "y":[0,12], "setting":"clouds" }; @@ -2197,9 +2198,11 @@ elements.molten_iodine = { behavior: behaviors.LIQUID, tempHigh: 184, tempLow: 113, + temp: 123, stateHigh: "iodine_gas", stateLow: "iodine", state: "liquid", + hidden: true, }; elements.iodine_gas = { diff --git a/mods/mobs.js b/mods/mobs.js index d1ae8033..7761f24f 100644 --- a/mods/mobs.js +++ b/mods/mobs.js @@ -197,7 +197,7 @@ if(enabledMods.includes(runAfterAutogenMod) && enabledMods.includes(explodeAtPlu if(Array.isArray(breakIntoElement)) { breakIntoElement = breakIntoElement[Math.floor(Math.random() * breakIntoElement.length)] }; - if(typeof(breakIntoElement) === "undefined") { + if(typeof(breakIntoElement) === "undefined" || breakIntoElement === null) { deletePixel(pixel.x,pixel.y); return true; }; diff --git a/mods/onTryMoveInto.js b/mods/onTryMoveInto.js index 0261f691..a66279a4 100644 --- a/mods/onTryMoveInto.js +++ b/mods/onTryMoveInto.js @@ -9,6 +9,8 @@ elements.on_try_move_into_test = { "dirt": { elem1: "diamond" }, }, state: "solid", + hidden: true, + excludeRandom: true, category: "special", density: 1000, tick: function(pixel) { @@ -42,12 +44,13 @@ function tryMove(pixel,nx,ny,leaveBehind,force) { // Reactions newPixel = pixelMap[nx][ny]; var newInfo = elements[newPixel.element]; + var returnVal = false; if(newInfo.onTryMoveInto !== undefined) { newInfo.onTryMoveInto(newPixel,pixel); if(!pixel || pixel.del) { return "deleted"; }; - return true; + returnVal = true; } var rr1 = false; if (info.reactions !== undefined && info.reactions[newPixel.element] !== undefined) { @@ -74,6 +77,9 @@ function tryMove(pixel,nx,ny,leaveBehind,force) { } } } + if(returnVal) { + return true; + } } return false; }