From c03dbf50a7d12e558533b23c47810a4c5862cf87 Mon Sep 17 00:00:00 2001 From: Krychle Date: Tue, 23 Dec 2025 09:51:15 -0500 Subject: [PATCH 1/4] Fixed Filtration building's pipe connecions. Renamed Hydro Plant pipe graphics to match their actual direction. (east -> west) Code formatting adjustment. --- .../prototypes/buildings/filtration-unit.lua | 49 +++++++++++------- .../prototypes/buildings/hydro-plant.lua | 4 +- .../prototypes/buildings/pipes-overlay.lua | 41 +++++++++++++-- .../filtration-unit/pipe-ending-up-slice.xcf | Bin 0 -> 39407 bytes .../entity/filtration-unit/pipe-north.png | Bin 1203 -> 0 bytes .../entity/filtration-unit/pipe-north1.png | Bin 0 -> 2340 bytes .../entity/filtration-unit/pipe-north2.png | Bin 0 -> 2530 bytes .../{pipe-east1.png => pipe-west1.png} | Bin .../{pipe-east2.png => pipe-west2.png} | Bin 9 files changed, 71 insertions(+), 23 deletions(-) create mode 100644 angelsrefininggraphics/graphics/entity/filtration-unit/pipe-ending-up-slice.xcf delete mode 100644 angelsrefininggraphics/graphics/entity/filtration-unit/pipe-north.png create mode 100644 angelsrefininggraphics/graphics/entity/filtration-unit/pipe-north1.png create mode 100644 angelsrefininggraphics/graphics/entity/filtration-unit/pipe-north2.png rename angelsrefininggraphics/graphics/entity/hydro-plant/{pipe-east1.png => pipe-west1.png} (100%) rename angelsrefininggraphics/graphics/entity/hydro-plant/{pipe-east2.png => pipe-west2.png} (100%) diff --git a/angelsrefining/prototypes/buildings/filtration-unit.lua b/angelsrefining/prototypes/buildings/filtration-unit.lua index 67729e691..8f3f62bde 100644 --- a/angelsrefining/prototypes/buildings/filtration-unit.lua +++ b/angelsrefining/prototypes/buildings/filtration-unit.lua @@ -68,25 +68,30 @@ data:extend({ sound = { filename = "__base__/sound/oil-refinery.ogg" }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, + forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", pipe_covers = pipecoverspictures(), - pipe_picture = angelsmods.refining.filtrationpipepictures(), + pipe_picture = angelsmods.refining.filtrationpipepictures1(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } + }, }, { production_type = "input", pipe_covers = pipecoverspictures(), - pipe_picture = angelsmods.refining.filtrationpipepictures(), + pipe_picture = angelsmods.refining.filtrationpipepictures2(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } + }, }, { production_type = "output", pipe_covers = pipecoverspictures(), - pipe_picture = angelsmods.refining.filtrationpipepictures(), + pipe_picture = angelsmods.refining.filtrationpipepictures2(), volume = 100, pipe_connections = { { flow_direction = "output", position = { 1, -2 }, direction = defines.direction.north }, @@ -95,7 +100,7 @@ data:extend({ { production_type = "output", pipe_covers = pipecoverspictures(), - pipe_picture = angelsmods.refining.filtrationpipepictures(), + pipe_picture = angelsmods.refining.filtrationpipepictures1(), volume = 100, pipe_connections = { { flow_direction = "output", position = { -1, -2 }, direction = defines.direction.north }, @@ -169,21 +174,25 @@ data:extend({ { production_type = "input", pipe_covers = pipecoverspictures(), - pipe_picture = angelsmods.refining.filtrationpipepictures(), + pipe_picture = angelsmods.refining.filtrationpipepictures1(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } + }, }, { production_type = "input", pipe_covers = pipecoverspictures(), - pipe_picture = angelsmods.refining.filtrationpipepictures(), + pipe_picture = angelsmods.refining.filtrationpipepictures2(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } + }, }, { production_type = "output", pipe_covers = pipecoverspictures(), - pipe_picture = angelsmods.refining.filtrationpipepictures(), + pipe_picture = angelsmods.refining.filtrationpipepictures2(), volume = 100, pipe_connections = { { flow_direction = "output", position = { 1, -2 }, direction = defines.direction.north }, @@ -192,7 +201,7 @@ data:extend({ { production_type = "output", pipe_covers = pipecoverspictures(), - pipe_picture = angelsmods.refining.filtrationpipepictures(), + pipe_picture = angelsmods.refining.filtrationpipepictures1(), volume = 100, pipe_connections = { { flow_direction = "output", position = { -1, -2 }, direction = defines.direction.north }, @@ -265,21 +274,25 @@ data:extend({ { production_type = "input", pipe_covers = pipecoverspictures(), - pipe_picture = angelsmods.refining.filtrationpipepictures(), + pipe_picture = angelsmods.refining.filtrationpipepictures1(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } + }, }, { production_type = "input", pipe_covers = pipecoverspictures(), - pipe_picture = angelsmods.refining.filtrationpipepictures(), + pipe_picture = angelsmods.refining.filtrationpipepictures2(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } + }, }, { production_type = "output", pipe_covers = pipecoverspictures(), - pipe_picture = angelsmods.refining.filtrationpipepictures(), + pipe_picture = angelsmods.refining.filtrationpipepictures2(), volume = 100, pipe_connections = { { flow_direction = "output", position = { 1, -2 }, direction = defines.direction.north }, @@ -288,7 +301,7 @@ data:extend({ { production_type = "output", pipe_covers = pipecoverspictures(), - pipe_picture = angelsmods.refining.filtrationpipepictures(), + pipe_picture = angelsmods.refining.filtrationpipepictures1(), volume = 100, pipe_connections = { { flow_direction = "output", position = { -1, -2 }, direction = defines.direction.north }, diff --git a/angelsrefining/prototypes/buildings/hydro-plant.lua b/angelsrefining/prototypes/buildings/hydro-plant.lua index 0253a30ee..ff5bfd318 100644 --- a/angelsrefining/prototypes/buildings/hydro-plant.lua +++ b/angelsrefining/prototypes/buildings/hydro-plant.lua @@ -22,7 +22,7 @@ local function hydropipepictures() shift = { 0.06, -0.6 }, }, west = { - filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/pipe-east1.png", + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/pipe-west1.png", priority = "extra-high", width = 48, height = 48, @@ -55,7 +55,7 @@ local function hydropipepictures2() shift = { 0.06, -0.6 }, }, west = { - filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/pipe-east2.png", + filename = "__angelsrefininggraphics__/graphics/entity/hydro-plant/pipe-west2.png", priority = "extra-high", width = 48, height = 48, diff --git a/angelsrefining/prototypes/buildings/pipes-overlay.lua b/angelsrefining/prototypes/buildings/pipes-overlay.lua index 63e753e82..8d6fdf1ef 100644 --- a/angelsrefining/prototypes/buildings/pipes-overlay.lua +++ b/angelsrefining/prototypes/buildings/pipes-overlay.lua @@ -65,13 +65,48 @@ function angelsmods.refining.leachingpipepictures() } end -function angelsmods.refining.filtrationpipepictures() +function angelsmods.refining.filtrationpipepictures1() return { north = { - filename = "__angelsrefininggraphics__/graphics/entity/filtration-unit/pipe-north.png", + filename = "__angelsrefininggraphics__/graphics/entity/filtration-unit/pipe-north1.png", + priority = "extra-high", + width = 68, + height = 74, + scale = 0.5, + shift = { 0, 1 }, + }, + east = { + filename = "__angelsrefininggraphics__/graphics/entity/filtration-unit/pipe-east.png", + priority = "extra-high", + width = 34, + height = 47, + shift = { -0.7, -0.1 }, + }, + south = { + filename = "__angelsrefininggraphics__/graphics/entity/filtration-unit/pipe-south.png", + priority = "extra-high", + width = 34, + height = 39, + shift = { 0, -0.75 }, + }, + west = { + filename = "__angelsrefininggraphics__/graphics/entity/filtration-unit/pipe-west.png", priority = "extra-high", width = 34, - height = 37, + height = 47, + shift = { 0.7, -0.1 }, + }, + } +end + +function angelsmods.refining.filtrationpipepictures2() + return { + north = { + filename = "__angelsrefininggraphics__/graphics/entity/filtration-unit/pipe-north2.png", + priority = "extra-high", + width = 68, + height = 74, + scale = 0.5, shift = { 0, 1 }, }, east = { diff --git a/angelsrefininggraphics/graphics/entity/filtration-unit/pipe-ending-up-slice.xcf b/angelsrefininggraphics/graphics/entity/filtration-unit/pipe-ending-up-slice.xcf new file mode 100644 index 0000000000000000000000000000000000000000..e277f9ead37cf111aa8ce615968fb229d44f263f GIT binary patch literal 39407 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 literal 0 HcmV?d00001 diff --git a/angelsrefininggraphics/graphics/entity/hydro-plant/pipe-east1.png b/angelsrefininggraphics/graphics/entity/hydro-plant/pipe-west1.png similarity index 100% rename from angelsrefininggraphics/graphics/entity/hydro-plant/pipe-east1.png rename to angelsrefininggraphics/graphics/entity/hydro-plant/pipe-west1.png diff --git a/angelsrefininggraphics/graphics/entity/hydro-plant/pipe-east2.png b/angelsrefininggraphics/graphics/entity/hydro-plant/pipe-west2.png similarity index 100% rename from angelsrefininggraphics/graphics/entity/hydro-plant/pipe-east2.png rename to angelsrefininggraphics/graphics/entity/hydro-plant/pipe-west2.png From 88439927286c7721744dcf24aab1d71f647d550e Mon Sep 17 00:00:00 2001 From: Krychle Date: Tue, 23 Dec 2025 19:49:08 -0500 Subject: [PATCH 2/4] Add new pipe graphics and update connections for separators and steam crackers --- .../prototypes/buildings/pipes-overlay.lua | 163 ++++++++++++++++++ .../prototypes/buildings/separator.lua | 56 +++--- .../prototypes/buildings/steam-cracker.lua | 68 ++++++-- .../graphics/entity/separator/blank.png | Bin 0 -> 178 bytes .../graphics/entity/separator/pipe-north1.png | Bin 0 -> 1574 bytes .../graphics/entity/separator/pipe-north2.png | Bin 0 -> 2906 bytes .../graphics/entity/steam-cracker/blank.png | Bin 0 -> 178 bytes .../entity/steam-cracker/pipe-north1.png | Bin 0 -> 2318 bytes .../prototypes/buildings/filtration-unit.lua | 4 + .../prototypes/buildings/pipes-overlay.lua | 6 +- .../entity/filtration-unit/pipe-north2.png | Bin 2530 -> 3273 bytes .../entity/filtration-unit/target.png | Bin 0 -> 518 bytes 12 files changed, 258 insertions(+), 39 deletions(-) create mode 100644 angelspetrochemgraphics/graphics/entity/separator/blank.png create mode 100644 angelspetrochemgraphics/graphics/entity/separator/pipe-north1.png create mode 100644 angelspetrochemgraphics/graphics/entity/separator/pipe-north2.png create mode 100644 angelspetrochemgraphics/graphics/entity/steam-cracker/blank.png create mode 100644 angelspetrochemgraphics/graphics/entity/steam-cracker/pipe-north1.png create mode 100644 angelsrefininggraphics/graphics/entity/filtration-unit/target.png diff --git a/angelspetrochem/prototypes/buildings/pipes-overlay.lua b/angelspetrochem/prototypes/buildings/pipes-overlay.lua index cca7eb6b3..15a7e792c 100644 --- a/angelspetrochem/prototypes/buildings/pipes-overlay.lua +++ b/angelspetrochem/prototypes/buildings/pipes-overlay.lua @@ -175,3 +175,166 @@ local function polypictures3() }, } end +function angelsmods.petrochem.separatorpipepictures1() + return { + north = { + filename = "__angelspetrochemgraphics__/graphics/entity/separator/pipe-north2.png", + priority = "extra-high", + width = 96, + height = 96, + scale = 0.5, + shift = util.by_pixel(4, 36), + }, + east = { + filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + south = { + filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + west = { + filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + } +end +function angelsmods.petrochem.separatorpipepictures2() + return { + north = { + filename = "__angelspetrochemgraphics__/graphics/entity/separator/pipe-north1.png", + priority = "extra-high", + width = 96, + height = 96, + scale = 0.5, + shift = util.by_pixel(3, 36), + }, + east = { + filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + south = { + filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + west = { + filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + } +end +function angelsmods.petrochem.separatorpipepictures2mirror() + return { + north = { + filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + east = { + filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + south = { + filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + west = { + filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + } +end +function angelsmods.petrochem.steamcrackerpipepictures1() + return { + north = { + filename = "__angelspetrochemgraphics__/graphics/entity/steam-cracker/pipe-north1.png", + priority = "extra-high", + width = 64, + height = 64, + scale = 0.5, + shift = {0, 1}, + }, + east = { + filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + south = { + filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + west = { + filename = "__angelspetrochemgraphics__/graphics/entity/separator/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + } +end +function angelsmods.petrochem.steamcrackerpipepictures1mirror() + return { + north = { + filename = "__angelspetrochemgraphics__/graphics/entity/steam-cracker/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + east = { + filename = "__angelspetrochemgraphics__/graphics/entity/steam-cracker/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + south = { + filename = "__angelspetrochemgraphics__/graphics/entity/steam-cracker/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + west = { + filename = "__angelspetrochemgraphics__/graphics/entity/steam-cracker/blank.png", + priority = "extra-high", + width = 1, + height = 1, + shift = { 0, 0 }, + }, + } +end \ No newline at end of file diff --git a/angelspetrochem/prototypes/buildings/separator.lua b/angelspetrochem/prototypes/buildings/separator.lua index 1cb213c80..1f869ee64 100644 --- a/angelspetrochem/prototypes/buildings/separator.lua +++ b/angelspetrochem/prototypes/buildings/separator.lua @@ -80,17 +80,20 @@ data:extend({ sound = { filename = "__angelspetrochemgraphics__/sound/separator.ogg", volume = 0.65 }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, + forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", - --pipe_picture = floatationpipepictures(), + pipe_picture = angelsmods.petrochem.separatorpipepictures1(), pipe_covers = pipecoverspictures(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { 0, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { 0, 2 }, direction = defines.direction.south } + }, }, { production_type = "output", - --pipe_picture = floatationpipepictures(), + pipe_picture = angelsmods.petrochem.separatorpipepictures1(), pipe_covers = pipecoverspictures(), volume = 100, pipe_connections = { @@ -99,7 +102,8 @@ data:extend({ }, { production_type = "output", - --pipe_picture = floatationpipepictures(), + mirrored_pipe_picture = angelsmods.petrochem.separatorpipepictures2mirror(), + pipe_picture = angelsmods.petrochem.separatorpipepictures2(), pipe_covers = pipecoverspictures(), volume = 100, pipe_connections = { @@ -108,7 +112,7 @@ data:extend({ }, { production_type = "output", - --pipe_picture = floatationpipepictures(), + mirrored_pipe_picture = angelsmods.petrochem.separatorpipepictures2(), pipe_covers = pipecoverspictures(), volume = 100, pipe_connections = { @@ -192,17 +196,20 @@ data:extend({ sound = { filename = "__angelspetrochemgraphics__/sound/separator.ogg", volume = 0.65 }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, + forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", - --pipe_picture = floatationpipepictures(), + pipe_picture = angelsmods.petrochem.separatorpipepictures1(), pipe_covers = pipecoverspictures(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { 0, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { 0, 2 }, direction = defines.direction.south } + }, }, { production_type = "output", - --pipe_picture = floatationpipepictures(), + pipe_picture = angelsmods.petrochem.separatorpipepictures1(), pipe_covers = pipecoverspictures(), volume = 100, pipe_connections = { @@ -211,7 +218,8 @@ data:extend({ }, { production_type = "output", - --pipe_picture = floatationpipepictures(), + mirrored_pipe_picture = angelsmods.petrochem.separatorpipepictures2mirror(), + pipe_picture = angelsmods.petrochem.separatorpipepictures2(), pipe_covers = pipecoverspictures(), volume = 100, pipe_connections = { @@ -220,7 +228,7 @@ data:extend({ }, { production_type = "output", - --pipe_picture = floatationpipepictures(), + mirrored_pipe_picture = angelsmods.petrochem.separatorpipepictures2(), pipe_covers = pipecoverspictures(), volume = 100, pipe_connections = { @@ -303,17 +311,20 @@ data:extend({ sound = { filename = "__angelspetrochemgraphics__/sound/separator.ogg", volume = 0.65 }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, + forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", - --pipe_picture = floatationpipepictures(), + pipe_picture = angelsmods.petrochem.separatorpipepictures1(), pipe_covers = pipecoverspictures(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { 0, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { 0, 2 }, direction = defines.direction.south } + }, }, { production_type = "output", - --pipe_picture = floatationpipepictures(), + pipe_picture = angelsmods.petrochem.separatorpipepictures1(), pipe_covers = pipecoverspictures(), volume = 100, pipe_connections = { @@ -322,7 +333,8 @@ data:extend({ }, { production_type = "output", - --pipe_picture = floatationpipepictures(), + mirrored_pipe_picture = angelsmods.petrochem.separatorpipepictures2mirror(), + pipe_picture = angelsmods.petrochem.separatorpipepictures2(), pipe_covers = pipecoverspictures(), volume = 100, pipe_connections = { @@ -331,7 +343,7 @@ data:extend({ }, { production_type = "output", - --pipe_picture = floatationpipepictures(), + mirrored_pipe_picture = angelsmods.petrochem.separatorpipepictures2(), pipe_covers = pipecoverspictures(), volume = 100, pipe_connections = { @@ -413,17 +425,20 @@ data:extend({ sound = { filename = "__angelspetrochemgraphics__/sound/separator.ogg", volume = 0.65 }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, + forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", - --pipe_picture = floatationpipepictures(), + pipe_picture = angelsmods.petrochem.separatorpipepictures1(), pipe_covers = pipecoverspictures(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { 0, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { 0, 2 }, direction = defines.direction.south } + }, }, { production_type = "output", - --pipe_picture = floatationpipepictures(), + pipe_picture = angelsmods.petrochem.separatorpipepictures1(), pipe_covers = pipecoverspictures(), volume = 100, pipe_connections = { @@ -432,7 +447,8 @@ data:extend({ }, { production_type = "output", - --pipe_picture = floatationpipepictures(), + mirrored_pipe_picture = angelsmods.petrochem.separatorpipepictures2mirror(), + pipe_picture = angelsmods.petrochem.separatorpipepictures2(), pipe_covers = pipecoverspictures(), volume = 100, pipe_connections = { @@ -441,7 +457,7 @@ data:extend({ }, { production_type = "output", - --pipe_picture = floatationpipepictures(), + mirrored_pipe_picture = angelsmods.petrochem.separatorpipepictures2(), pipe_covers = pipecoverspictures(), volume = 100, pipe_connections = { diff --git a/angelspetrochem/prototypes/buildings/steam-cracker.lua b/angelspetrochem/prototypes/buildings/steam-cracker.lua index f1067f341..6ad5d0069 100644 --- a/angelspetrochem/prototypes/buildings/steam-cracker.lua +++ b/angelspetrochem/prototypes/buildings/steam-cracker.lua @@ -113,23 +113,31 @@ data:extend({ sound = { filename = "__angelspetrochemgraphics__/sound/steam-cracker.ogg", volume = 0.65 }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, + forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", - --pipe_picture = floatationpipepictures(), + mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1mirror(), + pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(), pipe_covers = pipecoverspictures(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } + }, }, { production_type = "input", + mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(), --pipe_picture = floatationpipepictures(), pipe_covers = pipecoverspictures(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } + }, }, { production_type = "output", + mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(), --pipe_picture = floatationpipepictures(), pipe_covers = pipecoverspictures(), volume = 100, @@ -139,7 +147,8 @@ data:extend({ }, { production_type = "output", - --pipe_picture = floatationpipepictures(), + mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1mirror(), + pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(), pipe_covers = pipecoverspictures(), volume = 100, pipe_connections = { @@ -239,23 +248,31 @@ data:extend({ sound = { filename = "__angelspetrochemgraphics__/sound/steam-cracker.ogg", volume = 0.65 }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, + forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", - --pipe_picture = floatationpipepictures(), + mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1mirror(), + pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(), pipe_covers = pipecoverspictures(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } + }, }, { production_type = "input", + mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(), --pipe_picture = floatationpipepictures(), pipe_covers = pipecoverspictures(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } + }, }, { production_type = "output", + mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(), --pipe_picture = floatationpipepictures(), pipe_covers = pipecoverspictures(), volume = 100, @@ -265,7 +282,8 @@ data:extend({ }, { production_type = "output", - --pipe_picture = floatationpipepictures(), + mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1mirror(), + pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(), pipe_covers = pipecoverspictures(), volume = 100, pipe_connections = { @@ -365,23 +383,31 @@ data:extend({ sound = { filename = "__angelspetrochemgraphics__/sound/steam-cracker.ogg", volume = 0.65 }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, + forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", - --pipe_picture = floatationpipepictures(), + mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1mirror(), + pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(), pipe_covers = pipecoverspictures(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } + }, }, { production_type = "input", + mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(), --pipe_picture = floatationpipepictures(), pipe_covers = pipecoverspictures(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } + }, }, { production_type = "output", + mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(), --pipe_picture = floatationpipepictures(), pipe_covers = pipecoverspictures(), volume = 100, @@ -391,7 +417,8 @@ data:extend({ }, { production_type = "output", - --pipe_picture = floatationpipepictures(), + mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1mirror(), + pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(), pipe_covers = pipecoverspictures(), volume = 100, pipe_connections = { @@ -490,23 +517,31 @@ data:extend({ sound = { filename = "__angelspetrochemgraphics__/sound/steam-cracker.ogg", volume = 0.65 }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, + forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", - --pipe_picture = floatationpipepictures(), + mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1mirror(), + pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(), pipe_covers = pipecoverspictures(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { 1, 2 }, direction = defines.direction.south } + }, }, { production_type = "input", + mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(), --pipe_picture = floatationpipepictures(), pipe_covers = pipecoverspictures(), volume = 1000, - pipe_connections = { { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } }, + pipe_connections = { + { flow_direction = "input", position = { -1, 2 }, direction = defines.direction.south } + }, }, { production_type = "output", + mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(), --pipe_picture = floatationpipepictures(), pipe_covers = pipecoverspictures(), volume = 100, @@ -516,7 +551,8 @@ data:extend({ }, { production_type = "output", - --pipe_picture = floatationpipepictures(), + mirrored_pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1mirror(), + pipe_picture = angelsmods.petrochem.steamcrackerpipepictures1(), pipe_covers = pipecoverspictures(), volume = 100, pipe_connections = { diff --git a/angelspetrochemgraphics/graphics/entity/separator/blank.png b/angelspetrochemgraphics/graphics/entity/separator/blank.png new file mode 100644 index 0000000000000000000000000000000000000000..b881dc9085c0cafe1a3e766477e677d3823d6e70 GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}bltrFLW66d1S#FEVXJcW?V+*F3( zL2HE+EP)z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_000Gj zNkl)0EoKKtqFVQK7LF3%*!O#R@9*L4EMShf)Lu z4FN@81nILc`XHzv_|PXWsGyWWNf9J?0k!Q?MS_Mlo9mw4a~mHrCz&jpq)E;>o0EJ$ zSY|g_c4zSN!2m$lxvL2cn#M6#Yd|sBMi3jWft?-f>zh!xDf3khMScM>t-2(a~Wr)3jPydS14NWt(jZ#p3{G0GMs_fU9HIY~i^h zjByB0z;+x6;eoOE(S08qAtbK3Ph@OV#t_$CZ<)5fN6L41EP){xJ&J5{q%$fwSyH2z);g?~z}bB1LL zrCpEi&3>sCKoU1(M|A+{dc*lUn@&&8n~ke68-PKXSo=0H<@BVM6H(>>rg(w@APJyT zhNNx)W7}NtgltCvSOB_YE2N;Fvf{tnMe4TzQUHF4Y9S`%$TI*AfV%8}86(Sg0NB!t znIgWo0R#2l_n49wzl>rU>eq!FC0;h!Vuq~7y7=Q}^&aJ1hzJ*S!9rRt-9{?)`!q>5~%4^HtGpU4D)wr5HBe716 zC@&NHX#ih@5rSHE&fTKrYzJ=$Yhf2!9f?b8(PaY80qBpB=w$%K5I=t?tRyUy(4&ST zeYX}RvHB)f=$+^OLQKZK{U9Q%1*x?YX9J5DBA{>~l+W_L!Hr?q5pnYX(IOY9uZaje zfHf`3m@+Hc?ufYO05r}08CiaN2EeZeaTGhz~gV&?&@DSoPD+oTlT zYfi#1J$alx^XL)si~z5UYhDBR7wvlTxpv{XQzJ`Xz&Hl_`bg=3Ly&rzq5#n056sB( zXU=zZWrqDX9vwV@>dYJ|9pXaFum6~@ojdjNfqgw^r_E)-$9}Kizv>hz9ndU@wYYpk z17Ma*#dJ@1;iAQC(bL_#6t4c6p2e)`kkSDsVRb*i1;Af8^T5X<Lb|Ar0@B9rbQr33PSmeWbcsgKr$U^%0J z&%e72!IsCVTrQxtKuI{%^8qzSTFR8C>7Vbs`#zPX0~&xTA393s zP}`7%WrE;vojNJnt^x2o;p$X`ZetD*9$ecaMMIv3uA#pR)1(m8o^!$gY|BQmSRzFU zf`~d?9Xs4ld%grg5ClOG1VIo4cKz|poq~T+)9b5fc1N~XWP4q<3z1es3AA@dYzJem z6D|C^qMViOCE5N=9zZ!@M=^lq`wRh#htgFe_M^$KXvdBiK{+67s!c}gpAMRrUQwq3 z2$u#H&qDZj)yhfnE#)2=bYV_JXjr@>Op>G^2!bF8f*=TjAP9mW2!bF8f*=TjAc$?s Y{}j8Obl_cYE&u=k07*qoM6N<$f~%#;_5c6? literal 0 HcmV?d00001 diff --git a/angelspetrochemgraphics/graphics/entity/separator/pipe-north2.png b/angelspetrochemgraphics/graphics/entity/separator/pipe-north2.png new file mode 100644 index 0000000000000000000000000000000000000000..8515f10bdca62402d911c40bbf6d3ddb624850fe GIT binary patch literal 2906 zcmV-g3#IglP)z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_000WH zNkl{9y)?WMU3psM+$dMyQjvP61V8v-m=~>iGS63IMQjzYSg)CdTn2yd8L11v!QY;qn z-VZ1RPFS0yj*G6i{&j$VKK47)JJ3s|GHiy2s#I&yZ{oz!*WZ7A96N@GY77rms8*{a zsihXh#8HfM0t!N{5D~<~JAM814h+%JQD(!2%h|g1RpKP2Iy79_yTA9xP0uV%vXOCQ z^BC~lWE7x};hcu>1@K3-5@=Tp48~|`aZGG2R)mF%y73}}#ejufU4(@KCJ0DvigPL6 zTaqN9HXLD7hf;<@p-4w(CrSk<6fU(#Zf;bHaw(-iAvOi?L4-mO5`-Z^pedFL7^6{2 z5d;C+7?f6MU4K091yKqU7SUSc#k2qI{fKyKwTLLT&4O+SUnUSfK>uVJ5FF!q%}NkJ z7YfG3RgX^+)|~%dwrqJBC5kvn34(x*a!3$rI?6?C5>qOKfRMxygM)+gbazvxM4G0g z&Z0cs)}^dj_xabGZ@l5Euehc$aMusM_NItnf&i0xv{D2nKxYaN0i_KnkM|yHEk;9{ zT7sai5Umt@-rP$N8UU@r>m0)x>8rNCN?caAu!k;L(Yg9*a|;sq~)F`6J4u_3J$T8(__zttH~ z2m^2q1vu-7qL?JMIBT)aKi?vJIY#%aXNm!%!559*m3VhXU*BQ0(rBeHTGQ28Li-4# z!26Uy84$rci#Da$7)4MBAB>_H5&4t%4)6R693o1VNk7^)2O@oR3e0N=Rv?%M%w zyX8xNFX`Nn?zGB#99UXsr+gtu@tJym=hM8xLkC z7%)xfyCNUa8yle7WbpnZV*fb?`&v zEkZ;qqp>!ndtoOVF29(P5f+p~db-N5mkJ?;j`HUU9e;3>HP zpiW!dHKeraOl`_3%eq;A*(H>V=Gwprcm3*-heqr4uZQn6C@2=SbT8<{*_s4lf%7iE zd0gLn|IcsH{R6`cS1PJfi>Or+KQLV54-Y;uZodo9UA4^%ynW#C>WCkP{<*S(j&dscUG)0V8ez?0`F`&T&lPSVx zR6d#^B8d0xD>HfxStLT#Sd>XK2CEhYFxwfRo4)&OMx6j$_Q5sklJi#TdmebgF^lkl zb5V1&e~I(gg)Cs_CXMtAb=e0US~A}TFbVrS<+m@ zcQZwFG$~{>^k(hP#*xdk7USlsfM+Fw6J)?xsoGptPAz+;(ge?8CNRw7VuC(F2B>+? z1U<>QfXq}aXg(?8TUonkf*3Fs?#TMsnW_b;d20RsIG)coP2$?HAj7#I@IX>wESlE=q``Hu&WQ#kIDJP7OA zz9!t-w+vM0I0HVK3IAgm12p5W2{&U4@Nm1bAT`M#K3f@ZJOOypj5jB6Bi$4~?2^Tc z%=f?isn7o7xmR8Sxc?`&E2~nqZO7hODdqJax9y@4k zBAA}JkeaGAR7U%L>kU_x3JZ9~G?hU9{MV;ub$Yt_rR_(JZ_U{&_q@1mj|G-y&z6oM zyg^0^aI~Cz!jn}!nX-em(QT0k3kyAS*6|lZbE1CS0hPAy52#vMbnh=8PvLQHxbAA* zH`vD`e|yHyB?Z(H8x_Mq;?#DI@}hwnrA)1-QUUrni&RIkLTT06_@Q^8pMl}ZoMS+# zRATulOU7E`P!q_-wTl6A-NyHKl#8Y38$TR4{Enn?H0KoX{L9-LmYuZ7q}A{mF`(i1 zOH+}C>J!a%%N-r6+2YSXXEjC}a!fq~M)m2#gF~*j;@)Z;UvT~!Hox!!^I$2m^$ozo z+3~emyDV#?cCQD}J2djP^Pb(i@XnrW1}tsMf(9!Ul_a*@IDTX2HhMbC^Fg4h=?ypq zd@?&eV+{9vYSW&9X)i|~!LGxxs3y|x+x<4RTIFQ4<^$8sfKdlls8wCCV8Nlrag?N3 zC-Y%lpy5Y9lhu1pnNAmU!ZDy|7Ew(`?mswOBlVE~*$F50y6$Aq@bN=gd(#BDegr&4 zJNF6aSQzfm-?_K9V!c1DWgTFwH$e7IrNy8045-!;oz!b4U1M0XYWY4ml@`ww zt_jacM2VefGj>A(ecAVTD)s~CSz@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_000PO zNklK}FoV5Fac51GoMS ziVGJiF5C!06bYloMHCH*kU$8=@sY2QvpoC9pQ`&l^EG+${7)Wv2A@ySImP ziF(mdFB;mm#fM1OJ6!KbNgjFj`3p~c^4^cAr=ROs}NEwZg zQ$%afiZ>RohHzyS5x@=)mJfik7!*&j+eHGwEl9pa6CryfdaO|x1tNmvj7UNxk5(5A zkmYa*%-$>j`o0~5VU`p-j3h`M$w!n#g6l9!qZp#Ta{w0eMQ&S%Qyx%QZRooW zlEPX;+xPh3#xi9{jUhy|9z)?FgP^_H4CvcVHBF7A3@8M{Y~G^u8Zl{n@Z>Zs(i%eu z`OR7M&@OP(08n|@57cej7^R6h;eDVBiN23?E|QcbCPhk#lroZqloARJS&tr|mlJ@U z?FN9hL%PP3qsP0BE+mpJL0b@rG2vW5L?I|pij>m<1Jbg(KuAOR>l;)(^MshlfVL%C zTe5?g5`7!6N)u8bxJcgxs;a>CegGgZDFCx;^$-i3YXnO`@JTVz3hx4aFQ7D95)p7Q zKn@rYeD8^4To9Ht3w-DMzYu_?PqH!v@eqB17=zXcodeChBjrrfCnjsK+a`<_Bnc@B zOT8C35b2e#Jw9kkT?|2O-1SXQS7@sdN$hO*Lk%$IeHm>Z$HSGSW5B+g*`U!1IxqMr zG+hFLBn9^1? zJ{6V~fNy;Fyj-}_x366Fyt?bSSO>1QipBOtnwaSVOpAiEs})sMU=(z1i;U?{mNgB& zS>|0w9}+QUf{#c7Yv&Xg=5tFqYFF*RJADp{=>)Ri=?LEAD`8DdMrCrn< zMN?a`B=V()?|XhyRrf@J*RStji|UalpL+g@58b(?{`t~1S?U-7@YSz8sC-C75mJV| z*@8(mVKOPyug*W6V+_(u0;O4Bop9;WzsDZqG1v?N{Oqwm{Z}h~?$aLwpsEU8l_gE< zP+DV+9W%%paDBP!fVbChP;u6Id=@shZe=>%K#!9ncbq$SJQ(m+631HKheYcVd9h$p zt}tC+U+!b^cML#q02D<@-3%jiaaGv7^(+93MYH^+@Y~6LrC$^pBvFA42aHw(0N|ts^?j6d{fBk0}j=t23R;e#+Ojo{WtwE8u0D9ja?-;NzrL}j( z7_Oq!ODV)}Wsw(#{lrspA^<>?wML(rE$Y?i{0mC!i%0RdO9OzhR-AL$J6GfsPa*1< zbcf%eIPdWxVYHSQf{>2}f#q=lz=udqnX)J_MRCFy;5;z|LX4wJ7)}%ew9y9xQIko9 zF((XwuI(tSp{NQ9J2XsA6aZCa*`JBblIgncWW@mQ11N>onnm5RH(Q)6229u2XgkMj zQByCPgXZXo0pRMjZQ9P``wq#1HTr}BaCMu)SXRex2+8?`Wr5xyHnTD*>3dIzCk%k9 z9CCl#dz#kw*Jph=Q2-RSBx~(ny0WteR7Wr-yj*E;ddnH7b=8mUymWM*?=6qq37i7l oXt;j?-HBnqXmtnpqx{bKKZu3bF2&7l;s5{u07*qoM6N<$g02`IIRF3v literal 0 HcmV?d00001 diff --git a/angelsrefining/prototypes/buildings/filtration-unit.lua b/angelsrefining/prototypes/buildings/filtration-unit.lua index 8f3f62bde..49d8e7b84 100644 --- a/angelsrefining/prototypes/buildings/filtration-unit.lua +++ b/angelsrefining/prototypes/buildings/filtration-unit.lua @@ -72,6 +72,7 @@ data:extend({ fluid_boxes = { { production_type = "input", + mirrored_pipe_picture = angelsmods.refining.filtrationpipepictures2(), pipe_covers = pipecoverspictures(), pipe_picture = angelsmods.refining.filtrationpipepictures1(), volume = 1000, @@ -81,6 +82,7 @@ data:extend({ }, { production_type = "input", + mirrored_pipe_picture = angelsmods.refining.filtrationpipepictures1(), pipe_covers = pipecoverspictures(), pipe_picture = angelsmods.refining.filtrationpipepictures2(), volume = 1000, @@ -90,6 +92,7 @@ data:extend({ }, { production_type = "output", + mirrored_pipe_picture = angelsmods.refining.filtrationpipepictures1(), pipe_covers = pipecoverspictures(), pipe_picture = angelsmods.refining.filtrationpipepictures2(), volume = 100, @@ -99,6 +102,7 @@ data:extend({ }, { production_type = "output", + mirrored_pipe_picture = angelsmods.refining.filtrationpipepictures2(), pipe_covers = pipecoverspictures(), pipe_picture = angelsmods.refining.filtrationpipepictures1(), volume = 100, diff --git a/angelsrefining/prototypes/buildings/pipes-overlay.lua b/angelsrefining/prototypes/buildings/pipes-overlay.lua index 8d6fdf1ef..675960b3e 100644 --- a/angelsrefining/prototypes/buildings/pipes-overlay.lua +++ b/angelsrefining/prototypes/buildings/pipes-overlay.lua @@ -104,10 +104,10 @@ function angelsmods.refining.filtrationpipepictures2() north = { filename = "__angelsrefininggraphics__/graphics/entity/filtration-unit/pipe-north2.png", priority = "extra-high", - width = 68, - height = 74, + width = 128, + height = 128, scale = 0.5, - shift = { 0, 1 }, + shift = { 0, 1.5 }, }, east = { filename = "__angelsrefininggraphics__/graphics/entity/filtration-unit/pipe-east.png", diff --git a/angelsrefininggraphics/graphics/entity/filtration-unit/pipe-north2.png b/angelsrefininggraphics/graphics/entity/filtration-unit/pipe-north2.png index 2d22b86580babba500d62a260d60fca2ae89805b..f39de05643a6fa6140197aebefb98f184f58c68d 100644 GIT binary patch delta 3205 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 WAtiA1yR7K|0000eK@{Ea{HEjtmSN z`?>!lvI6-E$sR$z3=CCjKus+S48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!ItFh z?!xdN1Q+aGJ{c&&S>O>_%)r1c48n{Iv*t(ut&8<^aSW-r_4ckc*C7Xq){CU?0bsqca}!`;pEb)C%_IT#of7+4w@1Q?hc7^ujJ z-|GE#zFJ;+{S3>e7B?Ba+W)^PW)$JsZ`yS8!*1mny!)-0{2Aq#1wq!zopr08! Date: Tue, 23 Dec 2025 20:17:51 -0500 Subject: [PATCH 3/4] Remove forced symmetry from separator, steam cracker, and filtration unit; delete unused target image --- .../prototypes/buildings/separator.lua | 4 ---- .../prototypes/buildings/steam-cracker.lua | 4 ---- .../prototypes/buildings/filtration-unit.lua | 1 - .../graphics/entity/filtration-unit/target.png | Bin 518 -> 0 bytes 4 files changed, 9 deletions(-) delete mode 100644 angelsrefininggraphics/graphics/entity/filtration-unit/target.png diff --git a/angelspetrochem/prototypes/buildings/separator.lua b/angelspetrochem/prototypes/buildings/separator.lua index 1f869ee64..29026f3ae 100644 --- a/angelspetrochem/prototypes/buildings/separator.lua +++ b/angelspetrochem/prototypes/buildings/separator.lua @@ -80,7 +80,6 @@ data:extend({ sound = { filename = "__angelspetrochemgraphics__/sound/separator.ogg", volume = 0.65 }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, - forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", @@ -196,7 +195,6 @@ data:extend({ sound = { filename = "__angelspetrochemgraphics__/sound/separator.ogg", volume = 0.65 }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, - forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", @@ -311,7 +309,6 @@ data:extend({ sound = { filename = "__angelspetrochemgraphics__/sound/separator.ogg", volume = 0.65 }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, - forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", @@ -425,7 +422,6 @@ data:extend({ sound = { filename = "__angelspetrochemgraphics__/sound/separator.ogg", volume = 0.65 }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, - forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", diff --git a/angelspetrochem/prototypes/buildings/steam-cracker.lua b/angelspetrochem/prototypes/buildings/steam-cracker.lua index 6ad5d0069..7b65c3e1c 100644 --- a/angelspetrochem/prototypes/buildings/steam-cracker.lua +++ b/angelspetrochem/prototypes/buildings/steam-cracker.lua @@ -113,7 +113,6 @@ data:extend({ sound = { filename = "__angelspetrochemgraphics__/sound/steam-cracker.ogg", volume = 0.65 }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, - forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", @@ -248,7 +247,6 @@ data:extend({ sound = { filename = "__angelspetrochemgraphics__/sound/steam-cracker.ogg", volume = 0.65 }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, - forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", @@ -383,7 +381,6 @@ data:extend({ sound = { filename = "__angelspetrochemgraphics__/sound/steam-cracker.ogg", volume = 0.65 }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, - forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", @@ -517,7 +514,6 @@ data:extend({ sound = { filename = "__angelspetrochemgraphics__/sound/steam-cracker.ogg", volume = 0.65 }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, - forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", diff --git a/angelsrefining/prototypes/buildings/filtration-unit.lua b/angelsrefining/prototypes/buildings/filtration-unit.lua index 49d8e7b84..d24acf32b 100644 --- a/angelsrefining/prototypes/buildings/filtration-unit.lua +++ b/angelsrefining/prototypes/buildings/filtration-unit.lua @@ -68,7 +68,6 @@ data:extend({ sound = { filename = "__base__/sound/oil-refinery.ogg" }, idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, }, - forced_symmetry = "horizontal", fluid_boxes = { { production_type = "input", diff --git a/angelsrefininggraphics/graphics/entity/filtration-unit/target.png b/angelsrefininggraphics/graphics/entity/filtration-unit/target.png deleted file mode 100644 index bbde04f6aa5260f12b5195453fdf79228a0205bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 518 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jPK-BC>eK@{Ea{HEjtmSN z`?>!lvI6-E$sR$z3=CCjKus+S48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!ItFh z?!xdN1Q+aGJ{c&&S>O>_%)r1c48n{Iv*t(ut&8<^aSW-r_4ckc*C7Xq){CU?0bsqca}!`;pEb)C%_IT#of7+4w@1Q?hc7^ujJ z-|GE#zFJ;+{S3>e7B?Ba+W)^PW)$JsZ`yS8!*1mny!)-0{2Aq#1wq!zopr08! Date: Tue, 23 Dec 2025 20:40:08 -0500 Subject: [PATCH 4/4] Remove unused pipe ending graphic for filtration unit --- .../filtration-unit/pipe-ending-up-slice.xcf | Bin 39407 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 angelsrefininggraphics/graphics/entity/filtration-unit/pipe-ending-up-slice.xcf diff --git a/angelsrefininggraphics/graphics/entity/filtration-unit/pipe-ending-up-slice.xcf b/angelsrefininggraphics/graphics/entity/filtration-unit/pipe-ending-up-slice.xcf deleted file mode 100644 index e277f9ead37cf111aa8ce615968fb229d44f263f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39407 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