From e077be9e955b9a1329d09d95426edbd40aa9799b Mon Sep 17 00:00:00 2001
From: Dominic Zimmer <s8dozimm@stud.uni-saarland.de>
Date: Sun, 5 Jul 2020 03:39:21 +0200
Subject: [PATCH] Update

---
 dominic/canemine.lua | 72 ++++++++++++++++++++++++++++++++------------
 1 file changed, 52 insertions(+), 20 deletions(-)

diff --git a/dominic/canemine.lua b/dominic/canemine.lua
index fc10c3d..2d04456 100644
--- a/dominic/canemine.lua
+++ b/dominic/canemine.lua
@@ -194,25 +194,53 @@ function moveSafeForward()
     moveSafe(turtle.forward, turtle.inspect, noop)
 end
 
-function goToBarrel()
-    moveSafe(turtle.forward, turtle.inspect, noop)
-    turtle.turnRight()
-    moveSafe(turtle.forward, turtle.inspect, noop)
-    turtle.turnLeft()
-    moveSafe(turtle.forward, turtle.inspect, noop)
-    moveSafe(turtle.forward, turtle.inspect, noop)
-    moveSafe(turtle.forward, turtle.inspect, noop)
-    moveSafe(turtle.down, turtle.inspectDown, noop)
+function goToBarrel(path)
+    if path == 0 then
+        turtle.turnLeft()
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        turtle.turnRight()
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        turtle.turnRight()
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        moveSafe(turtle.down, turtle.inspectDown, noop)
+    else
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        turtle.turnRight()
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        turtle.turnLeft()
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        moveSafe(turtle.down, turtle.inspectDown, noop)
+        turtle.turnRight()
+    end
+end
+
+function leaveBarrel(path)
+    if path == 0 then
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        turtle.turnRight()
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        turtle.turnRight()
+    else
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        turtle.turnRight()
+        moveSafe(turtle.forward, turtle.inspect, noop)
+        turtle.turnRight()
+    end
 end
 
 function reportDuty(id)
-    turtle.turnRight()
-    moveSafeForward()
-    moveSafeForward()
-    moveSafeForward()
-    turtle.turnRight()
-    moveSafeForward()
-    turtle.turnRight()
     moveSafe(turtle.down, turtle.inspectDown, noop)
     moveSafe(turtle.down, turtle.inspectDown, noop)
     moveSafe(turtle.down, turtle.inspectDown, noop)
@@ -271,11 +299,10 @@ function enqueueTurtle()
 end
 
 function doRefuel()
-    turtle.select(1)
     while turtle.getFuelLevel() < 1500 do
-        turtle.suck(1)
+        turtle.suck(4)
         selectFuel()
-        turtle.refuel(1)
+        turtle.refuel()
     end
 end
 
@@ -317,14 +344,19 @@ function emptyToBarrel()
 end
 
 while true do
+    fuel = turtle.getFuelLevel()
     thejob = waitForJob()
     goToJob()
     x, z = ithSpot(thejob)
     digTo(x,z)
     digShaft()
     goToSpawn(x, z)
-    goToBarrel()
+    path = math.floor(math.random() + 0.5)
+    goToBarrel(path)
     emptyToBarrel()
+    leaveBarrel(path)
     reportDuty(thejob)
     enqueueTurtle()
+    fuelconsumed = fuel - turtle.getFuelLevel()
+    print("Consumed "..tostring(fuelconsumed).." fuel")
 end