Move config from test.lua to config.lua
This commit is contained in:
parent
e1b385fffc
commit
15fdb806aa
11
config.lua
Normal file
11
config.lua
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
return {
|
||||||
|
has_me = true,
|
||||||
|
main_system_ae_bridge_side = "right",
|
||||||
|
main_me_inventory_side = "up",
|
||||||
|
colony_interface_side = "left",
|
||||||
|
monitor_side = "top",
|
||||||
|
monitor_scale = 1.0,
|
||||||
|
step_sleep_time = 0.5,
|
||||||
|
round_sleep_time = 60.0,
|
||||||
|
initial_tab = 1,
|
||||||
|
}
|
39
test.lua
39
test.lua
|
@ -1,27 +1,16 @@
|
||||||
-- options --
|
local config = require "config"
|
||||||
local has_me = true
|
|
||||||
local main_system_ae_bridge_side = "right"
|
|
||||||
local main_me_inventory_side = "up"
|
|
||||||
local colony_interface_side = "left"
|
|
||||||
local monitor_side = "top"
|
|
||||||
local monitor_scale = 1.0
|
|
||||||
local step_sleep_time = 0.5
|
|
||||||
local round_sleep_time = 60.0
|
|
||||||
local current_tab = 1
|
|
||||||
|
|
||||||
|
|
||||||
-- runtime variables --
|
|
||||||
local pretty = require "cc.pretty"
|
local pretty = require "cc.pretty"
|
||||||
local permset = require "permset"
|
local permset = require "permset"
|
||||||
|
|
||||||
local main_me = {}
|
local main_me = {}
|
||||||
if has_me then
|
if config.has_me then
|
||||||
main_me = peripheral.wrap(main_system_ae_bridge_side)
|
main_me = peripheral.wrap(config.main_system_ae_bridge_side)
|
||||||
end
|
end
|
||||||
local colony = peripheral.wrap(colony_interface_side)
|
local colony = peripheral.wrap(config.colony_interface_side)
|
||||||
|
|
||||||
local requests = {}
|
local requests = {}
|
||||||
local orders = {}
|
local orders = {}
|
||||||
|
local current_tab = config.initial_tab
|
||||||
|
|
||||||
-- to match click positions back to item names
|
-- to match click positions back to item names
|
||||||
local display_list = {}
|
local display_list = {}
|
||||||
|
@ -224,17 +213,17 @@ function wait_for(time_secs)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
if peripheral.isPresent(monitor_side) then
|
if peripheral.isPresent(config.monitor_side) then
|
||||||
monitor = peripheral.wrap(monitor_side)
|
monitor = peripheral.wrap(config.monitor_side)
|
||||||
monitor.setTextScale(monitor_scale)
|
monitor.setTextScale(config.monitor_scale)
|
||||||
term.redirect(monitor)
|
term.redirect(monitor)
|
||||||
end
|
end
|
||||||
|
|
||||||
function get_requests()
|
function get_requests()
|
||||||
requests = {}
|
requests = {}
|
||||||
local reqs = colony.getRequests()
|
local reqs = colony.getRequests()
|
||||||
local me_items = has_me
|
local me_items = config.has_me
|
||||||
if has_me then
|
if config.has_me then
|
||||||
me_items = main_me.listItems()
|
me_items = main_me.listItems()
|
||||||
end
|
end
|
||||||
for i, req in pairs(reqs) do
|
for i, req in pairs(reqs) do
|
||||||
|
@ -249,7 +238,7 @@ function get_requests()
|
||||||
if left_amount > 0 and allowed_items[it.name] == true then
|
if left_amount > 0 and allowed_items[it.name] == true then
|
||||||
local export_amount = math.min(have_it.amount, left_amount)
|
local export_amount = math.min(have_it.amount, left_amount)
|
||||||
left_amount = left_amount - export_amount
|
left_amount = left_amount - export_amount
|
||||||
main_me.exportItem({name=it.name, count=export_amount}, main_me_inventory_side)
|
main_me.exportItem({name=it.name, count=export_amount}, config.main_me_inventory_side)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -258,7 +247,7 @@ function get_requests()
|
||||||
if found == false then
|
if found == false then
|
||||||
table.insert(requests, {req=req, answer=nil})
|
table.insert(requests, {req=req, answer=nil})
|
||||||
end
|
end
|
||||||
wait_for(step_sleep_time)
|
wait_for(config.step_sleep_time)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -269,7 +258,7 @@ function get_orders()
|
||||||
for i, order in pairs(orders) do
|
for i, order in pairs(orders) do
|
||||||
local res = colony.getWorkOrderResources(order.id)
|
local res = colony.getWorkOrderResources(order.id)
|
||||||
table.insert(orders, {id=order.id, type=order.workOrderType, target=order.type, pos=order.builder, item=res.item, claimed=order.isClaimed, delivering=res.delivering})
|
table.insert(orders, {id=order.id, type=order.workOrderType, target=order.type, pos=order.builder, item=res.item, claimed=order.isClaimed, delivering=res.delivering})
|
||||||
wait_for(step_sleep_time)
|
wait_for(config.step_sleep_time)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -279,5 +268,5 @@ while true do
|
||||||
get_requests()
|
get_requests()
|
||||||
get_orders()
|
get_orders()
|
||||||
currently_working = false
|
currently_working = false
|
||||||
wait_for(round_sleep_time)
|
wait_for(config.round_sleep_time)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue