diff --git a/Rod_Quarry.lua b/Rod_Quarry.lua index 70852a74191b54d6122084f30ce825ff5f91fdcc..6e7f9557b84d40a10cf8bff8bb86855871280304 100644 --- a/Rod_Quarry.lua +++ b/Rod_Quarry.lua @@ -159,24 +159,49 @@ function Go_Home() end end - --Move to 0th Row - for i=0,CURRENT_ROW-1,1 do - r, err = turtle.forward() - if(not r) then - print(err) - print("2: GO HOME CRITICAL ERROR: Unable to move Forwards!!!") - return -2 + if Is_Even(CURRENT_LAYER) then + --Move to 0th Row + for i=0,CURRENT_ROW-1,1 do + r, err = turtle.forward() + if(not r) then + print(err) + print("2: GO HOME CRITICAL ERROR: Unable to move Forwards!!!") + return -2 + end end - end - --Move to 0th column - turtle.turnRight() - for i=0,CURRENT_COL-1,1 do - r, err = turtle.forward() - if(not r) then - print(err) - print("3: GO HOME CRITICAL ERROR: Unable to move Forwards!!!") - return -3 + --Move to 0th column + turtle.turnRight() + for i=0,CURRENT_COL-1,1 do + r, err = turtle.forward() + if(not r) then + print(err) + print("3: GO HOME CRITICAL ERROR: Unable to move Forwards!!!") + return -3 + end + end + turtle.turnLeft() + else + --Move to 0th column + turtle.turnRight() + for i=0,CURRENT_COL-1,1 do + r, err = turtle.forward() + if(not r) then + print(err) + print("3: GO HOME CRITICAL ERROR: Unable to move Forwards!!!") + return -3 + end + end + turtle.turnLeft() + + --Move to 0th Row + for i=0,CURRENT_ROW-1,1 do + r, err = turtle.forward() + if(not r) then + print(err) + print("2: GO HOME CRITICAL ERROR: Unable to move Forwards!!!") + return -2 + end end end @@ -190,8 +215,6 @@ function Go_Home() end end - turtle.turnLeft() - return 0 end @@ -210,26 +233,50 @@ function Go_Back() end end - -- Move to previous Column - turtle.turnRight() - for i=0,CURRENT_COL-1,1 do - r, err = turtle.forward() - if(not r) then - print(err) - print("3: GO BACK CRITICAL ERROR: Unable to move Forwards!!!") - return -3 + if Is_Even(CURRENT_COL) then + -- Move to previous Column + turtle.turnRight() + for i=0,CURRENT_COL-1,1 do + r, err = turtle.forward() + if(not r) then + print(err) + print("3: GO BACK CRITICAL ERROR: Unable to move Forwards!!!") + return -3 + end end - end + turtle.turnLeft() - --Move to previous Row - turtle.turnLeft() - for i=0,CURRENT_ROW-1,1 do - r, err = turtle.forward() - if(not r) then - print(err) - print("2: GO HOME CRITICAL ERROR: Unable to move Forwards!!!") - return -2 + --Move to previous Row + for i=0,CURRENT_ROW-1,1 do + r, err = turtle.forward() + if(not r) then + print(err) + print("2: GO HOME CRITICAL ERROR: Unable to move Forwards!!!") + return -2 + end end + else + --Move to previous Row + for i=0,CURRENT_ROW-1,1 do + r, err = turtle.forward() + if(not r) then + print(err) + print("2: GO HOME CRITICAL ERROR: Unable to move Forwards!!!") + return -2 + end + end + + -- Move to previous Column + turtle.turnRight() + for i=0,CURRENT_COL-1,1 do + r, err = turtle.forward() + if(not r) then + print(err) + print("3: GO BACK CRITICAL ERROR: Unable to move Forwards!!!") + return -3 + end + end + turtle.turnLeft() end -- Move one layer down