diff --git a/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-E.png b/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-E.png new file mode 100644 index 0000000..2eb399e Binary files /dev/null and b/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-E.png differ diff --git a/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-N.png b/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-N.png new file mode 100644 index 0000000..1e4bbe4 Binary files /dev/null and b/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-N.png differ diff --git a/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-S.png b/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-S.png new file mode 100644 index 0000000..a98d70b Binary files /dev/null and b/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-S.png differ diff --git a/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-W.png b/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-W.png new file mode 100644 index 0000000..f2a421f Binary files /dev/null and b/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-W.png differ diff --git a/lignumis/prototypes/content/desiccation-furnace.lua b/lignumis/prototypes/content/desiccation-furnace.lua index b64bb17..c86d457 100644 --- a/lignumis/prototypes/content/desiccation-furnace.lua +++ b/lignumis/prototypes/content/desiccation-furnace.lua @@ -1,4 +1,5 @@ local item_sounds = require("__base__.prototypes.item_sounds") +local pipecovers = require("prototypes/content/gold/pipecovers") local furnace = table.deepcopy(data.raw.furnace["stone-furnace"]) furnace.name = "desiccation-furnace" @@ -6,7 +7,7 @@ furnace.fluid_boxes = { { volume = 50, pipe_picture = assembler2pipepictures(), - pipe_covers = pipecoverspictures(), + pipe_covers = pipecovers(), pipe_connections = { { flow_direction = "output", direction = defines.direction.east, position = { 0.5, 0.5 } } }, diff --git a/lignumis/prototypes/content/gold/machinepipes.lua b/lignumis/prototypes/content/gold/machinepipes.lua new file mode 100644 index 0000000..e5f44e4 --- /dev/null +++ b/lignumis/prototypes/content/gold/machinepipes.lua @@ -0,0 +1,41 @@ +return function() + return + { + north = + { + filename = "__lignumis__/graphics/entity/gold-pipe/machine-gold-pipe-N.png", + priority = "extra-high", + width = 71, + height = 38, + shift = util.by_pixel(2.25, 13.5), + scale = 0.5 + }, + east = + { + filename = "__lignumis__/graphics/entity/gold-pipe/machine-gold-pipe-E.png", + priority = "extra-high", + width = 42, + height = 76, + shift = util.by_pixel(-24.5, 1), + scale = 0.5 + }, + south = + { + filename = "__lignumis__/graphics/entity/gold-pipe/machine-gold-pipe-S.png", + priority = "extra-high", + width = 88, + height = 61, + shift = util.by_pixel(0, -31.25), + scale = 0.5 + }, + west = + { + filename = "__lignumis__/graphics/entity/gold-pipe/machine-gold-pipe-W.png", + priority = "extra-high", + width = 39, + height = 73, + shift = util.by_pixel(25.75, 1.25), + scale = 0.5 + } + } +end \ No newline at end of file diff --git a/lignumis/prototypes/content/gold/pipecovers.lua b/lignumis/prototypes/content/gold/pipecovers.lua new file mode 100644 index 0000000..c22936e --- /dev/null +++ b/lignumis/prototypes/content/gold/pipecovers.lua @@ -0,0 +1,81 @@ +return function() + return + { + north = { + layers = { + { + filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-north.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5 + }, + { + filename = "__base__/graphics/entity/pipe-covers/pipe-cover-north-shadow.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5, + draw_as_shadow = true + } + } + }, + east = { + layers = { + { + filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-east.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5 + }, + { + filename = "__base__/graphics/entity/pipe-covers/pipe-cover-east-shadow.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5, + draw_as_shadow = true + } + } + }, + south = { + layers = { + { + filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-south.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5 + }, + { + filename = "__base__/graphics/entity/pipe-covers/pipe-cover-south-shadow.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5, + draw_as_shadow = true + } + } + }, + west = { + layers = { + { + filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-west.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5 + }, + { + filename = "__base__/graphics/entity/pipe-covers/pipe-cover-west-shadow.png", + priority = "extra-high", + width = 128, + height = 128, + scale = 0.5, + draw_as_shadow = true + } + } + } + } +end diff --git a/lignumis/prototypes/content/gold/pipes.lua b/lignumis/prototypes/content/gold/pipes.lua index 05521b0..b0b69b3 100644 --- a/lignumis/prototypes/content/gold/pipes.lua +++ b/lignumis/prototypes/content/gold/pipes.lua @@ -2,6 +2,7 @@ local item_sounds = require("__base__.prototypes.item_sounds") local item_tints = require("__base__.prototypes.item-tints") local hit_effects = require("__base__.prototypes.entity.hit-effects") local sounds = require("__base__.prototypes.entity.sounds") +local pipecovers = require("prototypes/content/gold/pipecovers") function make_rotated_animation_variations_from_sheet(variation_count, sheet) --makes remnants work with more than 1 variation local result = {} @@ -212,7 +213,7 @@ local tank = { damaged_trigger_effect = hit_effects.entity(), fluid_box = { volume = 10000, - pipe_covers = pipecoverspictures(), + pipe_covers = pipecovers(), pipe_connections = { { direction = defines.direction.north, position = { 0.5, -0.5 } }, { direction = defines.direction.east, position = { 0.5, -0.5 } }, diff --git a/lignumis/prototypes/content/steam-assembling-machine.lua b/lignumis/prototypes/content/steam-assembling-machine.lua index 1e8409d..c66ab03 100644 --- a/lignumis/prototypes/content/steam-assembling-machine.lua +++ b/lignumis/prototypes/content/steam-assembling-machine.lua @@ -1,4 +1,5 @@ local item_sounds = require("__base__.prototypes.item_sounds") +local pipecovers = require("prototypes/content/gold/pipecovers") local assembling_machine = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-2"]) assembling_machine.name = "steam-assembling-machine" @@ -29,7 +30,7 @@ assembling_machine.energy_source = { fluid_box = { production_type = "input", pipe_picture = assembler2pipepictures(), - pipe_covers = pipecoverspictures(), + pipe_covers = pipecovers(), volume = 50, pipe_connections = { { flow_direction = "input-output", direction = defines.direction.west, position = { -1, 0 } }, diff --git a/lignumis/prototypes/content/wooden-rocket-silo.lua b/lignumis/prototypes/content/wooden-rocket-silo.lua index d79f84b..005491b 100644 --- a/lignumis/prototypes/content/wooden-rocket-silo.lua +++ b/lignumis/prototypes/content/wooden-rocket-silo.lua @@ -1,7 +1,10 @@ local item_sounds = require("__base__.prototypes.item_sounds") +local pipecovers = require("prototypes/content/gold/pipecovers") +local machinepipes = require("prototypes/content/gold/machinepipes") local silo = table.deepcopy(data.raw["rocket-silo"]["rocket-silo"]) silo.name = "provisional-rocket-silo" +silo.icon = "__lignumis__/graphics/icons/provisional-rocket-silo.png" silo.module_slots = 0 silo.allowed_effects = { "consumption", "pollution" } silo.minable = { mining_time = 1, result = "provisional-rocket-silo" } @@ -32,19 +35,18 @@ silo.base_day_sprite.filename = "__lignumis__/graphics/entity/wooden-rocket-silo silo.base_front_sprite.filename = "__lignumis__/graphics/entity/wooden-rocket-silo/14-rocket-silo-front.png" silo.fluid_boxes = { { - volume = 50, - pipe_picture = assembler2pipepictures(), - pipe_covers = pipecoverspictures(), - pipe_connections = { - { flow_direction = "input", direction = defines.direction.south, position = { -3.0, 4.0 } } - }, production_type = "input", - secondary_draw_orders = { south = 110 } + pipe_picture = machinepipes(), + pipe_covers = pipecovers(), + volume = 50, + pipe_connections = { { flow_direction = "input", direction = defines.direction.south, position = { -2, 4 } } }, + secondary_draw_orders = { north = -1 } } } +silo.fluid_boxes_off_when_no_fluid_recipe = true silo.launch_to_space_platforms = false silo.rocket_parts_storage_cap = 50 -silo.to_be_inserted_to_rocket_inventory_size = 1 +silo.to_be_inserted_to_rocket_inventory_size = 20 local silo_item = table.deepcopy(data.raw["item"]["rocket-silo"]) silo_item.name = "provisional-rocket-silo" diff --git a/sources/entity/gold-pipe/machine-gold-pipe-E.afphoto b/sources/entity/gold-pipe/machine-gold-pipe-E.afphoto new file mode 100644 index 0000000..38fff25 Binary files /dev/null and b/sources/entity/gold-pipe/machine-gold-pipe-E.afphoto differ diff --git a/sources/entity/gold-pipe/machine-gold-pipe-N.afphoto b/sources/entity/gold-pipe/machine-gold-pipe-N.afphoto new file mode 100644 index 0000000..a5a8019 Binary files /dev/null and b/sources/entity/gold-pipe/machine-gold-pipe-N.afphoto differ diff --git a/sources/entity/gold-pipe/machine-gold-pipe-S.afphoto b/sources/entity/gold-pipe/machine-gold-pipe-S.afphoto new file mode 100644 index 0000000..bf4345f Binary files /dev/null and b/sources/entity/gold-pipe/machine-gold-pipe-S.afphoto differ diff --git a/sources/entity/gold-pipe/machine-gold-pipe-W.afphoto b/sources/entity/gold-pipe/machine-gold-pipe-W.afphoto new file mode 100644 index 0000000..1f2d092 Binary files /dev/null and b/sources/entity/gold-pipe/machine-gold-pipe-W.afphoto differ