mirrors/opus
1
0
Fork 0
mirror of https://github.com/kepler155c/opus synced 2025-01-03 20:30:28 +00:00
Code Issues Releases Wiki Activity

safe digging

Browse Source
This commit is contained in:
kepler155c@gmail.com 2019-01-13 13:24:37 -05:00
parent 9edb4e7d5b
commit eabfde64e9
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/apps/Files.lua
View File

@ -135,6 +135,7 @@ local Browser = UI.Page {
}, },
accelerators = { accelerators = {
q = 'quit', q = 'quit',
c = 'cedit',
e = 'edit', e = 'edit',
s = 'shell', s = 'shell',
r = 'refresh', r = 'refresh',
@ -341,6 +342,9 @@ function Browser:eventHandler(event)
elseif event.type == 'edit' and file then elseif event.type == 'edit' and file then
self:run('edit', file.name) self:run('edit', file.name)
elseif event.type == 'cedit' and file then
self:run('cedit', file.name)
elseif event.type == 'shell' then elseif event.type == 'shell' then
self:run('sys/apps/shell') self:run('sys/apps/shell')

36
sys/extensions/6.tl3.lua
View File

@ -71,10 +71,32 @@ end
turtle.reset() turtle.reset()
local function _dig(name, inspect, dig)
if name then
local s, b = inspect()
if not s or b.name ~= name then
return false
end
end
return dig()
end
function turtle.dig(s)
return _dig(s, turtle.inspect, turtle.native.dig)
end
function turtle.digUp(s)
return _dig(s, turtle.inspectUp, turtle.native.digUp)
end
function turtle.digDown(s)
return _dig(s, turtle.inspectDown, turtle.native.digDown)
end
local actions = { local actions = {
up = { up = {
detect = turtle.native.detectUp, detect = turtle.native.detectUp,
dig = turtle.native.digUp, dig = turtle.digUp,
move = turtle.native.up, move = turtle.native.up,
attack = turtle.native.attackUp, attack = turtle.native.attackUp,
place = turtle.native.placeUp, place = turtle.native.placeUp,
@ -86,7 +108,7 @@ local actions = {
}, },
down = { down = {
detect = turtle.native.detectDown, detect = turtle.native.detectDown,
dig = turtle.native.digDown, dig = turtle.digDown,
move = turtle.native.down, move = turtle.native.down,
attack = turtle.native.attackDown, attack = turtle.native.attackDown,
place = turtle.native.placeDown, place = turtle.native.placeDown,
@ -98,7 +120,7 @@ local actions = {
}, },
forward = { forward = {
detect = turtle.native.detect, detect = turtle.native.detect,
dig = turtle.native.dig, dig = turtle.dig,
move = turtle.native.forward, move = turtle.native.forward,
attack = turtle.native.attack, attack = turtle.native.attack,
place = turtle.native.place, place = turtle.native.place,
@ -1164,10 +1186,10 @@ function turtle.detectDownAt(pt) return _actionDownAt(actionsAt.detect,
function turtle.detectForwardAt(pt) return _actionForwardAt(actionsAt.detect, pt) end function turtle.detectForwardAt(pt) return _actionForwardAt(actionsAt.detect, pt) end
function turtle.detectUpAt(pt) return _actionUpAt(actionsAt.detect, pt) end function turtle.detectUpAt(pt) return _actionUpAt(actionsAt.detect, pt) end
function turtle.digAt(pt) return _actionAt(actionsAt.dig, pt) end function turtle.digAt(pt, ...) return _actionAt(actionsAt.dig, pt, ...) end
function turtle.digDownAt(pt) return _actionDownAt(actionsAt.dig, pt) end function turtle.digDownAt(pt, ...) return _actionDownAt(actionsAt.dig, pt, ...) end
function turtle.digForwardAt(pt) return _actionForwardAt(actionsAt.dig, pt) end function turtle.digForwardAt(pt, ...) return _actionForwardAt(actionsAt.dig, pt, ...) end
function turtle.digUpAt(pt) return _actionUpAt(actionsAt.dig, pt) end function turtle.digUpAt(pt, ...) return _actionUpAt(actionsAt.dig, pt, ...) end
function turtle.attackAt(pt) return _actionAt(actionsAt.attack, pt) end function turtle.attackAt(pt) return _actionAt(actionsAt.attack, pt) end
function turtle.attackDownAt(pt) return _actionDownAt(actionsAt.attack, pt) end function turtle.attackDownAt(pt) return _actionDownAt(actionsAt.attack, pt) end