Skip to content

Commit

Permalink
Update for 0.17
Browse files Browse the repository at this point in the history
  • Loading branch information
justarandomgeek committed Feb 26, 2019
1 parent e36155e commit cb72ab3
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 9 deletions.
2 changes: 1 addition & 1 deletion ConMan Test Rig.blueprint

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions control.lua
Original file line number Diff line number Diff line change
Expand Up @@ -382,10 +382,13 @@ local function DeliveryOrder(manager,signet1,signet2)
if signet2 and signet2.signals and #signet2.signals>0 then
local items = ReadItems(signet2)
if next(items,nil) then
if ent.name == "entity-ghost" then
if ent.name == "entity-ghost" or ent.name == "item-request-proxy" then
-- just set the ghost requests
-- TODO: probably ought to merge these?
ent.item_requests = items
local reqs = ent.item_requests
for name,count in pairs(items) do
reqs[name] = (reqs[name] or 0) + count
end
ent.item_requests = reqs
else
ent.surface.create_entity{
name='item-request-proxy',
Expand Down
6 changes: 3 additions & 3 deletions info.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "conman",
"version": "0.16.1",
"factorio_version": "0.16",
"version": "0.17.0",
"factorio_version": "0.17",
"title": "ConMan Construction Manager",
"author": "justarandomgeek",
"homepage": "",
"contact": "justarandomgeek@gmail.com",
"description": "ConMan allows ordering construction and deconstruction via circuit networks. Supports ordering individual constructions, or whole blueprints.",
"dependencies": ["base >= 0.16.0", "?recipeid >= 0.14.0", "?signalstrings >= 0.14.0"]
"dependencies": ["base >= 0.17.0", "?recipeid >= 0.17.0", "?signalstrings >= 0.17.0"]
}
9 changes: 9 additions & 0 deletions locale/en/en.cfg
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
[entity-name]
conman=ConMan
conman-control=ConMan Control Node

[item-name]
conman=ConMan
conman-control=ConMan Control Node

[recipe-name]
conman=ConMan
1 change: 1 addition & 0 deletions prototypes/entities.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local conmanent = table.deepcopy(data.raw["assembling-machine"]["assembling-mach
conmanent.name="conman"
conmanent.minable.result = "conman"
conmanent.fast_replaceable_group = nil
conmanent.next_upgrade = nil
conmanent.crafting_categories = {"conman"}
conmanent.crafting_speed = 1
conmanent.ingredient_count = 4
Expand Down
3 changes: 1 addition & 2 deletions prototypes/items.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ data:extend{
name = "conman",
icon = "__base__/graphics/icons/roboport.png",
icon_size = 32,
flags = {"goes-to-quickbar"},
subgroup = "logistic-network",
order = "c[signal]-b[conman]",
place_result="conman",
Expand All @@ -15,7 +14,7 @@ data:extend{
name = "conman-control",
icon = "__base__/graphics/icons/roboport.png",
icon_size = 32,
flags = {"goes-to-quickbar", "hidden"},
flags = {"hidden"},
subgroup = "logistic-network",
order = "c[signal]-b[conman-control]",
place_result="conman-control",
Expand Down

0 comments on commit cb72ab3

Please sign in to comment.