Merge pull request #1323 from SquareScreamYT/main

mods/aChefsDream.js

@@ -3135,6 +3135,10 @@ elements.cut_ginger = {
         "XX|XX|XX",
         "M2|M1|M2",
     ],
+    reactions: {
+        "flour": { elem1:"gingerbread", elem2:null },
+        "bread": { elem1:"gingerbread", elem2:null },
+    },
     category:"food",
     tempHigh: 100,
     stateHigh: "steam",
@@ -6770,6 +6774,7 @@ elements.whisked_egg_white ={
     reactions: {
         "corn_syrup": { elem1: "marshmallow", elem2: null, chance: 2 },
         "sugar": { elem1: "marshmallow", elem2: null, chance: 2 },
+        "icing_sugar": { elem1: "meringue", elem2: null, chance: 0.1 },
     },
     viscosity: 1.5,
     tempHigh: 1000,

mods/aChefsDream2.js

@@ -312,6 +312,7 @@ elements.tea_leaves = {
   stateHigh: ["fire","smoke","smoke","smoke","ash"],
   tempLow: -2,
   stateLow: "frozen_plant",
+  breakInto: "matcha_powder",
   burn:10,
   burnTime:300,
   burnInto: ["fire","smoke","smoke","smoke","smoke","smoke","smoke","fragrance"],
@@ -626,7 +627,7 @@ elements.cinnamon_powder.reactions.nutmeg_powder = { elem1: "pumpkin_spice", ele
 elements.coffee.reactions.pumpkin_mash = { elem2: null, color1: "#7e3c09", chance: 0.005 };
 elements.coffee.reactions.pumpkin_spice = { elem2: null, color1: "#7e3c09", chance: 0.005 };
 
-elements.nutmeg_tree = {
+elements.nutmeg_wood = {
     color: "#6B4226",
     behavior: behaviors.WALL,
     tempHigh: 400,
@@ -649,9 +650,9 @@ elements.nutmeg_branch = {
         "XX|XX|XX",
     ],
     tempHigh: 100,
-    stateHigh: "nutmeg_tree",
+    stateHigh: "nutmeg_wood",
     tempLow: -30,
-    stateLow: "nutmeg_tree",
+    stateLow: "nutmeg_wood",
     category: "life",
     burn: 30,
     burnTime: 60,
@@ -738,4 +739,77 @@ elements.nutmeg_powder = {
     hidden: false
 };
 
+elements.matcha_powder = {
+  color: ["#a8dd3e","#b2c653", "#c0d55e"],
+  reactions: {
+    "water": { elem2:"matcha", tempMin:80 },
+    "salt_water": { elem2:"matcha", tempMin:80 },
+    "sugar_water": { elem2:"matcha", tempMin:80 },
+    "seltzer": { elem2:"matcha", tempMin:80 },
+    "stench": { elem2:null, chance:0.25 },
+    "steam": { elem2:"fragrance", chance:0.1 },
+    "flea": { elem2:null, chance:0.01 },
+    "termite": { elem2:null, chance:0.01 },
+    "fly": { elem2:null, chance:0.01 },
+    "ant": { elem2:null, chance:0.01 },
+    "stink_bug": { elem2:null, chance:0.01 },
+  },
+  behavior: behaviors.POWDER,
+  tempHigh: 90,
+  stateHigh: ["matcha","foam","foam","fragrance"],
+  burn:10,
+  burnTime:300,
+  burnInto: ["fire","smoke","smoke","smoke","smoke","smoke","smoke","fragrance"],
+  category:"food",
+  state: "solid",
+  density: 1400,
+  isFood: true,
+}
+
+elements.matcha = {
+	color: "#74A12E",
+	behavior: behaviors.LIQUID,
+	reactions: {
+		"stench": { elem2:null },
+		"flea": { elem2:null, chance:0.01 },
+		"oxygen": { elem2:"fragrance", chance:0.01 },
+		"infection": { elem2:"blood", chance:0.005 },
+		"plague": { elem2:null, chance:0.004 },
+		"sugar": { elem2:null, color1:"#8f5a21", chance:0.005},
+		"honey": { elem2:null, color1:"#8f5a21", chance:0.005},
+		"milk": { elem2:null, color1:"#9c6c38", chance:0.005},
+		"nut_milk": { elem2:null, color1:"#9c6c38", chance:0.005},
+		"fruit_milk": { elem2:null, color1:"#9c5938", chance:0.005},
+		"chocolate_milk": { elem2:"foam", color1:"#784b1a", chance:0.005},
+		"strawberry_jam": { elem2:"foam", color1:"#FC9FB1", chance:0.005},
+		"pilk": { elem2:"foam", color1:"#9c7954", chance:0.005},
+		"cream": { elem2:null, color1:"#9c6c38", chance:0.005},
+		"ice_cream": { elem2:null, color1:"#9c6c38", chance:0.005},
+		"tea": { elem2:"bubble", color2:"#87633d", attr2:{"clone":"tea"}, chance:0.001, tempMin:80 },
+		"paper": { stain2:"#6c4317", chance:0.1 }
+	},
+	tempHigh: 125,
+	stateHigh: ["steam","fragrance",null],
+	temp: 70,
+	tempLow: 0,
+	category:"liquids",
+	state: "liquid",
+	density: 1001,
+	stain: -0.1,
+	hidden: true,
+	isFood: true
+}
+
+elements.meringue = {
+  color: "#faf6ed",
+  behavior: behaviors.STURDYPOWDER,
+  tempHigh: 186,
+  stateHigh: ["steam","smoke"],
+  viscosity: 1.5,
+  category: "food",
+  state: "solid",
+  density: 1036.86,
+  isFood: true
+}
+
 },true)