mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-23 00:13:13 +09:00
Add Transmit/Receive Combinators. Transmit combinators are Deciders which also output into txbuffer.txt. Receive Combinators are Constants which replay frames received from external sources via remote calls to receiveFrame and recieveMany.
This commit is contained in:
1 parent
4f8ad5eec6
commit
f9d6d9e001
5 files changed
+239
-44
No files matched your search
@@ -18,9 +18,15 @@ OUTPUT_TANK_NAME = "get-tank"
|
|||||||
OUTPUT_TANK_PICTURE_PATH = nil
|
OUTPUT_TANK_PICTURE_PATH = nil
|
||||||
OUTPUT_TANK_ICON_PATH = nil
|
OUTPUT_TANK_ICON_PATH = nil
|
||||||
|
|
||||||
|
MAX_RX_BUFFER_SIZE = 40 -- slightly more than one second
|
||||||
|
RX_COMBINATOR_NAME = "get-combinator"
|
||||||
|
TX_COMBINATOR_NAME = "put-combinator"
|
||||||
|
|
||||||
|
|
||||||
OUTPUT_FILE = "output.txt"
|
OUTPUT_FILE = "output.txt"
|
||||||
ORDER_FILE = "orders.txt"
|
ORDER_FILE = "orders.txt"
|
||||||
|
TX_BUFFER_FILE = "txbuffer.txt"
|
||||||
|
|
||||||
|
|
||||||
UPATE_RATE = 60
|
UPATE_RATE = 60
|
||||||
|
CIRCUIT_UPATE_RATE = 5
|
||||||
+137
-23
@@ -43,6 +43,11 @@ function AddEntity(entity)
|
|||||||
--add the chests to a lists if these chests so they can be interated over
|
--add the chests to a lists if these chests so they can be interated over
|
||||||
global.outputTanks[HashPosition(entity.position)] = entity
|
global.outputTanks[HashPosition(entity.position)] = entity
|
||||||
entity.active = false
|
entity.active = false
|
||||||
|
elseif entity.name == TX_COMBINATOR_NAME then
|
||||||
|
table.insert(global.txControls, entity.get_or_create_control_behavior())
|
||||||
|
elseif entity.name == RX_COMBINATOR_NAME then
|
||||||
|
table.insert(global.rxControls, entity.get_or_create_control_behavior())
|
||||||
|
entity.operable=false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -92,6 +97,12 @@ script.on_event(defines.events.on_tick, function(event)
|
|||||||
global.outputTanks = global.outputTanks or {}
|
global.outputTanks = global.outputTanks or {}
|
||||||
global.outputList = global.outputList or {}
|
global.outputList = global.outputList or {}
|
||||||
global.inputList = global.inputList or {}
|
global.inputList = global.inputList or {}
|
||||||
|
global.rxControls = global.rxControls or {}
|
||||||
|
global.txControls = global.txControls or {}
|
||||||
|
|
||||||
|
|
||||||
|
-- TX Combinators must run every tick to catch single pulses
|
||||||
|
HandleTXCombinators()
|
||||||
|
|
||||||
local todo = game.tick % UPATE_RATE
|
local todo = game.tick % UPATE_RATE
|
||||||
|
|
||||||
@@ -114,6 +125,14 @@ script.on_event(defines.events.on_tick, function(event)
|
|||||||
ExportInputList()
|
ExportInputList()
|
||||||
elseif todo == 5 then
|
elseif todo == 5 then
|
||||||
ExportOutputList()
|
ExportOutputList()
|
||||||
|
end
|
||||||
|
|
||||||
|
local rxstate = game.tick % CIRCUIT_UPATE_RATE
|
||||||
|
-- RX Combinators are set and then cleared on sequential ticks to create pulses
|
||||||
|
if rxstate == 0 then
|
||||||
|
SetRXCombinators()
|
||||||
|
elseif rxstate == 1 then
|
||||||
|
ClearRXCombinators()
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
@@ -214,7 +233,6 @@ function HandleOutputTanks()
|
|||||||
local MAX_FLUID_AMOUNT = 1000
|
local MAX_FLUID_AMOUNT = 1000
|
||||||
for k,v in pairs(global.outputTanks) do
|
for k,v in pairs(global.outputTanks) do
|
||||||
--.recipe.products[1].name
|
--.recipe.products[1].name
|
||||||
|
|
||||||
if v.recipe ~= nil then
|
if v.recipe ~= nil then
|
||||||
local fluidName = v.recipe.products[1].name
|
local fluidName = v.recipe.products[1].name
|
||||||
|
|
||||||
@@ -238,10 +256,10 @@ function HandleOutputTanks()
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
v.fluidbox[1] = fluid
|
v.fluidbox[1] = fluid
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
function AddItemToInputList(itemName, itemCount)
|
function AddItemToInputList(itemName, itemCount)
|
||||||
@@ -311,10 +329,110 @@ end
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
function AddFrameToRXBuffer(frame)
|
||||||
|
-- Add a frame to the buffer. return remaining space in buffer
|
||||||
|
local validsignals = {
|
||||||
|
["virtual"] = game.virtual_signal_prototypes,
|
||||||
|
["fluid"] = game.fluid_prototypes,
|
||||||
|
["item"] = game.item_prototypes
|
||||||
|
}
|
||||||
|
|
||||||
|
global.rxBuffer = global.rxBuffer or {}
|
||||||
|
|
||||||
|
-- if buffer is full, drop frame
|
||||||
|
if #global.rxBuffer >= MAX_RX_BUFFER_SIZE then return 0 end
|
||||||
|
|
||||||
|
-- frame = {{count=42,name="signal-grey",type="virtual"},{...},...}
|
||||||
|
local signals = {}
|
||||||
|
local index = 1
|
||||||
|
|
||||||
|
for _,signal in pairs(frame) do
|
||||||
|
if validsignals[signal.type] and validsignals[signal.type][signal.name] then
|
||||||
|
signals[index] =
|
||||||
|
{
|
||||||
|
index=index,
|
||||||
|
count=signal.count,
|
||||||
|
signal={ name=signal.name, type=signal.type }
|
||||||
|
}
|
||||||
|
index = index + 1
|
||||||
|
--TODO: break if too many?
|
||||||
|
--TODO: error token on mismatched signals? maybe mismatch1-n signals?
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if index > 1 then table.insert(global.rxBuffer,signals) end
|
||||||
|
|
||||||
|
return MAX_RX_BUFFER_SIZE - #global.rxBuffer
|
||||||
|
end
|
||||||
|
|
||||||
|
function HandleTXCombinators()
|
||||||
|
-- Check all TX Combinators, and if condition satisfied, add frame to transmit buffer
|
||||||
|
|
||||||
|
-- frame = {{count=42,name="signal-grey",type="virtual"},{...},...}
|
||||||
|
local signals = {["item"]={},["virtual"]={},["fluid"]={}}
|
||||||
|
for i,txControl in pairs(global.txControls) do
|
||||||
|
if txControl.valid then
|
||||||
|
local frame = txControl.signals_last_tick
|
||||||
|
if frame then
|
||||||
|
for _,signal in pairs(frame) do
|
||||||
|
signals[signal.signal.type][signal.signal.name]=
|
||||||
|
(signals[signal.signal.type][signal.signal.name] or 0) + signal.count
|
||||||
|
end
|
||||||
|
end
|
||||||
|
else
|
||||||
|
table.remove(global.txControls,i)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local frame = {}
|
||||||
|
for type,arr in pairs(signals) do
|
||||||
|
for name,count in pairs(arr) do
|
||||||
|
table.insert(frame,{count=count,name=name,type=type})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if #frame > 0 then
|
||||||
|
table.insert(frame,{count=game.tick,name="signal-srctick",type="virtual"})
|
||||||
|
game.write_file(TX_BUFFER_FILE, json:encode(frame).."\n", true)
|
||||||
|
|
||||||
|
-- Loopback for testing
|
||||||
|
--AddFrameToRXBuffer(frame)
|
||||||
|
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
function SetRXCombinators()
|
||||||
|
-- if the RX buffer is not empty, get a frame from it and output on all RX Combinators
|
||||||
|
if global.rxBuffer and #global.rxBuffer > 0 then
|
||||||
|
local frame = table.remove(global.rxBuffer)
|
||||||
|
for i,rxControl in pairs(global.rxControls) do
|
||||||
|
if rxControl.valid then
|
||||||
|
rxControl.parameters={parameters=frame}
|
||||||
|
rxControl.enabled=true
|
||||||
|
else
|
||||||
|
table.remove(global.rxControls,i)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
function ClearRXCombinators()
|
||||||
|
-- Clear all RX Combinators.
|
||||||
|
-- This makes them emit pulses, which are easier to
|
||||||
|
-- detect than slowly changing continusous signals.
|
||||||
|
for i,rxControl in pairs(global.rxControls) do
|
||||||
|
if rxControl.valid then
|
||||||
|
rxControl.enabled=false
|
||||||
|
else
|
||||||
|
table.remove(global.rxControls,i)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
--[[ Remote Thing ]]--
|
--[[ Remote Thing ]]--
|
||||||
remote.add_interface("clusterio",
|
remote.add_interface("clusterio",
|
||||||
{
|
{
|
||||||
import = function(itemName, itemCount)
|
import = function(itemName, itemCount)
|
||||||
GiveItemsToStorage(itemName, itemCount)
|
GiveItemsToStorage(itemName, itemCount)
|
||||||
end,
|
end,
|
||||||
importMany = function(jsonString)
|
importMany = function(jsonString)
|
||||||
@@ -332,23 +450,19 @@ remote.add_interface("clusterio",
|
|||||||
end
|
end
|
||||||
game.print(items)
|
game.print(items)
|
||||||
end,
|
end,
|
||||||
reset = Reset
|
reset = Reset,
|
||||||
|
receiveFrame = function(jsonframe)
|
||||||
|
local frame = json:decode(jsonframe)
|
||||||
|
-- frame = {tick=123456,frame={{count=42,name="signal-grey",type="virtual"},{...},...}}
|
||||||
|
return AddFrameToRXBuffer(frame)
|
||||||
|
end,
|
||||||
|
receiveMany = function(jsonframes)
|
||||||
|
local frames = json:decode(jsonframes)
|
||||||
|
local buffer
|
||||||
|
for _,frame in pairs(frames) do
|
||||||
|
buffer = AddFrameToRXBuffer(frame)
|
||||||
|
if buffer==0 then return 0 end
|
||||||
|
end
|
||||||
|
return buffer
|
||||||
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
+91
-19
@@ -86,22 +86,10 @@ MakeLogisticEntity(table.deepcopy(data.raw["container"]["iron-chest"]),
|
|||||||
--make tanks
|
--make tanks
|
||||||
MakeLogisticEntity(table.deepcopy(data.raw["storage-tank"]["storage-tank"]), INPUT_TANK_NAME, INPUT_TANK_PICTURE_PATH, { "pictures", "picture", "sheet" }, INPUT_TANK_ICON_PATH)
|
MakeLogisticEntity(table.deepcopy(data.raw["storage-tank"]["storage-tank"]), INPUT_TANK_NAME, INPUT_TANK_PICTURE_PATH, { "pictures", "picture", "sheet" }, INPUT_TANK_ICON_PATH)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
--------------------------------------------------------
|
--------------------------------------------------------
|
||||||
--[[This section is purely to create the output tank]]--
|
--[[This section is purely to create the output tank]]--
|
||||||
--------------------------------------------------------
|
--------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
local CRAFING_FLUID_CATEGORY_NAME = "crafting-fluids"
|
local CRAFING_FLUID_CATEGORY_NAME = "crafting-fluids"
|
||||||
|
|
||||||
data:extend(
|
data:extend(
|
||||||
@@ -157,12 +145,96 @@ for k,v in pairs(data.raw.fluid) do
|
|||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
-- Virtual signals
|
||||||
|
data:extend{
|
||||||
|
{
|
||||||
|
type = "item-subgroup",
|
||||||
|
name = "virtual-signal-clusterio",
|
||||||
|
group = "signals",
|
||||||
|
order = "e"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type = "virtual-signal",
|
||||||
|
name = "signal-srctick",
|
||||||
|
icon = "__base__/graphics/icons/signal/signal_grey.png",
|
||||||
|
subgroup = "virtual-signal-clusterio",
|
||||||
|
order = "e[clusterio]-[1srctick]"
|
||||||
|
},
|
||||||
|
--[[{
|
||||||
|
type = "virtual-signal",
|
||||||
|
name = "signal-srcid",
|
||||||
|
icon = "__base__/graphics/icons/signal/signal_grey.png",
|
||||||
|
subgroup = "virtual-signal-clusterio",
|
||||||
|
order = "e[clusterio]-[2srcid]"
|
||||||
|
},]]
|
||||||
|
--[[{
|
||||||
|
type = "virtual-signal",
|
||||||
|
name = "signal-localid",
|
||||||
|
icon = "__base__/graphics/icons/signal/signal_grey.png",
|
||||||
|
subgroup = "virtual-signal-clusterio",
|
||||||
|
order = "e[clusterio]-[3localid]"
|
||||||
|
},]]
|
||||||
|
}
|
||||||
|
|
||||||
|
-- TX Combinator
|
||||||
|
local tx = table.deepcopy(data.raw["decider-combinator"]["decider-combinator"])
|
||||||
|
tx.name = TX_COMBINATOR_NAME
|
||||||
|
tx.minable.result = TX_COMBINATOR_NAME
|
||||||
|
data:extend{
|
||||||
|
tx,
|
||||||
|
{
|
||||||
|
type = "item",
|
||||||
|
name = TX_COMBINATOR_NAME,
|
||||||
|
icon = tx.icon,
|
||||||
|
flags = {"goes-to-quickbar"},
|
||||||
|
subgroup = "storage",
|
||||||
|
place_result=TX_COMBINATOR_NAME,
|
||||||
|
order = "a[items]-b["..TX_COMBINATOR_NAME.."]",
|
||||||
|
stack_size = 50,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type = "recipe",
|
||||||
|
name = TX_COMBINATOR_NAME,
|
||||||
|
enabled = true, -- TODO do this on a tech somewhere
|
||||||
|
ingredients =
|
||||||
|
{
|
||||||
|
{"decider-combinator", 1},
|
||||||
|
{"electronic-circuit", 3},
|
||||||
|
{"advanced-circuit", 1}
|
||||||
|
},
|
||||||
|
result = TX_COMBINATOR_NAME,
|
||||||
|
requester_paste_multiplier = 1
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
-- RX Combinator
|
||||||
|
local rx = table.deepcopy(data.raw["constant-combinator"]["constant-combinator"])
|
||||||
|
rx.name = RX_COMBINATOR_NAME
|
||||||
|
rx.minable.result = RX_COMBINATOR_NAME
|
||||||
|
rx.item_slot_count = 100
|
||||||
|
data:extend{
|
||||||
|
rx,
|
||||||
|
{
|
||||||
|
type = "item",
|
||||||
|
name = RX_COMBINATOR_NAME,
|
||||||
|
icon = rx.icon,
|
||||||
|
flags = {"goes-to-quickbar"},
|
||||||
|
subgroup = "storage",
|
||||||
|
place_result=RX_COMBINATOR_NAME,
|
||||||
|
order = "a[items]-b["..RX_COMBINATOR_NAME.."]",
|
||||||
|
stack_size = 50,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type = "recipe",
|
||||||
|
name = RX_COMBINATOR_NAME,
|
||||||
|
enabled = true, -- TODO do this on a tech somewhere
|
||||||
|
ingredients =
|
||||||
|
{
|
||||||
|
{"constant-combinator", 1},
|
||||||
|
{"electronic-circuit", 3},
|
||||||
|
{"advanced-circuit", 1}
|
||||||
|
},
|
||||||
|
result = RX_COMBINATOR_NAME,
|
||||||
|
requester_paste_multiplier = 1
|
||||||
|
},
|
||||||
|
}
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
"title": "Clusterio",
|
"title": "Clusterio",
|
||||||
"version": "0.0.2",
|
"version": "0.0.2",
|
||||||
"date": "19-08-2016",
|
"date": "19-08-2016",
|
||||||
"author": "Danielv123 & Keyboardhack",
|
"author": "Danielv123 & Keyboardhack & justarandomgeek",
|
||||||
"dependencies": ["base >= 0.13"],
|
"dependencies": ["base >= 0.13"],
|
||||||
"factorio_version": "0.14",
|
"factorio_version": "0.14",
|
||||||
"description": "Adds 2 chests to transfer items between saves and servers over the internet."
|
"description": "Adds 2 chests to transfer items between saves and servers over the internet."
|
||||||
|
|||||||
@@ -3,10 +3,13 @@ put-chest=Put chest
|
|||||||
get-chest=Get chest
|
get-chest=Get chest
|
||||||
put-tank=Put tank
|
put-tank=Put tank
|
||||||
get-tank=Get tank
|
get-tank=Get tank
|
||||||
|
put-combinator=Transmit combinator
|
||||||
|
get-combinator=Receive combinator
|
||||||
|
|
||||||
[item-name]
|
[item-name]
|
||||||
put-chest=Put chest
|
put-chest=Put chest
|
||||||
get-chest=Get chest
|
get-chest=Get chest
|
||||||
put-tank=Put tank
|
put-tank=Put tank
|
||||||
get-tank=Get tank
|
get-tank=Get tank
|
||||||
|
put-combinator=Transmit combinator
|
||||||
|
get-combinator=Receive combinator
|
||||||
Reference in new issue
Block a user