Compare commits

...

2 commits

Author SHA1 Message Date
Théophile Bastian fb47e96955 Mine: fix move 2020-08-18 18:38:51 +02:00
Théophile Bastian e806819475 Mine turtle: fix refuel 2020-08-18 18:35:05 +02:00

View file

@ -68,24 +68,28 @@ end
function go_to(dh, dd, ds)
go_to_depth(0)
while height > dh do
turtle.down()
height = height - 1
end
while height < dh do
turtle.up()
height = height + 1
if height ~= dh then
while height > dh do
turtle.down()
height = height - 1
end
while height < dh do
turtle.up()
height = height + 1
end
end
turn_abs(1)
if side ~= ds then
turn_abs(1)
while side > ds do
turtle.back()
side = side - 1
end
while side < ds do
turtle.forward()
side = side + 1
while side > ds do
turtle.back()
side = side - 1
end
while side < ds do
turtle.forward()
side = side + 1
end
end
go_to_depth(dd)
@ -116,7 +120,7 @@ function refuel_turtle()
return false
end
go_to(DROP_POINT_H, DROP_POINT_D, DROP_POINT_S)
go_to(FUEL_POINT_H, FUEL_POINT_D, FUEL_POINT_S)
while turtle.getFuelLevel() < FUEL_EXPECTATION do
local rc, desc = turtle.suckUp()
if not rc then
@ -135,7 +139,7 @@ function find_next_shaft()
while true do
print("Climb")
for hei=0,MAX_HEIGHT-1 do
for hei=1,MAX_HEIGHT-1 do
if (hei % 3) == 0 then
if turtle.detect() then
return
@ -195,8 +199,8 @@ end
function main()
if turtle.getFuelLevel() < FUEL_LOW then
refuel_turtle()
else
print("NO FUEL AT ALL.")
elseif turtle.getFuelLevel() < distance_to_refuel() then
print("Not enough fuel to begin with.")
return
end