MayaTheShy/opus-apps
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

begin moving turtle specific code from opus into turtle package

Browse Source
This commit is contained in:
kepler155c@gmail.com
2019-02-18 02:57:01 -05:00
parent 20bb3d831f
commit 3564dff4fd
21 changed files with 331 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
builder/apis/turtle.lua
View File

@@ -446,7 +446,7 @@ function TurtleBuilder:inAirDropoff()
self:log('Received supply location')
os.sleep(0)
turtle._goto(pt)
turtle.go(pt)
os.sleep(.1) -- random computer is not connected error
local chestAdapter = Adapter.wrap({ direction = 'down', side = 'top' })
@@ -508,7 +508,7 @@ function TurtleBuilder:inAirResupply()
self:log('Received supply location')
os.sleep(0)
turtle._goto(pt)
turtle.go(pt)
os.sleep(.1) -- random computer is not connected error
local chestAdapter = Adapter.wrap({ direction = 'down', side = 'top' })
@@ -608,7 +608,7 @@ function TurtleBuilder:gotoSupplyPoint()
-- go to the corner closest to the supplies point
-- pathfind the rest of the way
local pt = self:getBuildingCorner(turtle.point.y)
turtle._goto({ x = pt.x, z = pt.z })
turtle.go({ x = pt.x, z = pt.z })
turtle.set({
digPolicy = 'digNone',
attackPolicy = 'attackNone',
@@ -818,8 +818,8 @@ function TurtleBuilder:placePiston(b)
return success
end
function TurtleBuilder:_goto(x, z, y, heading)
if not turtle._goto({ x = x, z = z, y = y, heading = heading }) then
function TurtleBuilder:go(x, z, y, heading)
if not turtle.go({ x = x, z = z, y = y, heading = heading }) then
print('stuck')
print('Press enter to continue')
os.sleep(1)
@@ -844,7 +844,7 @@ function TurtleBuilder:gotoEx(x, z, y, h, travelPlane)
elseif distance > 1 then
self:gotoTravelPlane(travelPlane)
end
self:_goto(x, z, y, h)
self:go(x, z, y, h)
end
function TurtleBuilder:placeDirectionalBlock(b, slot, travelPlane)
@@ -1128,7 +1128,7 @@ function TurtleBuilder:build()
if b.y ~= turtle.getPoint().y then
turtle.gotoY(b.y)
end
self:_goto(b.x, b.z, b.y)
self:go(b.x, b.z, b.y)
turtle.digDown()
-- if no supplier, then should fill all slots
@@ -1171,7 +1171,7 @@ function TurtleBuilder:build()
end
else
self:gotoTravelPlane(travelPlane)
self:_goto(b.x, b.z, b.y)
self:go(b.x, b.z, b.y)
b.placed = self:placeDown(slot)
end