Fix
This commit is contained in:
parent
14bd8c215d
commit
d754141597
@ -512,17 +512,11 @@ function enqueueForJob2()
|
|||||||
_, job, _ = rednet.receive()
|
_, job, _ = rednet.receive()
|
||||||
if job then
|
if job then
|
||||||
if job == "nojobs" then
|
if job == "nojobs" then
|
||||||
|
updateState({ state = "Waiting for job... (retrying)" })
|
||||||
sleep(3)
|
sleep(3)
|
||||||
else
|
else
|
||||||
return tonumber(job)
|
return tonumber(job)
|
||||||
end
|
end
|
||||||
else
|
|
||||||
if not retrying then
|
|
||||||
retrying = true
|
|
||||||
--print("No job received. I will keep retrying.")
|
|
||||||
--turtlestate["state"] = "Waiting for job... (retrying)"
|
|
||||||
updateState({ state = "Waiting for job... (retrying)" })
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -594,9 +588,6 @@ function goToJob2(job)
|
|||||||
digSafe(turtle.inspectUp, turtle.digUp)
|
digSafe(turtle.inspectUp, turtle.digUp)
|
||||||
end
|
end
|
||||||
goToCoordXZ2(jobX, jobZ, extraaction)
|
goToCoordXZ2(jobX, jobZ, extraaction)
|
||||||
--moveSafe(turtle.down, turtle.inspectDown, turtle.digDown)
|
|
||||||
--moveSafe(turtle.up, turtle.inspectUp, turtle.digUp)
|
|
||||||
--moveSafe(turtle.up, turtle.inspectUp, turtle.digUp)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function unloadStuffs()
|
function unloadStuffs()
|
||||||
@ -671,15 +662,6 @@ function reportDuty2()
|
|||||||
rednet.send(server, "report")
|
rednet.send(server, "report")
|
||||||
rednet.send(server, tostring(id))
|
rednet.send(server, tostring(id))
|
||||||
rednet.send(server, tostring(fuelconsumed))
|
rednet.send(server, tostring(fuelconsumed))
|
||||||
--while true do
|
|
||||||
-- updateState({ state = "Waiting for thanks..." })
|
|
||||||
-- sender, message, proto = rednet.receive("jobcomplete", 2)
|
|
||||||
-- if message == "thanks" then
|
|
||||||
-- break
|
|
||||||
-- else
|
|
||||||
-- sleep(1)
|
|
||||||
-- end
|
|
||||||
--end
|
|
||||||
for k, v in pairs(turtlestate["ores"]) do
|
for k, v in pairs(turtlestate["ores"]) do
|
||||||
rednet.send(server, k)
|
rednet.send(server, k)
|
||||||
rednet.send(server, v)
|
rednet.send(server, v)
|
||||||
|
@ -33,7 +33,6 @@ while true do
|
|||||||
print("Found job request. Offering "..tostring(job))
|
print("Found job request. Offering "..tostring(job))
|
||||||
else
|
else
|
||||||
rednet.send(receiver, "nojobs")
|
rednet.send(receiver, "nojobs")
|
||||||
print("Found job request. Rejecting...")
|
|
||||||
end
|
end
|
||||||
elseif message == "report" then
|
elseif message == "report" then
|
||||||
_, job, _ = rednet.receive()
|
_, job, _ = rednet.receive()
|
||||||
|
Loading…
Reference in New Issue
Block a user