From 547c712efb182bc2ffa6351e267a7916a3638270 Mon Sep 17 00:00:00 2001 From: PreLeyZero Date: Tue, 5 Apr 2022 23:58:49 +0200 Subject: [PATCH] removed squeak trhough + adjusted fluid boxes --- changelog.txt | 10 + info.json | 1 - locale/en/lang_en.cfg | 1 + prototypes/electronic/el_arc_furnace.lua | 6 +- prototypes/electronic/el_caster.lua | 12 +- prototypes/electronic/el_grower.lua | 4 + prototypes/electronic/el_ki/el_ki_core.lua | 154 +++++++++++++-- prototypes/electronic/el_ki/el_ki_cpu.lua | 1 + prototypes/electronic/el_ki/el_ki_memory.lua | 1 + prototypes/electronic/el_ki/fi_ki_circuit.lua | 1 + prototypes/electronic/el_ki/fu_ki_circuit.lua | 1 + prototypes/electronic/el_pressurizer.lua | 4 + prototypes/electronic/el_purifier.lua | 12 +- prototypes/electronic/el_tank.lua | 2 +- prototypes/electronic/el_water_generator.lua | 11 +- prototypes/fission/fi_compound_machine.lua | 12 +- prototypes/fusion/fu_activator.lua | 4 + prototypes/fusion/fu_exchanger.lua | 6 +- prototypes/fusion/fu_laser.lua | 8 +- prototypes/fusion/fu_magnet.lua | 12 +- prototypes/fusion/fu_plasma.lua | 8 +- prototypes/fusion/fu_reactor.lua | 178 +++++++++--------- .../fu_star_engine/fu_star_engine_cooler.lua | 27 ++- .../fu_star_engine_cooler_up.lua | 2 +- .../fu_star_engine/fu_star_engine_core.lua | 2 +- .../fu_star_engine/fu_star_engine_heater.lua | 2 +- .../fu_star_engine_heater_left.lua | 2 +- prototypes/gravitation/gr_lab.lua | 2 +- prototypes/pipe_covers.lua | 44 ++++- .../pipe_covers/north_long_basic_covers.png | Bin 0 -> 4560 bytes 30 files changed, 386 insertions(+), 144 deletions(-) create mode 100644 ressources/pipe_covers/north_long_basic_covers.png diff --git a/changelog.txt b/changelog.txt index 2c065f9..654c9dc 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,13 @@ +--------------------------------------------------------------------------------------------------- +Version: 1.0.7 +Date: 5.4.2022 + Features: + - added pipe covers for most machines + - added more inputs to KI cores to improve symetry + - added new simple kerosene recipe in Overhaul mode, without lightoil + Changes: + - removed squeak trough dependency + --------------------------------------------------------------------------------------------------- Version: 1.0.6 Date: 3.4.2022 diff --git a/info.json b/info.json index 58bbd35..b9dcf6a 100644 --- a/info.json +++ b/info.json @@ -7,7 +7,6 @@ "description": "Advance through 4 stages of tech. Start with simple machines and work your way through nuclear fission and fusion up to black and white holes. Can be added to already existing saves! See mod portal for more info.", "dependencies": [ "base >= 1.0.0", - "Squeak Through", "?Booktorio", "?informatron", "?Krastorio2", diff --git a/locale/en/lang_en.cfg b/locale/en/lang_en.cfg index 50d006a..6943d09 100644 --- a/locale/en/lang_en.cfg +++ b/locale/en/lang_en.cfg @@ -563,6 +563,7 @@ limitation_message=This module can not be used here. [recipe-name] fi_decay_waste_recipe=Decay nuclear waste +fu_burn_oxygen_recipe=Vent oxygen #booktorio [gui] diff --git a/prototypes/electronic/el_arc_furnace.lua b/prototypes/electronic/el_arc_furnace.lua index 356c48f..eedaa3c 100644 --- a/prototypes/electronic/el_arc_furnace.lua +++ b/prototypes/electronic/el_arc_furnace.lua @@ -63,6 +63,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {0, -4}}, @@ -75,6 +76,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {-4, 0}} @@ -87,6 +89,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {4, 0}}, @@ -100,6 +103,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {0, 4}}, @@ -116,7 +120,7 @@ data:extend({ --lines_per_file = 2, frame_count = 1, --animation_speed = 0.2, - shift = {0,-0.1} + shift = {0,-0.3} }, working_visualisations = { { diff --git a/prototypes/electronic/el_caster.lua b/prototypes/electronic/el_caster.lua index de1de0c..59b4d7d 100644 --- a/prototypes/electronic/el_caster.lua +++ b/prototypes/electronic/el_caster.lua @@ -64,6 +64,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {0, -4}}, @@ -76,6 +77,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {-4, 0}} @@ -88,6 +90,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {4, 0}}, @@ -101,6 +104,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {0, 4}}, @@ -118,7 +122,7 @@ data:extend({ lines_per_file = 3, frame_count = 9, animation_speed = 0.2, - shift = {0,-0.1} + shift = {0,-0.3} }, east = { filename = sprite('entity_animation.png'), @@ -128,7 +132,7 @@ data:extend({ lines_per_file = 3, frame_count = 9, animation_speed = 0.2, - shift = {0,-0.1} + shift = {0,-0.3} }, south = { filename = sprite('entity_animation.png'), @@ -138,7 +142,7 @@ data:extend({ lines_per_file = 3, frame_count = 9, animation_speed = 0.2, - shift = {0,-0.1} + shift = {0,-0.3} }, west = { filename = sprite('entity_animation.png'), @@ -148,7 +152,7 @@ data:extend({ lines_per_file = 3, frame_count = 9, animation_speed = 0.2, - shift = {0,-0.1} + shift = {0,-0.3} }, }, working_sound = diff --git a/prototypes/electronic/el_grower.lua b/prototypes/electronic/el_grower.lua index 41eaf73..18654bd 100644 --- a/prototypes/electronic/el_grower.lua +++ b/prototypes/electronic/el_grower.lua @@ -63,6 +63,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = south_basic_pipe_picture, pipe_connections = { {type = "input", position = {0, -3}}, @@ -74,6 +75,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = south_basic_pipe_picture, pipe_connections = { {type = "input", position = {-3, 0}} @@ -85,6 +87,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = south_basic_pipe_picture, pipe_connections = { {type = "input", position = {3, 0}}, @@ -97,6 +100,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = south_basic_pipe_picture, pipe_connections = { {type = "input", position = {0, 3}}, diff --git a/prototypes/electronic/el_ki/el_ki_core.lua b/prototypes/electronic/el_ki/el_ki_core.lua index 09d1d09..cdbc877 100644 --- a/prototypes/electronic/el_ki/el_ki_core.lua +++ b/prototypes/electronic/el_ki/el_ki_core.lua @@ -61,8 +61,8 @@ data:extend({ crafting_speed = 1, max_health = 300, corpse = 'big-remnants', - collision_box = {{-2.8, -2.8}, {2.8, 2.8}}, - selection_box = {{-3.0, -3.0}, {3.0, 3.0}}, + collision_box = {{-2.9, -2.9}, {2.9, 2.9}}, + selection_box = {{-3, -3}, {3, 3}}, map_color = {r=0, g=0, b=1, a=1}, minable = { mining_time = 1, @@ -82,9 +82,23 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, -3.2}}, + {type = "input", position = {0.5, -3.5}}, + }, + production_type = "input" + }, + { + filter = 'el_ki_cpu_fluid', + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, + pipe_connections = + { + {type = "input", position = {-0.5, -3.5}}, }, production_type = "input" }, @@ -94,12 +108,26 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, 3.2}}, + {type = "input", position = {0.5, 3.5}}, }, production_type = "input" - }, + }, + { + filter = 'el_ki_memory_fluid', + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, + pipe_connections = + { + {type = "input", position = {-0.5, 3.5}}, + }, + production_type = "input" + }, }, animation = { @@ -168,7 +196,7 @@ data:extend({ crafting_speed = 1, max_health = 300, corpse = 'big-remnants', - collision_box = {{-2.8, -2.8}, {2.8, 2.8}}, + collision_box = {{-2.9, -2.9}, {2.9, 2.9}}, selection_box = {{-3.0, -3.0}, {3.0, 3.0}}, map_color = {r=0, g=0, b=1, a=1}, minable = { @@ -189,9 +217,23 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, -3.2}}, + {type = "input", position = {0.5, -3.5}}, + }, + production_type = "input" + }, + { + filter = 'el_ki_cpu_fluid', + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, + pipe_connections = + { + {type = "input", position = {-0.5, -3.5}}, }, production_type = "input" }, @@ -201,9 +243,23 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, 3.2}}, + {type = "input", position = {0.5, 3.5}}, + }, + production_type = "input" + }, + { + filter = 'el_ki_memory_fluid', + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, + pipe_connections = + { + {type = "input", position = {-0.5, 3.5}}, }, production_type = "input" }, @@ -213,9 +269,23 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {3.2, 0.5}}, + {type = "input", position = {3.5, 0.5}}, + }, + production_type = "input" + }, + { + filter = 'fi_ki_circuit_fluid', + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, + pipe_connections = + { + {type = "input", position = {3.5, -0.5}}, }, production_type = "input" } @@ -287,7 +357,7 @@ data:extend({ crafting_speed = 1, max_health = 300, corpse = 'big-remnants', - collision_box = {{-2.8, -2.8}, {2.8, 2.8}}, + collision_box = {{-2.9, -2.9}, {2.9, 2.9}}, selection_box = {{-3.0, -3.0}, {3.0, 3.0}}, map_color = {r=0, g=0, b=1, a=1}, minable = { @@ -308,9 +378,23 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, -3.2}}, + {type = "input", position = {0.5, -3.5}}, + }, + production_type = "input" + }, + { + filter = 'el_ki_cpu_fluid', + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, + pipe_connections = + { + {type = "input", position = {-0.5, -3.5}}, }, production_type = "input" }, @@ -320,9 +404,23 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, 3.2}}, + {type = "input", position = {0.5, 3.5}}, + }, + production_type = "input" + }, + { + filter = 'el_ki_memory_fluid', + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, + pipe_connections = + { + {type = "input", position = {-0.5, 3.5}}, }, production_type = "input" }, @@ -332,9 +430,23 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {3.2, 0.5}}, + {type = "input", position = {3.5, 0.5}}, + }, + production_type = "input" + }, + { + filter = 'fi_ki_circuit_fluid', + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, + pipe_connections = + { + {type = "input", position = {3.5, -0.5}}, }, production_type = "input" }, @@ -344,9 +456,23 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {-3.2, 0.5}}, + {type = "input", position = {-3.5, 0.5}}, + }, + production_type = "input" + }, + { + filter = 'fu_ki_circuit_fluid', + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_long_north_pipe_picture, + pipe_connections = + { + {type = "input", position = {-3.5, -0.5}}, }, production_type = "input" } diff --git a/prototypes/electronic/el_ki/el_ki_cpu.lua b/prototypes/electronic/el_ki/el_ki_cpu.lua index 938c367..4a7d350 100644 --- a/prototypes/electronic/el_ki/el_ki_cpu.lua +++ b/prototypes/electronic/el_ki/el_ki_cpu.lua @@ -57,6 +57,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {0, 2}}, diff --git a/prototypes/electronic/el_ki/el_ki_memory.lua b/prototypes/electronic/el_ki/el_ki_memory.lua index c6e76bc..1942428 100644 --- a/prototypes/electronic/el_ki/el_ki_memory.lua +++ b/prototypes/electronic/el_ki/el_ki_memory.lua @@ -57,6 +57,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {0, 2}}, diff --git a/prototypes/electronic/el_ki/fi_ki_circuit.lua b/prototypes/electronic/el_ki/fi_ki_circuit.lua index 1e2c7b5..8171c0a 100644 --- a/prototypes/electronic/el_ki/fi_ki_circuit.lua +++ b/prototypes/electronic/el_ki/fi_ki_circuit.lua @@ -57,6 +57,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {0, 2}}, diff --git a/prototypes/electronic/el_ki/fu_ki_circuit.lua b/prototypes/electronic/el_ki/fu_ki_circuit.lua index 49de63a..d10b525 100644 --- a/prototypes/electronic/el_ki/fu_ki_circuit.lua +++ b/prototypes/electronic/el_ki/fu_ki_circuit.lua @@ -57,6 +57,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {0, 2}}, diff --git a/prototypes/electronic/el_pressurizer.lua b/prototypes/electronic/el_pressurizer.lua index 1775c53..691c084 100644 --- a/prototypes/electronic/el_pressurizer.lua +++ b/prototypes/electronic/el_pressurizer.lua @@ -57,6 +57,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {0, -2}}, @@ -69,6 +70,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {-2, 0}} @@ -81,6 +83,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {2, 0}}, @@ -94,6 +97,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {0, 2}}, diff --git a/prototypes/electronic/el_purifier.lua b/prototypes/electronic/el_purifier.lua index c0f597a..44b18e2 100644 --- a/prototypes/electronic/el_purifier.lua +++ b/prototypes/electronic/el_purifier.lua @@ -64,6 +64,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {0, -4}}, @@ -76,6 +77,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {-4, 0}} @@ -88,6 +90,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {4, 0}}, @@ -101,6 +104,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {0, 4}}, @@ -117,7 +121,7 @@ data:extend({ line_length = 3, frame_count = 3, animation_speed = 0.2, - shift = {0,-0.1} + shift = {0,-0.3} }, east = { filename = sprite('entity_animation.png'), @@ -126,7 +130,7 @@ data:extend({ line_length = 3, frame_count = 3, animation_speed = 0.2, - shift = {0,-0.1} + shift = {0,-0.3} }, south = { filename = sprite('entity_animation.png'), @@ -135,7 +139,7 @@ data:extend({ line_length = 3, frame_count = 3, animation_speed = 0.2, - shift = {0,-0.1} + shift = {0,-0.3} }, west = { filename = sprite('entity_animation.png'), @@ -144,7 +148,7 @@ data:extend({ line_length = 3, frame_count = 3, animation_speed = 0.2, - shift = {0,-0.1} + shift = {0,-0.3} }, }, working_sound = diff --git a/prototypes/electronic/el_tank.lua b/prototypes/electronic/el_tank.lua index 76a1dbe..998027a 100644 --- a/prototypes/electronic/el_tank.lua +++ b/prototypes/electronic/el_tank.lua @@ -38,7 +38,7 @@ data:extend({ }, max_health = 300, corpse = 'small-remnants', - collision_box = {{-3.5,-3.5},{3.5,3.5}}, + collision_box = {{-3.4,-3.4},{3.4,3.4}}, selection_box = {{-3.5,-3.5},{3.5,3.5}}, pictures = { picture = { diff --git a/prototypes/electronic/el_water_generator.lua b/prototypes/electronic/el_water_generator.lua index b352cf6..c27bf1e 100644 --- a/prototypes/electronic/el_water_generator.lua +++ b/prototypes/electronic/el_water_generator.lua @@ -33,7 +33,7 @@ data:extend({ flags = {"player-creation","placeable-neutral"}, max_health = 300, corpse = 'big-remnants', - collision_box = {{-1.3, -3.3}, {1.3, 3.3}}, + collision_box = {{-1.4, -3.4}, {1.4, 3.4}}, selection_box = {{-1.5, -3.5}, {1.5, 3.5}}, map_color = {r=0, g=0, b=1, a=1}, minable = { @@ -52,7 +52,9 @@ data:extend({ filter = 'el_pressurized_water', minimum_temperature = 0, maximum_temperature = 500, - production_type = 'input-output', + production_type = 'input-output', + pipe_covers = pipecoverspictures(), + pipe_picture = south_basic_pipe_picture, pipe_connections = { {type = "input-output", position = {2, 0}}, {type = "input-output", position = {-2, 0}}, @@ -81,7 +83,7 @@ data:extend({ horizontal_animation = { filename = sprite('entity_animation_horizontal_1.png'), size = {896,480}, - scale = 0.22, + scale = 0.2, line_length = 4, frame_count = 4, animation_speed = 0.5, @@ -91,5 +93,4 @@ data:extend({ apparent_volume = 0.3, }, }, -}) - +}) \ No newline at end of file diff --git a/prototypes/fission/fi_compound_machine.lua b/prototypes/fission/fi_compound_machine.lua index 61643ed..622e5f9 100644 --- a/prototypes/fission/fi_compound_machine.lua +++ b/prototypes/fission/fi_compound_machine.lua @@ -63,6 +63,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {0, -4}}, @@ -75,6 +76,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {-4, 0}} @@ -87,6 +89,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {4, 0}}, @@ -100,6 +103,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {0, 4}}, @@ -116,7 +120,7 @@ data:extend({ line_length = 3, frame_count = 3, animation_speed = 0.5, - shift = {0,-0.1} + shift = {0,-0.3} }, east = { filename = sprite('entity_animation.png'), @@ -126,7 +130,7 @@ data:extend({ --lines_per_file = 3, frame_count = 3, animation_speed = 0.5, - shift = {0,-0.1} + shift = {0,-0.3} }, south = { filename = sprite('entity_animation.png'), @@ -135,7 +139,7 @@ data:extend({ line_length = 3, frame_count = 3, animation_speed = 0.5, - shift = {0,-0.1} + shift = {0,-0.3} }, west = { filename = sprite('entity_animation.png'), @@ -144,7 +148,7 @@ data:extend({ line_length = 3, frame_count = 3, animation_speed = 0.5, - shift = {0,-0.1} + shift = {0,-0.3} }, }, working_sound = diff --git a/prototypes/fusion/fu_activator.lua b/prototypes/fusion/fu_activator.lua index 0fc2107..0888e1c 100644 --- a/prototypes/fusion/fu_activator.lua +++ b/prototypes/fusion/fu_activator.lua @@ -63,6 +63,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = south_basic_pipe_picture, pipe_connections = { {type = "input", position = {-2, 0}} @@ -74,6 +75,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = south_basic_pipe_picture, pipe_connections = { {type = "input", position = {0, 2}} @@ -85,6 +87,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = south_basic_pipe_picture, pipe_connections = { {type = "output", position = {2, 0}}, @@ -96,6 +99,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = south_basic_pipe_picture, pipe_connections = { {type = "output", position = {0, -2}}, diff --git a/prototypes/fusion/fu_exchanger.lua b/prototypes/fusion/fu_exchanger.lua index d29138e..be49bb3 100644 --- a/prototypes/fusion/fu_exchanger.lua +++ b/prototypes/fusion/fu_exchanger.lua @@ -33,7 +33,7 @@ data:extend({ flags = {"player-creation","placeable-neutral"}, max_health = 300, corpse = 'big-remnants', - collision_box = {{-1.8,-1.8},{1.8,1.8}}, + collision_box = {{-1.9,-1.9},{1.9,1.9}}, selection_box = {{-2,-2},{2,2}}, map_color = {r=0, g=0, b=1, a=1}, minable = { @@ -61,6 +61,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {-2.5, -0.5}} @@ -72,6 +73,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {-2.5, 1.5}} @@ -83,6 +85,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {2.5, -0.5}}, @@ -94,6 +97,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {2.5, 1.5}}, diff --git a/prototypes/fusion/fu_laser.lua b/prototypes/fusion/fu_laser.lua index 74af0ec..13a0137 100644 --- a/prototypes/fusion/fu_laser.lua +++ b/prototypes/fusion/fu_laser.lua @@ -56,6 +56,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {0, -4}}, @@ -68,6 +69,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {-4, 0}} @@ -80,6 +82,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {4, 0}}, @@ -93,6 +96,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {0, 4}}, @@ -109,7 +113,7 @@ data:extend({ --lines_per_file = 2, frame_count = 1, --animation_speed = 0.2, - shift = {0,-0.1} + shift = {0,-0.3} }, working_visualisations = { { @@ -122,7 +126,7 @@ data:extend({ lines_per_file = 1, frame_count = 3, animation_speed = 0.2, - shift = {0,-0.1} + shift = {0,-0.3} } } }, diff --git a/prototypes/fusion/fu_magnet.lua b/prototypes/fusion/fu_magnet.lua index 9f8a698..179fd4a 100644 --- a/prototypes/fusion/fu_magnet.lua +++ b/prototypes/fusion/fu_magnet.lua @@ -56,6 +56,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {0, -4}}, @@ -68,6 +69,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {-4, 0}} @@ -80,6 +82,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {4, 0}}, @@ -93,6 +96,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {0, 4}}, @@ -110,7 +114,7 @@ data:extend({ lines_per_file = 3, frame_count = 9, animation_speed = 0.2, - shift = {0,-0.1} + shift = {0,-0.3} }, east = { filename = sprite('entity_animation.png'), @@ -120,7 +124,7 @@ data:extend({ lines_per_file = 3, frame_count = 9, animation_speed = 0.2, - shift = {0,-0.1} + shift = {0,-0.3} }, south = { filename = sprite('entity_animation.png'), @@ -130,7 +134,7 @@ data:extend({ lines_per_file = 3, frame_count = 9, animation_speed = 0.2, - shift = {0,-0.1} + shift = {0,-0.3} }, west = { filename = sprite('entity_animation.png'), @@ -140,7 +144,7 @@ data:extend({ lines_per_file = 3, frame_count = 9, animation_speed = 0.2, - shift = {0,-0.1} + shift = {0,-0.3} }, }, working_sound = diff --git a/prototypes/fusion/fu_plasma.lua b/prototypes/fusion/fu_plasma.lua index e1d90e8..3a73016 100644 --- a/prototypes/fusion/fu_plasma.lua +++ b/prototypes/fusion/fu_plasma.lua @@ -56,6 +56,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {0, -4}}, @@ -68,6 +69,7 @@ data:extend({ height = 2, base_level = -1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {-4, 0}} @@ -80,6 +82,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {4, 0}}, @@ -93,6 +96,7 @@ data:extend({ height = 2, base_level = 1, pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {0, 4}}, @@ -109,7 +113,7 @@ data:extend({ --lines_per_file = 2, frame_count = 1, --animation_speed = 0.2, - shift = {0,-0.1} + shift = {0,-0.3} }, working_visualisations = { { @@ -122,7 +126,7 @@ data:extend({ lines_per_file = 2, frame_count = 4, animation_speed = 0.2, - shift = {0,-0.1} + shift = {0,-0.3} } } }, diff --git a/prototypes/fusion/fu_reactor.lua b/prototypes/fusion/fu_reactor.lua index cd018be..b31ccf3 100644 --- a/prototypes/fusion/fu_reactor.lua +++ b/prototypes/fusion/fu_reactor.lua @@ -60,50 +60,54 @@ data:extend({ energy_usage = '400MW', --fluid fluid_boxes = { + { + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = { - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_connections = - { - {type = "input", position = {-1, -7}}, - }, - production_type = "input" + {type = "input", position = {-1, -7}}, }, - { - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_connections = - { - {type = "input", position = {1, -7}} - }, - production_type = "input" + production_type = "input" + }, + { + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {type = "input", position = {1, -7}} }, - { - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_connections = - { - {type = "input", position = {3, -7}} - }, - production_type = "input" - }, - { - base_area = 1, - height = 2, - base_level = 1, - pipe_covers = pipecoverspictures(), - pipe_connections = - { - {type = "output", position = {-3, -7}} - }, - production_type = "output" - }, + production_type = "input" + }, + { + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {type = "input", position = {3, -7}} + }, + production_type = "input" + }, + { + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {type = "output", position = {-3, -7}} + }, + production_type = "output" + }, }, --animation animation = { @@ -114,7 +118,7 @@ data:extend({ --lines_per_file = 2, frame_count = 1, --animation_speed = 0.2, - shift = {2.4,-1.5} + shift = {2.4,-1.7} }, working_visualisations = { { @@ -127,7 +131,7 @@ data:extend({ lines_per_file = 3, frame_count = 9, animation_speed = 0.3, - shift = {2.4,-1.5} + shift = {2.4,-1.7} } } }, @@ -163,50 +167,54 @@ data:extend({ energy_usage = '400MW', --fluid fluid_boxes = { + { + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = { - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_connections = - { - {type = "input", position = {-1, -7}}, - }, - production_type = "input" + {type = "input", position = {-1, -7}}, }, - { - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_connections = - { - {type = "input", position = {1, -7}} - }, - production_type = "input" + production_type = "input" + }, + { + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {type = "input", position = {1, -7}} }, - { - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_connections = - { - {type = "input", position = {3, -7}} - }, - production_type = "input" - }, - { - base_area = 1, - height = 2, - base_level = 1, - pipe_covers = pipecoverspictures(), - pipe_connections = - { - {type = "output", position = {-3, -7}} - }, - production_type = "output" - }, + production_type = "input" + }, + { + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {type = "input", position = {3, -7}} + }, + production_type = "input" + }, + { + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {type = "output", position = {-3, -7}} + }, + production_type = "output" + }, }, animation = { filename = sprite('tokamak_entity_animation.png'), @@ -216,7 +224,7 @@ data:extend({ lines_per_file = 3, frame_count = 9, animation_speed = 0.3, - shift = {2.4,-1.5} + shift = {2.4,-1.7} }, working_sound = { diff --git a/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua b/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua index 867c52c..ef1e6d0 100644 --- a/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua +++ b/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua @@ -33,7 +33,7 @@ data:extend({ flags = {"player-creation","placeable-neutral","not-rotatable"}, max_health = 300, corpse = 'big-remnants', - collision_box = {{-6.5,-9},{6.5,9}}, + collision_box = {{-6.4,-8.9},{6.4,8.9}}, selection_box = {{-6.5,-9},{6.5,9}}, map_color = {r=0, g=0, b=1, a=1}, minable = { @@ -54,7 +54,8 @@ data:extend({ base_area = 1, height = 2, base_level = -1, - + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {-2, -9.5}} @@ -65,7 +66,8 @@ data:extend({ base_area = 1, height = 2, base_level = -1, - + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "input", position = {2, -9.5}} @@ -76,7 +78,8 @@ data:extend({ base_area = 1, height = 2, base_level = 1, - + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {0, 9.5}}, @@ -87,7 +90,8 @@ data:extend({ base_area = 1, height = 2, base_level = 1, - + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {-2, 9.5}}, @@ -98,7 +102,8 @@ data:extend({ base_area = 1, height = 2, base_level = 1, - + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {2, 9.5}}, @@ -109,7 +114,8 @@ data:extend({ base_area = 1, height = 2, base_level = 1, - + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {-4, 9.5}}, @@ -120,7 +126,8 @@ data:extend({ base_area = 1, height = 2, base_level = 1, - + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, pipe_connections = { {type = "output", position = {4, 9.5}}, @@ -133,7 +140,7 @@ data:extend({ filename = sprite('base.png'), size = {1080, 1080}, scale = 0.58, - shift = {0,-0.35}, + shift = {0,-0.62}, line_length = 1, lines_per_file = 1, frame_count = 1, @@ -150,7 +157,7 @@ data:extend({ lines_per_file = 3, frame_count = 9, animation_speed = 0.3, - shift = {0,-0.35} + shift = {0,-0.62} } } }, diff --git a/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua b/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua index d61ca73..223a08e 100644 --- a/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua +++ b/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua @@ -33,7 +33,7 @@ data:extend({ flags = {"player-creation","placeable-neutral","not-rotatable"}, max_health = 300, corpse = 'big-remnants', - collision_box = {{-6.5,-9},{6.5,9}}, + collision_box = {{-6.4,-8.9},{6.4,8.9}}, selection_box = {{-6.5,-9},{6.5,9}}, map_color = {r=0, g=0, b=1, a=1}, minable = { diff --git a/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua b/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua index 197c379..93ed7ab 100644 --- a/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua +++ b/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua @@ -33,7 +33,7 @@ data:extend({ flags = {"player-creation","placeable-neutral","not-rotatable"}, max_health = 300, corpse = 'big-remnants', - collision_box = {{-8.5,-4.5},{8.5,8.5}}, + collision_box = {{-8.4,-4.4},{8.4,8.4}}, selection_box = {{-8.5,-4.5},{8.5,8.5}}, map_color = {r=0, g=0, b=1, a=1}, minable = { diff --git a/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua b/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua index bd8399d..fd2c04d 100644 --- a/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua +++ b/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua @@ -33,7 +33,7 @@ data:extend({ flags = {"player-creation","placeable-neutral","not-rotatable"}, max_health = 300, corpse = 'big-remnants', - collision_box = {{-10.5,-4.5}, {8.5,4.5}}, + collision_box = {{-10.4,-4.4}, {8.4,4.4}}, selection_box = {{-10.5,-4.5}, {8.5,4.5}}, map_color = {r=0, g=0, b=1, a=1}, minable = { diff --git a/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua b/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua index dd4db88..bd0a5e2 100644 --- a/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua +++ b/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua @@ -33,7 +33,7 @@ data:extend({ flags = {"player-creation","placeable-neutral","not-rotatable"}, max_health = 300, corpse = 'big-remnants', - collision_box = {{-8.5,-4.5},{10.5,4.5}}, + collision_box = {{-8.4,-4.4},{10.4,4.4}}, selection_box = {{-8.5,-4.5},{10.5,4.5}}, map_color = {r=0, g=0, b=1, a=1}, minable = { diff --git a/prototypes/gravitation/gr_lab.lua b/prototypes/gravitation/gr_lab.lua index 27575b3..49a131f 100644 --- a/prototypes/gravitation/gr_lab.lua +++ b/prototypes/gravitation/gr_lab.lua @@ -32,7 +32,7 @@ data:extend({ flags = {"player-creation","placeable-neutral","not-rotatable"}, max_health = 300, corpse = 'big-remnants', - collision_box = {{-4,-3.5},{4,3.5}}, + collision_box = {{-3.9,-3.4},{3.9,3.4}}, selection_box = {{-4,-3.5},{4,3.5}}, map_color = {r=0, g=0, b=1, a=1}, minable = { diff --git a/prototypes/pipe_covers.lua b/prototypes/pipe_covers.lua index f2f3836..28b12dc 100644 --- a/prototypes/pipe_covers.lua +++ b/prototypes/pipe_covers.lua @@ -107,7 +107,49 @@ grey_south_pipe_picture = { east = empty_sprite } -north_south_basic_pipe_picture = { +grey_south_north_pipe_picture = { + north = { + filename = sprite("north_basic_covers"), + priority = "high", + width = 45, + height = 40, + shift = util.by_pixel(0, 25), + scale = 0.5 + }, + south = { + filename = sprite("south_covers_grey"), + priority = "high", + width = 88, + height = 61, + shift = util.by_pixel(0, -31.25), + scale = 0.5 + }, + west = empty_sprite, + east = empty_sprite +} + +grey_south_long_north_pipe_picture = { + north = { + filename = sprite("north_long_basic_covers"), + priority = "high", + width = 45, + height = 65, + shift = util.by_pixel(0, 23.25), + scale = 0.5 + }, + south = { + filename = sprite("south_covers_grey"), + priority = "high", + width = 88, + height = 61, + shift = util.by_pixel(0, -31.25), + scale = 0.5 + }, + west = empty_sprite, + east = empty_sprite +} + +south_basic_pipe_picture = { north = empty_sprite, south = { filename = sprite("south_basic_covers"), diff --git a/ressources/pipe_covers/north_long_basic_covers.png b/ressources/pipe_covers/north_long_basic_covers.png new file mode 100644 index 0000000000000000000000000000000000000000..2e6ffffba0202d4514f4b778ed70c10b1a815ebc GIT binary patch literal 4560 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