remove dependency on device global + milo backup config

This commit is contained in:
kepler155c@gmail.com
2019-03-11 23:48:53 -04:00
parent f2a8a7e639
commit b43761faf1
21 changed files with 79 additions and 125 deletions

View File

@@ -4,11 +4,14 @@ local Project = require('neural.project')
local UI = require('ui')
local Util = require('util')
local device = _G.device
local peripheral = _G.peripheral
local scanner = device.neuralInterface or device['plethora:scanner'] or peripheral.find('manipulator')
if not scanner or not scanner.scan then
local scanner =
peripheral.find('neuralInterface') or
peripheral.find('plethora:scanner') or
peripheral.find('manipulator')
if not scanner or not scanner.scan then
error('Plethora scanner must be equipped')
end

View File

@@ -4,7 +4,6 @@ local Project = require('neural.project')
local UI = require('ui')
local Util = require('util')
local device = _G.device
local peripheral = _G.peripheral
local turtle = _G.turtle
@@ -13,9 +12,9 @@ local function equip(side, rawName)
end
local target = nil
local ni = device.neuralInterface
local ni = peripheral.find('neuralInterface')
local sensor = ni or
device['plethora:sensor'] or
peripheral.find('plethora:sensor') or
peripheral.find('manipulator') or
equip('left', 'plethora:module:3')

View File

@@ -1,12 +1,12 @@
local Interface = { }
local Angle = require('neural.angle')
local Util = require('util')
local Util = require('util')
local device = _G.device
local os = _G.os
local os = _G.os
local peripheral = _G.peripheral
local ni = device.neuralInterface or { }
local ni = peripheral.find('neuralInterface') or { }
for k,v in pairs(ni) do
Interface[k] = v
end

View File

@@ -1,9 +1,10 @@
local device = _G.device
local peripheral = _G.peripheral
if not device.neuralInterface then
local ni = peripheral.find('neuralInterface')
if not ni then
error('Missing neural interface')
elseif not device.neuralInterface.disableAI then
_G.printError('Unable to disable AI')
elseif not ni.disableAI then
error('Missing kinetic augment')
else
device.neuralInterface.disableAI()
ni.disableAI()
end

View File

@@ -1,9 +1,10 @@
local device = _G.device
local peripheral = _G.peripheral
if not device.neuralInterface then
local ni = peripheral.find('neuralInterface')
if not ni then
error('Missing neural interface')
elseif not device.neuralInterface.getEquipment then
elseif not ni.getEquipment then
error('Missing introspection module')
else
device.neuralInterface.getEquipment().drop(6)
ni.getEquipment().drop(6)
end

View File

@@ -1,14 +1,15 @@
_G.requireInjector(_ENV)
local GPS = require('gps')
local Point = require('point')
local Util = require('util')
local os = _G.os
local parallel = _G.parallel
local os = _G.os
local parallel = _G.parallel
local peripheral = _G.peripheral
local t = { }
local ni = _G.device.neuralInterface or error('Neural Interface not found')
local ni =
peripheral.find('neuralInterface') or
error('Neural Interface not found')
if not ni.getID then
error('Missing Introspection Module')

View File

@@ -1,16 +1,15 @@
_G.requireInjector(_ENV)
local GPS = require('gps')
local Util = require('util')
local os = _G.os
local shell = _ENV.shell
local os = _G.os
local peripheral = _G.peripheral
local shell = _ENV.shell
local args = { ... }
local fileName = args[1] or 'neural.tbl'
local t = Util.readTable(shell.resolve(fileName)) or error('Unable to read ' .. fileName)
local ni = _G.device.neuralInterface
local ni = peripheral.find('neuralInterface')
local function walkTo(x, y, z)
local pt = GPS.locate(2)