.

src/brulijam/lib/tutel.lua

@@ -57,7 +57,7 @@ end
 
 local function forward()
   if turtle.forward() then
-    local pos = getPos()
+    pos = getPos()
     sleep(1)
     if pos["r"] == 0 then
       pos["z"] = pos["z"] + 1
@@ -122,6 +122,54 @@ end
 
 
 
+
+local function goToPosition(toR, toX, toY, toZ)  end
+  -- go to lastValidY
+  while pos["y"] < toY do
+    secureDigUp()
+    up()
+  end
+  while pos["y"] > toY do
+    secureDigDown()
+    down()
+  end
+
+  --go to lastValidX
+  while pos["x"] < toX do
+    while not pos["r"] == 3 do
+      right()
+    end
+    secureDig()
+    forward()
+  end
+  while pos["x"] > toX do
+    while not pos["r"] == 1 do
+      right()
+    end
+    secureDig()
+    forward()
+  end
+
+  --go to lastValidZ
+  while pos["z"] < toZ do
+    while not pos["r"] == 0 do
+      right()
+    end
+    secureDig()
+    forward()
+  end
+  while pos["z"] > toZ do
+    while not pos["r"] == 2 do
+      right()
+    end
+    secureDig()
+    forward()
+  end
+
+
+
+
+
 return
 {
   secureDig=secureDig,
@@ -134,4 +182,5 @@ return
   left=left,
   right=right,
   getPos=getPos,
+  goToPosition=goToPosition,
 }

src/brulijam/t-fiboMiner.lua

@@ -62,14 +62,10 @@ local function getState()
     state["dataGoalPathProgress"] = 0
     state["dataCurrentRow"] = 0
     state["dataCurrentPathProgress"] = 0
-    state["x"] = 0
+    state["lastValidR"] = 0
-    state["y"] = 0
+    state["lastValidX"] = 0
-    state["z"] = 0
+    state["lastValidY"] = 0
-    state["r"] = 0 --towards south (pos Z)
+    state["lastValidZ"] = 0
-    state["startX"] = 0
-    state["startY"] = 0
-    state["startZ"] = 0
-    
 
     basic.writeToFile("brulijam/files/state-t-fiboMiner.txt", textutils.serialize(state))
   else
@@ -121,12 +117,10 @@ local function inventoryRework()
   --store items away
   if not spaceAvailable and chestAvailable then
     --turtle.up()
-    state["y"] = tutel.up(state["y"])
+    tutel.up()
-    setState(state)
     basic.secureDigUp()
     --turtle.up()
-    state["y"] = tutel.up(state["y"])
+    tutel.up()
-    setState(state)
     basic.secureDigUp()
     turtle.select(chestSlot)
     turtle.placeUp()
@@ -142,11 +136,9 @@ local function inventoryRework()
       end
     end
     --turtle.down()
-    state["y"] = tutel.down(state["y"])
+    tutel.down()
-    setState(state)
     --turtle.down()
-    state["y"] = tutel.down(state["y"])
+    tutel.down()
-    setState(state)
   end
 
   if not spaceAvailable and not chestAvailable then
@@ -170,18 +162,15 @@ end
 local function recursiveOreMining()
   for i=0, 3 do
     --turtle.turnLeft()
-    state["r"] = tutel.left(state["r"])
+    tutel.left()
-    setState(state)
     blockFound, blockData = turtle.inspect()
     if isOre(blockData) then
       tutel.secureDig()
       --turtle.forward()
-      state["x"], state["y"], state["z"], state["r"] = tutel.forward(state["x"],state["y"],state["z"],state["r"])
+      tutel.forward()
-      setState(state)
       recursiveOreMining()
       --turtle.back()
-      state["x"], state["y"], state["z"], state["r"] = tutel.back(state["x"],state["y"],state["z"],state["r"])
+      tutel.back()
-      setState(state)
     end
   end
 
@@ -189,24 +178,20 @@ local function recursiveOreMining()
   if isOre(blockData) then
     tutel.secureDigUp()
     --turtle.up()
-    state["y"] = tutel.up(state["y"])
+    tutel.up()
-    setState(state)
     recursiveOreMining()
     --turtle.down()
-    state["y"] = tutel.down(state["y"])
+    tutel.down()
-    setState(state)
   end
 
   blockFound, blockData = turtle.inspectDown()
   if isOre(blockData) then
     tutel.secureDigDown()
     --turtle.down()
-    state["y"] = tutel.down(state["y"])
+    tutel.down()
-    setState(state)
     recursiveOreMining()
     --turtle.up()
-    state["y"] = tutel.up(state["y"])
+    tutel.up()
-    setState(state)
   end
 end
 
@@ -217,8 +202,7 @@ local function mineRow()
     
     tutel.secureDig()
     --turtle.forward()
-    state["x"], state["y"], state["z"], state["r"] = tutel.forward(state["x"],state["y"],state["z"],state["r"])
+    tutel.forward()
-    setState(state)
     tutel.secureDigUp()
     tutel.secureDigDown()
 
@@ -227,20 +211,16 @@ local function mineRow()
 
     --check current mining step for ore
     --turtle.up()
-    state["y"] = tutel.up(state["y"])
+    tutel.up()
-    setState(state)
     recursiveOreMining()
     --turtle.down()
-    state["y"] = tutel.down(state["y"])
+    tutel.down()
-    setState(state)
     recursiveOreMining()
     --turtle.down()
-    state["y"] = tutel.down(state["y"])
+    tutel.down()
-    setState(state)
     recursiveOreMining()
     --turtle.up()
-    state["y"] = tutel.up(state["y"])
+    tutel.up()
-    setState(state)
     
     inventoryRework()
     --clearInventory()
@@ -248,9 +228,16 @@ local function mineRow()
     
     --save path progress
     state["dataCurrentPathProgress"] = i+1
-    setState(state)
   end
   print("row: " .. state["dataCurrentRow"]+1 .. "/" .. state["dataGoalRows"] .. ", pathProgress: " .. state["dataCurrentPathProgress"]+1 .. "/" .. state["dataGoalPathProgress"])
+  local pos = tutel.getPos()
+  --TODO SAVE LAST VALID POSITION HERE
+  state["lastValidR"] = pos["r"]
+  state["lastValidX"] = pos["x"]
+  state["lastValidY"] = pos["y"]
+  state["lastValidZ"] = pos["z"]
+  setState(state)
+
 end
 
 local function mineChunk()
@@ -267,33 +254,27 @@ local function mineChunk()
     --turn back and return to start of row if not last row
     if i<state["dataGoalRows"]-1 then
       --turtle.turnLeft()
-      state["r"] = tutel.left(state["r"])
+      tutel.left()
-      setState(state)
       --turtle.turnLeft()
-      state["r"] = tutel.left(state["r"])
+      tutel.left()
-      setState(state)
 
       for j=1, state["dataGoalPathProgress"]-1 do
         --turtle.forward()
-        state["x"], state["y"], state["z"], state["r"] = tutel.forward(state["x"],state["y"],state["z"],state["r"])
+        tutel.forward()
-        setState(state)
       end
 
       --go to next row
       --turtle.turnLeft()
-      state["r"] = tutel.left(state["r"])
+      tutel.left()
-      setState(state)
       for j=0, 2 do
         tutel.secureDig()
         --turtle.forward()
-        state["x"], state["y"], state["z"], state["r"] = tutel.forward(state["x"],state["y"],state["z"],state["r"])
+        tutel.forward()
-        setState(state)
         tutel.secureDigUp()
         tutel.secureDigDown()
       end
       --turtle.turnLeft()
-      state["r"] = tutel.left(state["r"])
+      tutel.left()
-      setState(state)
     end
     
     state["dataCurrentRow"] = i+1
@@ -312,46 +293,47 @@ local function mineFibo()
 
     --go to next chunk
     --turtle.turnRight()
-    state["r"] = tutel.right(state["r"])
+    tutel.right()
-    setState(state)
     for j=1, 2 do
       tutel.secureDig()
       --turtle.forward()
-      state["x"], state["y"], state["z"], state["r"] = tutel.forward(state["x"],state["y"],state["z"],state["r"])
+      tutel.forward()
-      setState(state)
       tutel.secureDigUp()
       tutel.secureDigDown()
     end
 
     --get next fibo number
     state["dataCurrentFibo"] = math.floor((state["dataCurrentFibo"] * (1+math.sqrt(5))/2) + 0.5)
-    setState(state)
   end
 end
 
+local function checkPosition()
+  pos = tutel.getPos()
+  state = getState()
+
+  if not (pos["r"] == state["lastValidR"] and pos["x"] == state["lastValidX"] and pos["y"] == state["lastValidY"] and pos["z"] == state["lastValidZ"]) then
+    --TODO go to last valid pos
+    print("Tutel moving to where it should be")
+    tutel.goToPosition(state["lastValidR"], state["lastValidX"], state["lastValidY"], state["lastValidZ"])
+
+  end
+end
+
+
 if fs.exists "brulijam/files/state-t-fiboMiner.txt" then
   --setup()
+  checkPosition()
   mineFibo()
 else
   state = getState()
 
-  write("x: ")
+  local pos = tutel.getPos()
-  startX = read()
+
-  write("y: ")
+  state["lastValidR"] = pos["r"]
-  startY = read()
+  state["lastValidX"] = pos["x"]
-  write("z: ")
+  state["lastValidY"] = pos["y"]
-  startZ = read()
+  state["lastValidZ"] = pos["z"]
-  write("r (S=0,W=1,N=2,E=3):")
-  startR = read()
 
-  state["x"] = startX
-  state["y"] = startY
-  state["z"] = startZ
-  state["r"] = startR
-  
-  state["startX"] = startX
-  state["startY"] = startY
-  state["startZ"] = startZ
   setState(state)
 end