Skip to content

Commit

Permalink
Merge pull request #53 from mspielberg/pipe-graphics
Browse files Browse the repository at this point in the history 
restore missing fluid boxes to assemblers and furnaces
  • Loading branch information
@Repofme1
Repofme1 committed Jul 20, 2018
2 parents 4752614 + 4563c17 commit 8d73d07
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions prototypes/entity/production/furnace.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ xmutil.clone("furnace", "electric-furnace",
icon = "__xander-mod__/graphics/item/production/smelting-machine/furnace-4.png",
minable = {mining_time = 1, result = "furnace-4"},
max_health = 500,
--fluid_boxes = xmutil.assembler_fluid_boxes("assembling-machine-3"),
fluid_boxes = xmutil.assembler_fluid_boxes("assembling-machine-3"),
crafting_categories = {"refining"},
crafting_speed = 2,
energy_source = { emissions = 0.002 },
Expand All @@ -119,7 +119,7 @@ xmutil.clone("furnace", "electric-furnace",
icon = "__base__/graphics/icons/electric-furnace.png",
minable = {mining_time = 1, result = "electric-furnace"},
max_health = 500,
--fluid_boxes = xmutil.assembler_fluid_boxes("assembling-machine-3"),
fluid_boxes = xmutil.assembler_fluid_boxes("assembling-machine-3"),
crafting_categories = {"forge"},
crafting_speed = 2,
energy_source = { emissions = 0.002 },
Expand Down Expand Up @@ -149,7 +149,7 @@ xmutil.clone("furnace", "electric-furnace",
icon = "__xander-mod__/graphics/item/production/smelting-machine/furnace-6.png",
minable = {mining_time = 1, result = "furnace-6"},
max_health = 1000,
--fluid_boxes = xmutil.assembler_fluid_boxes("assembling-machine-3"),
fluid_boxes = xmutil.assembler_fluid_boxes("assembling-machine-3"),
crafting_categories = {"refining", "forge"},
crafting_speed = 4,
energy_source = { emissions = 0.0008 },
Expand Down
14 changes: 7 additions & 7 deletions prototypes/entity/production/production.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ data.raw["assembling-machine"]["assembling-machine-1"].animation = xmutil.merge{
data.raw["assembling-machine"]["assembling-machine-1"].energy_source.emissions = 0.01
data.raw["assembling-machine"]["assembling-machine-1"].energy_usage = "50kW"
data.raw["assembling-machine"]["assembling-machine-1"].ingredient_count = 4
--data.raw["assembling-machine"]["assembling-machine-1"].fluid_boxes = xmutil.assembler_fluid_boxes("assembling-machine-1")
data.raw["assembling-machine"]["assembling-machine-1"].fluid_boxes = xmutil.assembler_fluid_boxes("assembling-machine-1")

--Base "assembling-machine-2"
data.raw["assembling-machine"]["assembling-machine-2"].icon = "__xander-mod__/graphics/item/production/production-machine/assembling-machine-2.png"
data.raw["assembling-machine"]["assembling-machine-2"].max_health = 200
--data.raw["assembling-machine"]["assembling-machine-2"].fluid_boxes = xmutil.assembler_fluid_boxes("assembling-machine-2")
data.raw["assembling-machine"]["assembling-machine-2"].fluid_boxes = xmutil.assembler_fluid_boxes("assembling-machine-2")
data.raw["assembling-machine"]["assembling-machine-2"].animation = xmutil.merge{
data.raw["assembling-machine"]["assembling-machine-2"].animation,
{
Expand All @@ -72,7 +72,7 @@ data.raw["assembling-machine"]["assembling-machine-2"].ingredient_count = 6

--Base "assembling-machine-3"
data.raw["assembling-machine"]["assembling-machine-3"].icon = "__xander-mod__/graphics/item/production/production-machine/assembling-machine-3.png"
--data.raw["assembling-machine"]["assembling-machine-2"].fluid_boxes = xmutil.assembler_fluid_boxes("assembling-machine-3")
data.raw["assembling-machine"]["assembling-machine-2"].fluid_boxes = xmutil.assembler_fluid_boxes("assembling-machine-3")
data.raw["assembling-machine"]["assembling-machine-3"].animation = xmutil.merge{
data.raw["assembling-machine"]["assembling-machine-3"].animation,
{
Expand Down Expand Up @@ -162,7 +162,7 @@ xmutil.clone("assembling-machine", "assembling-machine-1",
icon = "__xander-mod__/graphics/item/production/production-machine/machine-tool-1.png",
minable = {hardness = 0.2, mining_time = 0.5, result = "machine-tool-1"},
max_health = 100,
--fluid_boxes = xmutil.assembler_fluid_boxes("machine-tool-1"),
fluid_boxes = xmutil.assembler_fluid_boxes("machine-tool-1"),
crafting_categories = {"basic-machine", "machine"},
crafting_speed = 1,
energy_source = { emissions = 0.01 },
Expand All @@ -186,7 +186,7 @@ xmutil.clone("assembling-machine", "assembling-machine-2",
icon = "__xander-mod__/graphics/item/production/production-machine/machine-tool-2.png",
minable = {hardness = 0.2, mining_time = 0.5, result = "machine-tool-2"},
max_health = 200,
--fluid_boxes = xmutil.assembler_fluid_boxes("machine-tool-2"),
fluid_boxes = xmutil.assembler_fluid_boxes("machine-tool-2"),
crafting_categories = {"machine", "advanced-machine"},
crafting_speed = 2,
energy_source = { emissions = 0.004 },
Expand All @@ -209,7 +209,7 @@ xmutil.clone("assembling-machine", "assembling-machine-3",
icon = "__xander-mod__/graphics/item/production/production-machine/machine-tool-3.png",
minable = {hardness = 0.2, mining_time = 0.5, result = "machine-tool-3"},
max_health = 500,
--fluid_boxes = xmutil.assembler_fluid_boxes("machine-tool-3"),
fluid_boxes = xmutil.assembler_fluid_boxes("machine-tool-3"),
crafting_categories = {"machine", "advanced-machine"},
crafting_speed = 4,
energy_source = { emissions = 0.002 },
Expand Down Expand Up @@ -272,7 +272,7 @@ xmutil.clone("assembling-machine", "assembling-machine-3",
icon = "__xander-mod__/graphics/item/production/production-machine/assembling-machine-4.png",
minable = {hardness = 0.2, mining_time = 0.5, result = "assembling-machine-4"},
max_health = 500,
--fluid_boxes = xmutil.assembler_fluid_boxes("assembling-machine-4"),
fluid_boxes = xmutil.assembler_fluid_boxes("assembling-machine-4"),
crafting_categories = {"crafting", "crafting-with-fluid", "advanced-crafting"},
crafting_speed = 4,
energy_source = { emissions = 0.002 },
Expand Down
16 changes: 8 additions & 8 deletions xmutil.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ function M.assembler_pipes(graphics_source)
return {
north =
{
filename = "__xander-mod__/graphics/entity/production/" .. graphics_source .. "/pipe-N.png",
filename = "__xander-mod-graphics-0__/graphics/entity/production/" .. graphics_source .. "/pipe-N.png",
priority = "extra-high",
width = 35,
height = 18,
shift = util.by_pixel(2.5, 14),
hr_version =
{
filename = "__xander-mod__/graphics/entity/production/" .. graphics_source .. "/hr-pipe-N.png",
filename = "__xander-mod-graphics-0__/graphics/entity/production/" .. graphics_source .. "/hr-pipe-N.png",
priority = "extra-high",
width = 71,
height = 38,
Expand All @@ -23,14 +23,14 @@ function M.assembler_pipes(graphics_source)
},
east =
{
filename = "__xander-mod__/graphics/entity/production/" .. graphics_source .. "/pipe-E.png",
filename = "__xander-mod-graphics-0__/graphics/entity/production/" .. graphics_source .. "/pipe-E.png",
priority = "extra-high",
width = 20,
height = 38,
shift = util.by_pixel(-25, 1),
hr_version =
{
filename = "__xander-mod__/graphics/entity/production/" .. graphics_source .. "/hr-pipe-E.png",
filename = "__xander-mod-graphics-0__/graphics/entity/production/" .. graphics_source .. "/hr-pipe-E.png",
priority = "extra-high",
width = 42,
height = 76,
Expand All @@ -40,14 +40,14 @@ function M.assembler_pipes(graphics_source)
},
south =
{
filename = "__xander-mod__/graphics/entity/production/" .. graphics_source .. "/pipe-S.png",
filename = "__xander-mod-graphics-0__/graphics/entity/production/" .. graphics_source .. "/pipe-S.png",
priority = "extra-high",
width = 44,
height = 31,
shift = util.by_pixel(0, -31.5),
hr_version =
{
filename = "__xander-mod__/graphics/entity/production/" .. graphics_source .. "/hr-pipe-S.png",
filename = "__xander-mod-graphics-0__/graphics/entity/production/" .. graphics_source .. "/hr-pipe-S.png",
priority = "extra-high",
width = 88,
height = 61,
Expand All @@ -57,14 +57,14 @@ function M.assembler_pipes(graphics_source)
},
west =
{
filename = "__xander-mod__/graphics/entity/production/" .. graphics_source .. "/pipe-W.png",
filename = "__xander-mod-graphics-0__/graphics/entity/production/" .. graphics_source .. "/pipe-W.png",
priority = "extra-high",
width = 19,
height = 37,
shift = util.by_pixel(25.5, 1.5),
hr_version =
{
filename = "__xander-mod__/graphics/entity/production/" .. graphics_source .. "/hr-pipe-W.png",
filename = "__xander-mod-graphics-0__/graphics/entity/production/" .. graphics_source .. "/hr-pipe-W.png",
priority = "extra-high",
width = 39,
height = 73,
Expand Down

0 comments on commit 8d73d07

Please sign in to comment.