From 74bbffdab2ba462dbea86df46e7ea8ac791e1501 Mon Sep 17 00:00:00 2001
From: O-01-67 <68935009+O-01-67@users.noreply.github.com>
Date: Thu, 1 Sep 2022 13:25:46 -0400
Subject: [PATCH] Exclude certain spouts from random anyway

that is, if their corresponding element is already excluded from random (*cough* supernova)
---
 mods/spouts.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/mods/spouts.js b/mods/spouts.js
index 0c5e902b..c74c1256 100644
--- a/mods/spouts.js
+++ b/mods/spouts.js
@@ -14,9 +14,11 @@ function _randomInt(max) {
     }
 }
 
+excludedElements = ["ketchup", "liquid_cloner", "fire_cloner"]
+
 runAfterLoad(function() {
     liquidArray = Object.keys(elements).filter(function(e) {
-        return (elements[e].state == "liquid" || elements[e].state == "gas") && elements[e] != "ketchup" && elements[e] != "liquid_cloner" && elements[e] != "fire_cloner";
+        return (elements[e].state == "liquid" || elements[e].state == "gas") && !excludedElements.includes(elements[e]);
     });
     for(i = 0; i < liquidArray.length; i++) {
         elements[`${liquidArray[i]}_spout`] = {
@@ -30,9 +32,10 @@ runAfterLoad(function() {
             temp: elements[liquidArray[i]].temp,
             hardness: 1,
         };
-        includeRandom == true ? elements[`${liquidArray[i]}_spout`].excludeRandom = false : elements[`${liquidArray[i]}_spout`].excludeRandom = true;
-    };
-        if(elements.liquid_cloner) { liquidArray.push("ketchup") };
-        if(elements.fire_cloner) { liquidArray.push("fire") };
-	liquidArray.push("ketchup");
+        if(includeRandom == true) {
+			elements[liquidArray[i]].excludeRandom ? elements[`${liquidArray[i]}_spout`].excludeRandom = true : elements[`${liquidArray[i]}_spout`].excludeRandom = false;
+		} else {
+			elements[`${liquidArray[i]}_spout`].excludeRandom = false;
+		};
+	};
 });