From e658ac0c73e1335afe438620919abc8a942b0c77 Mon Sep 17 00:00:00 2001
From: O-01-67 <68935009+O-01-67@users.noreply.github.com>
Date: Mon, 12 Sep 2022 12:47:17 -0400
Subject: [PATCH] update viscosities, add vodka

---
 mods/alcohol.js | 86 ++++++++++++++++++++++++++++---------------------
 1 file changed, 49 insertions(+), 37 deletions(-)

diff --git a/mods/alcohol.js b/mods/alcohol.js
index 1a72e973..e0b96a3d 100644
--- a/mods/alcohol.js
+++ b/mods/alcohol.js
@@ -1,5 +1,6 @@
-elements.alcohol.name = "ethanol"
-elements.alcohol.viscosity = elements.alcohol.viscosity * (1.074/1.0016)
+elements.alcohol.name = "ethanol";
+elements.alcohol.viscosity = 1.144;
+elements.water.viscosity = 1; //define reference viscosity of 1
 
 elements.methanol = {
     color: "#c9c5b1",
@@ -10,31 +11,8 @@ elements.methanol = {
         "head": { "elem2":"rotten_meat", "chance": 0.8 },
         "body": { "elem2":"rotten_meat", "chance": 0.8 },
     },
-    viscosity: 1*(0.553/1.0016),
-    tempHigh: 64.7,
-    stateHigh: ["steam","carbon_dioxide"], //todo: alcohols' phase transitions
-    burn: 100,
-    burnTime: 2,
-    fireColor: "#b2c5d1",
-    category: "liquids",
-    state: "liquid",
-    density: 792,
-    stain: -0.25,
-}
-
-
-elements.methanol = {
-    color: "#c9c5b1",
-    behavior: behaviors.LIQUID,
-    reactions: {
-        "virus": { "elem2":null },
-        "plague": { "elem2":null },
-        "head": { "elem2":"rotten_meat", "chance": 0.8 },
-        "body": { "elem2":"rotten_meat", "chance": 0.8 },
-    },
-    viscosity: 1*(0.553/1.0016),
-    tempHigh: 64.7,
-    stateHigh: ["steam","carbon_dioxide"], //todo: alcohols' phase transitions
+    viscosity: 0.56,
+    //tempHigh: 64.7,
     burn: 100,
     burnTime: 2,
     fireColor: "#b2c5d1",
@@ -51,9 +29,8 @@ elements.propanol = {
         "virus": { "elem2":null },
         "plague": { "elem2":null },
     },
-    viscosity: 1*(1.945/1.0016),
-    tempHigh: 97,
-    stateHigh: ["steam","carbon_dioxide"],
+    viscosity: 2.23, //EXERCISE 8: VISCOSITY OF PURE LIQUIDS AND SOLUTIONS
+    //tempHigh: 97,
     burn: 100,
     burnTime: 3,
     fireColor: "#ced8de",
@@ -70,9 +47,8 @@ elements.isopropanol = {
         "virus": { "elem2":null },
         "plague": { "elem2":null },
     },
-    viscosity: 1*(2.052/1.0016),
-    tempHigh: 82.5,
-    stateHigh: ["steam","carbon_dioxide"],
+    viscosity: 2.38, //http://www.ddbst.com/en/EED/PCP/VIS_C95.php (293K is close enough)
+    //tempHigh: 82.5,
     burn: 100,
     burnTime: 3,
     fireColor: "#d1c958",
@@ -89,13 +65,49 @@ elements.butanol = {
         "virus": { "elem2":null },
         "plague": { "elem2":null },
     },
-    viscosity: 1*(2.53/1.0016),
-    tempHigh: 118,
-    stateHigh: ["steam","carbon_dioxide"],
+    viscosity: 3.0011, //https://www.sciencedirect.com/science/article/abs/pii/S0021961416301446?via%3Dihub
+    //tempHigh: 118,
     burn: 100,
     burnTime: 3,
     category: "liquids",
     state: "liquid",
     density: 810,
     stain: -0.25,
-}
\ No newline at end of file
+}
+
+elements.alcohol.reactions.water = { //50% is close enough to the standard 40%
+	elem1: "vodka",
+	elem2: "vodka",
+}
+
+elements.vodka = {
+	color: "#9FAEC5",
+	behavior: behaviors.LIQUID,
+	reactions: {
+		"virus": { "elem2":null },
+		"plague": { "elem2":null },
+	},
+	//tempLow: -16,
+	//tempHigh: 78.37,
+    tick: function(pixel) { 
+		//thermal splitting function
+        /*var randomNeighbor = adjacentCoords[Math.floor(Math.random() * adjacentCoords.length)]
+        var rnx = randomNeighbor[0]
+        var rny = randomNeighbor[1]
+        if(pixel.temp >= 100) {
+            if(isEmpty(pixel.x+rnx, pixel.y+rny, false)) {
+                createPixel("ethanol_gas", pixel.x+rnx, pixel.y+rny)
+                changePixel(pixel, "water")
+            }
+        }*/
+    },
+	/*burn: 20,
+	burnTime: 60,
+	burnInto: "vodka_extinguish_handler",
+	fireColor: ["#80ACF0","#96CDFE","#bee6d4"],*/
+	//It is not possible to have the vodka catch fire temporarily and then be briefly unable to do so again; it is even more impossible to avoid waves while doing this.
+	category: "liquids",
+	state: "liquid",
+	density: 916,
+	stain: -0.25,
+}