From db8cb1fa89f97761cbb4eafd60f79042bbed0afc Mon Sep 17 00:00:00 2001
From: Suss <167750109+therealsuss@users.noreply.github.com>
Date: Wed, 19 Mar 2025 15:29:22 +1100
Subject: [PATCH] Update drill.js

---
 mods/drill.js | 175 ++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 154 insertions(+), 21 deletions(-)

diff --git a/mods/drill.js b/mods/drill.js
index 56a0fe5e..5a9bcab8 100644
--- a/mods/drill.js
+++ b/mods/drill.js
@@ -1,12 +1,11 @@
 elements.iron_drill = {
-    color: ["#474747","#2b2b2b","#808080"],
+    color: ["#474747","#2b2b2b","#636363"],
     behavior: [
-    "DL AND MX|CR:drill_base|DL AND MX",
-    "MX:true|XX|MX:true",
-    "MX:true|M1 AND SM%10 AND MX:true|MX:true",
+    "DL%5 AND MX|CR:drill_base|DL%5 AND MX",
+    "MX|LB:drill_base|MX",
+    "MX|M1 AND SM%10 AND MX|MX",
 ],
     category: "machines",
-    breakInto: "metal_scrap",
     state: "solid",
     tempHigh: 1538,
     stateHigh: "molten_iron",
@@ -15,11 +14,11 @@ elements.iron_drill = {
 };
 
 elements.drill_base = {
-    color: "#595959",
+    color: "#808080",
     behavior: [
     "XX|CR:drill_support AND CH:drill_support|XX",
     "XX|XX|XX",
-    "XX|M1|XX",
+    "XX|XX|XX",
 ],
     category: "machines",
     breakInto: "metal_scrap",
@@ -32,9 +31,9 @@ elements.drill_base = {
 };
 
 elements.drill_support = {
-    color: "#242424",
+    color: "#323232",
     behavior: [
-    "XX|CH:drill_support|XX",
+    "XX|CR:drill_top|XX",
     "XX|XX|XX",
     "XX|XX|XX",
 ],
@@ -48,12 +47,130 @@ elements.drill_support = {
     hidden: true,
 };
 
+elements.drill_top = {
+    color: "#323232",
+    behavior: [
+    "XX|XX|XX",
+    "XX|XX|CR:drill_side1",
+    "XX|XX|XX",
+],
+    category: "machines",
+    breakInto: "metal_scrap",
+    state: "solid",
+    tempHigh: 1538,
+    stateHigh: "molten_iron",
+    density: 7860,
+    noMix: true,
+    hidden: true,
+};
+elements.drill_side1 = {
+    color: "#323232",
+    behavior: [
+    "XX|XX|XX",
+    "XX|XX|CR:drill_side2",
+    "XX|XX|XX",
+],
+    category: "machines",
+    breakInto: "metal_scrap",
+    state: "solid",
+    tempHigh: 1538,
+    stateHigh: "molten_iron",
+    density: 7860,
+    noMix: true,
+    hidden: true,
+};
+
+elements.drill_side2 = {
+    color: "#323232",
+    behavior: [
+    "XX|XX|XX",
+    "XX|XX|CR:drill_side3",
+    "XX|XX|XX",
+],
+    category: "machines",
+    breakInto: "metal_scrap",
+    state: "solid",
+    tempHigh: 1538,
+    stateHigh: "molten_iron",
+    density: 7860,
+    noMix: true,
+    hidden: true,
+};
+
+elements.drill_side3 = {
+    color: "#323232",
+    behavior: [
+    "XX|XX|XX",
+    "XX|XX|CR:drill_side4",
+    "XX|XX|XX",
+],
+    category: "machines",
+    breakInto: "metal_scrap",
+    state: "solid",
+    tempHigh: 1538,
+    stateHigh: "molten_iron",
+    density: 7860,
+    noMix: true,
+    hidden: true,
+};
+
+elements.drill_side4 = {
+    color: "#323232",
+    behavior: [
+    "XX|XX|XX",
+    "XX|XX|CR:drill_side5%35 AND CR:drill_side4%65",
+    "XX|XX|XX",
+],
+    category: "machines",
+    breakInto: "metal_scrap",
+    state: "solid",
+    tempHigh: 1538,
+    stateHigh: "molten_iron",
+    density: 7860,
+    noMix: true,
+    hidden: true,
+};
+
+elements.drill_side5 = {
+    color: "#323232",
+    behavior: [
+    "XX|XX|XX",
+    "XX|XX|XX",
+    "XX|CR:drill_support_down|XX",
+],
+    category: "machines",
+    breakInto: "metal_scrap",
+    state: "solid",
+    tempHigh: 1538,
+    stateHigh: "molten_iron",
+    density: 7860,
+    noMix: true,
+    hidden: true,
+};
+
+elements.drill_support_down = {
+    color: "#323232",
+    behavior: [
+    "XX|XX|XX",
+    "XX|XX|XX",
+    "XX|CR:drill_support_down|XX",
+],
+    category: "machines",
+    breakInto: "metal_scrap",
+    state: "solid",
+    tempHigh: 1538,
+    stateHigh: "molten_iron",
+    density: 7860,
+    noMix: true,
+    hidden: true,
+};
+
 elements.gold_drill = {
     color: ["#f7c736","#ffe596","#d1a41d"],
     behavior: [
-    "DL AND MX|CR:drill_base|DL AND MX",
-    "MX:true|XX|MX:true",
-    "MX:true|M1 AND SM%25 AND MX:true|MX:true",
+    "DL%7 AND MX|CR:drill_base|DL%7 AND MX",
+    "MX|LB:drill_base|MX",
+    "MX|M1 AND SM%25 AND MX|MX",
 ],
     category: "machines",
     breakInto: "gold_coin",
@@ -68,12 +185,11 @@ elements.gold_drill = {
 elements.brass_drill = {
     color: ["#ad7f47","#874a00"],
     behavior: [
-    "DL AND MX|CR:drill_base|DL AND MX",
-    "MX:true|XX|MX:true",
-    "MX:true|M1 AND SM%8 AND MX:true|MX:true",
+    "DL%6 AND MX|CR:drill_base|DL%6 AND MX",
+    "MX|LB:drill_base|MX",
+    "MX|M1 AND SM%15 AND MX|MX",
 ],
     category: "machines",
-    breakInto: "metal_scrap",
     state: "solid",
     tempHigh: 927,
     stateHigh: "molten_brass",
@@ -85,9 +201,9 @@ elements.brass_drill = {
 elements.egg_drill = {
     color: "#ffe69c",
     behavior: [
-    "DL AND MX|CR:drill_base|DL AND MX",
-    "MX:true|XX|MX:true",
-    "MX:true|M1 AND SM%1 AND MX:true|MX:true",
+    "DL%1 AND MX|CR:drill_base|DL%1 AND MX",
+    "MX|LB:drill_base|MX",
+    "MX|M1 AND SM%1 AND MX|MX",
 ],
     category: "machines",
     breakInto: "yolk",
@@ -99,11 +215,28 @@ elements.egg_drill = {
     darkText: true,
 };
 
+elements.glass_drill = {
+    color: "#5e807d",
+    behavior: [
+    "DL%10 AND MX|CR:drill_base|DL%10 AND MX",
+    "MX|LB:drill_base AND SM%1|MX",
+    "MX|M1 AND SM%40 AND MX|MX",
+],
+    category: "machines",
+    breakInto: "glass_shard",
+    state: "solid",
+    tempHigh: 1500,
+    stateHigh: "molten_glass",
+    density: 2500,
+    noMix: true,
+    darkText: false,
+};
+
 elements.void_drill = {
     color: "#000000",
     behavior: [
     "DL|CR:drill_base|DL",
-    "DL|XX|DL",
+    "DL|LB:drill_base|DL",
     "DL|M1 AND DL|DL",
 ],
     category: "machines",
@@ -111,4 +244,4 @@ elements.void_drill = {
     density: 999999999999999,
     noMix: true,
     darkText: false,
-};
\ No newline at end of file
+};