diff --git a/248k_2/prototypes/electronic/el_arc_furnace.lua b/248k_2/prototypes/electronic/el_arc_furnace.lua index 8dc9d0d..d8e4556 100644 --- a/248k_2/prototypes/electronic/el_arc_furnace.lua +++ b/248k_2/prototypes/electronic/el_arc_furnace.lua @@ -58,55 +58,50 @@ data:extend({ energy_usage = '400kW', fluid_boxes = { { - - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, -4}}, - }, - production_type = "output" - }, - { - - base_area = 1, - height = 2, - base_level = 1, - pipe_covers = pipecoverspictures(), - pipe_picture = grey_south_pipe_picture, - pipe_connections = - { - {type = "output", position = {-4, 0}} - }, - production_type = "output" - }, - { - - base_area = 1, - height = 2, - base_level = 1, - pipe_covers = pipecoverspictures(), - pipe_picture = grey_south_pipe_picture, - pipe_connections = - { - {type = "output", position = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "output", direction = defines.direction.north, position = {0, -3}}, }, production_type = "output" }, { - - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 4}}, + {flow_direction = "output", direction = defines.direction.west, position = {-3, 0}} + }, + production_type = "output" + }, + { + + volume = 200, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "output", direction = defines.direction.east, position = {3, 0}}, + }, + production_type = "output" + }, + { + + volume = 200, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "output", direction = defines.direction.south, position = {0, 3}}, }, production_type = "output" }, @@ -150,25 +145,4 @@ data:extend({ apparent_volume = 0.1, }, }, -}) - ---{ --- production_type = "input", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = -1, --- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, --- }, --- }, --- { --- production_type = "output", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, --- }, --- off_when_no_fluid_recipe = true \ No newline at end of file +}) \ No newline at end of file diff --git a/248k_2/prototypes/electronic/el_burner.lua b/248k_2/prototypes/electronic/el_burner.lua index 1beb225..9f63ea5 100644 --- a/248k_2/prototypes/electronic/el_burner.lua +++ b/248k_2/prototypes/electronic/el_burner.lua @@ -139,8 +139,8 @@ data:extend({ burns_fluid = true, fluid_usage_per_tick = 1, fluid_box = { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, filter = 'el_desulfurized_kerosene', pipe_covers = pipecoverspictures(), @@ -149,10 +149,10 @@ data:extend({ maximum_temperature = 40, production_type = 'input-output', pipe_connections = { - {type = "input-output", position = {2, 0}}, - {type = "input-output", position = {-2, 0}}, - {type = "input-output", position = {0, 2}}, - {type = "input-output", position = {0, -2}}, + {flow_direction = "input-output", direction = defines.direction.east, position = {1, 0}}, + {flow_direction = "input-output", direction = defines.direction.west, position = {-1, 0}}, + {flow_direction = "input-output", direction = defines.direction.south, position = {0, 1}}, + {flow_direction = "input-output", direction = defines.direction.north, position = {0, -1}}, }, }, fluid_input = { diff --git a/248k_2/prototypes/electronic/el_caster.lua b/248k_2/prototypes/electronic/el_caster.lua index d4c3fd1..776512b 100644 --- a/248k_2/prototypes/electronic/el_caster.lua +++ b/248k_2/prototypes/electronic/el_caster.lua @@ -59,55 +59,50 @@ data:extend({ energy_usage = '100kW', fluid_boxes = { { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -4}}, - }, - 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 = {-4, 0}} - }, - 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 = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, }, production_type = "input" }, { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, 4}}, + {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.east, position = {3, 0}}, + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.south, position = {0, 3}}, }, production_type = "input" }, @@ -144,25 +139,4 @@ data:extend({ apparent_volume = 0.1, }, }, -}) - ---{ --- production_type = "input", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = -1, --- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, --- }, --- }, --- { --- production_type = "output", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, --- }, --- off_when_no_fluid_recipe = true \ No newline at end of file +}) \ No newline at end of file diff --git a/248k_2/prototypes/electronic/el_charger.lua b/248k_2/prototypes/electronic/el_charger.lua index a7852e2..52d7999 100644 --- a/248k_2/prototypes/electronic/el_charger.lua +++ b/248k_2/prototypes/electronic/el_charger.lua @@ -27,7 +27,6 @@ data:extend({ --prototype { name = 'el_charger_entity', - --type = 'furnace', type = 'assembling-machine', icon = sprite('icon.png'), icon_size = 64, @@ -42,10 +41,7 @@ data:extend({ result = 'el_charger_item', }, crafting_categories = {'el_charger_category'}, - --result_inventory_size = 1, - --source_inventory_size = 1, crafting_speed = 1, - --fixed_recipe = 'el_water_pressure_recipe', energy_source = { type = 'electric', usage_priority = 'secondary-input', @@ -54,58 +50,53 @@ data:extend({ fluid_boxes = { { - base_area = 20, + volume = 4000, filter = 'water', - height = 2, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -4}}, + {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, }, production_type = "input" }, - { - - base_area = 20, - height = 2, + { + + volume = 4000, filter = 'fu_oxygen', base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {-4, 0}} - }, - production_type = "output" - }, - { - - base_area = 20, - height = 2, - filter = 'fu_hydrogen', - base_level = 1, - pipe_covers = pipecoverspictures(), - pipe_picture = grey_south_pipe_picture, - pipe_connections = - { - {type = "output", position = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "output", direction = defines.direction.west, position = {-3, 0}} }, production_type = "output" }, { - - base_area = 20, - height = 2, + + volume = 4000, filter = 'fu_hydrogen', base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 4}}, + {flow_direction = "output", direction = defines.direction.east, position = {3, 0}}, + }, + production_type = "output" + }, + { + + volume = 4000, + filter = 'fu_hydrogen', + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "output", direction = defines.direction.south, position = {0, 3}}, }, production_type = "output" }, @@ -149,25 +140,4 @@ data:extend({ apparent_volume = 0.1, }, }, -}) - ---{ --- production_type = "input", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = -1, --- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, --- }, --- }, --- { --- production_type = "output", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, --- }, --- off_when_no_fluid_recipe = true \ No newline at end of file +}) \ No newline at end of file diff --git a/248k_2/prototypes/electronic/el_grower.lua b/248k_2/prototypes/electronic/el_grower.lua index 90b1500..80591b5 100644 --- a/248k_2/prototypes/electronic/el_grower.lua +++ b/248k_2/prototypes/electronic/el_grower.lua @@ -59,51 +59,50 @@ data:extend({ energy_usage = '200kW', fluid_boxes = { { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "input", position = {0, -3}}, - }, - production_type = "input" - }, - { - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_picture = south_basic_pipe_picture, - pipe_connections = - { - {type = "input", position = {-3, 0}} - }, - production_type = "input" - }, - { - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_picture = south_basic_pipe_picture, - pipe_connections = - { - {type = "input", position = {3, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "input", direction = defines.direction.north, position = {0, -2}}, }, production_type = "input" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "input", position = {0, 3}}, + {flow_direction = "input", direction = defines.direction.west, position = {-2, 0}} + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = south_basic_pipe_picture, + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.east, position = {2, 0}}, + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = south_basic_pipe_picture, + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.south, position = {0, 2}}, }, production_type = "input" }, diff --git a/248k_2/prototypes/electronic/el_ki/el_ki_core.lua b/248k_2/prototypes/electronic/el_ki/el_ki_core.lua index cb7c09a..b8ca2fe 100644 --- a/248k_2/prototypes/electronic/el_ki/el_ki_core.lua +++ b/248k_2/prototypes/electronic/el_ki/el_ki_core.lua @@ -100,53 +100,53 @@ data:extend({ fluid_boxes = { { filter = 'el_ki_cpu_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, -3.5}}, + {flow_direction = "input", direction = defines.direction.north, position = {0.5, -2.5}}, }, production_type = "input" }, { filter = 'el_ki_cpu_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {-0.5, -3.5}}, + {flow_direction = "input", direction = defines.direction.north, position = {-0.5, -2.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, 3.5}}, + {flow_direction = "input", direction = defines.direction.south, position = {0.5, 2.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {-0.5, 3.5}}, + {flow_direction = "input", direction = defines.direction.south, position = {-0.5, 2.5}}, }, production_type = "input" }, @@ -243,79 +243,79 @@ data:extend({ fluid_boxes = { { filter = 'el_ki_cpu_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, -3.5}}, + {flow_direction = "input", direction = defines.direction.north, position = {0.5, -2.5}}, }, production_type = "input" }, { filter = 'el_ki_cpu_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {-0.5, -3.5}}, + {flow_direction = "input", direction = defines.direction.north, position = {-0.5, -2.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, 3.5}}, + {flow_direction = "input", direction = defines.direction.south, position = {0.5, 2.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {-0.5, 3.5}}, + {flow_direction = "input", direction = defines.direction.south, position = {-0.5, 2.5}}, }, production_type = "input" }, { filter = 'fi_ki_circuit_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {3.5, 0.5}}, + {flow_direction = "input", direction = defines.direction.east, position = {2.5, 0.5}}, }, production_type = "input" }, { filter = 'fi_ki_circuit_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {3.5, -0.5}}, + {flow_direction = "input", direction = defines.direction.east, position = {2.5, -0.5}}, }, production_type = "input" } @@ -412,105 +412,105 @@ data:extend({ fluid_boxes = { { filter = 'el_ki_cpu_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, -3.5}}, + {flow_direction = "input", direction = defines.direction.north, position = {0.5, -2.5}}, }, production_type = "input" }, { filter = 'el_ki_cpu_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {-0.5, -3.5}}, + {flow_direction = "input", direction = defines.direction.north, position = {-0.5, -2.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {0.5, 3.5}}, + {flow_direction = "input", direction = defines.direction.south, position = {0.5, 2.5}}, }, production_type = "input" }, { filter = 'el_ki_memory_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {-0.5, 3.5}}, + {flow_direction = "input", direction = defines.direction.south, position = {-0.5, 2.5}}, }, production_type = "input" }, { filter = 'fi_ki_circuit_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {3.5, 0.5}}, + {flow_direction = "input", direction = defines.direction.east, position = {2.5, 0.5}}, }, production_type = "input" }, { filter = 'fi_ki_circuit_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {3.5, -0.5}}, + {flow_direction = "input", direction = defines.direction.east, position = {2.5, -0.5}}, }, production_type = "input" }, { filter = 'fu_ki_circuit_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {-3.5, 0.5}}, + {flow_direction = "input", direction = defines.direction.west, position = {-2.5, 0.5}}, }, production_type = "input" }, { filter = 'fu_ki_circuit_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_long_north_pipe_picture, pipe_connections = { - {type = "input", position = {-3.5, -0.5}}, + {flow_direction = "input", direction = defines.direction.west, position = {-2.5, -0.5}}, }, production_type = "input" } diff --git a/248k_2/prototypes/electronic/el_ki/el_ki_cpu.lua b/248k_2/prototypes/electronic/el_ki/el_ki_cpu.lua index 5d99436..396c114 100644 --- a/248k_2/prototypes/electronic/el_ki/el_ki_cpu.lua +++ b/248k_2/prototypes/electronic/el_ki/el_ki_cpu.lua @@ -53,14 +53,14 @@ data:extend({ fluid_boxes = { { filter = 'el_ki_cpu_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 2}}, + {flow_direction = "output", direction = defines.direction.east, position = {0, 1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/electronic/el_ki/el_ki_memory.lua b/248k_2/prototypes/electronic/el_ki/el_ki_memory.lua index 5e12763..16e6c1f 100644 --- a/248k_2/prototypes/electronic/el_ki/el_ki_memory.lua +++ b/248k_2/prototypes/electronic/el_ki/el_ki_memory.lua @@ -53,14 +53,14 @@ data:extend({ fluid_boxes = { { filter = 'el_ki_memory_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 2}}, + {flow_direction = "output", direction = defines.direction.east, position = {0, 1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/electronic/el_ki/fi_ki_circuit.lua b/248k_2/prototypes/electronic/el_ki/fi_ki_circuit.lua index 81efbef..7eb95ff 100644 --- a/248k_2/prototypes/electronic/el_ki/fi_ki_circuit.lua +++ b/248k_2/prototypes/electronic/el_ki/fi_ki_circuit.lua @@ -53,14 +53,14 @@ data:extend({ fluid_boxes = { { filter = 'fi_ki_circuit_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 2}}, + {flow_direction = "output", direction = defines.direction.east, position = {0, 1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/electronic/el_ki/fu_ki_circuit.lua b/248k_2/prototypes/electronic/el_ki/fu_ki_circuit.lua index 59120eb..fdfe679 100644 --- a/248k_2/prototypes/electronic/el_ki/fu_ki_circuit.lua +++ b/248k_2/prototypes/electronic/el_ki/fu_ki_circuit.lua @@ -53,14 +53,14 @@ data:extend({ fluid_boxes = { { filter = 'fu_ki_circuit_fluid', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 2}}, + {flow_direction = "output", direction = defines.direction.east, position = {0, 1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/electronic/el_pressurizer.lua b/248k_2/prototypes/electronic/el_pressurizer.lua index b11bf97..a85555e 100644 --- a/248k_2/prototypes/electronic/el_pressurizer.lua +++ b/248k_2/prototypes/electronic/el_pressurizer.lua @@ -54,54 +54,53 @@ data:extend({ fluid_boxes = { { filter = 'water', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -2}}, + {flow_direction = "input", direction = defines.direction.north, position = {0, -1}}, }, production_type = "input" }, { filter = 'steam', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-2, 0}} + {flow_direction = "input", direction = defines.direction.west, position = {-1, 0}} }, production_type = "input" }, { filter = 'el_pressurized_water', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {2, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "output", direction = defines.direction.east, position = {1, 0}}, }, production_type = "output" }, { filter = 'water', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 2}}, + {flow_direction = "output", direction = defines.direction.south, position = {0, 1}}, }, production_type = "output" }, @@ -147,25 +146,4 @@ data:extend({ apparent_volume = 0.05, }, }, -}) - ---{ --- production_type = "input", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = -1, --- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, --- }, --- }, --- { --- production_type = "output", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, --- }, --- off_when_no_fluid_recipe = true \ No newline at end of file +}) \ No newline at end of file diff --git a/248k_2/prototypes/electronic/el_purifier.lua b/248k_2/prototypes/electronic/el_purifier.lua index 472e9a2..8d9b79e 100644 --- a/248k_2/prototypes/electronic/el_purifier.lua +++ b/248k_2/prototypes/electronic/el_purifier.lua @@ -60,54 +60,53 @@ data:extend({ fluid_boxes = { { filter = 'water', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -4}}, + {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, }, production_type = "input" }, { filter = 'water', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-4, 0}} + {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} }, production_type = "input" }, { filter = 'el_dirty_water', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "output", direction = defines.direction.east, position = {3, 0}}, }, production_type = "output" }, { filter = 'el_dirty_water', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 4}}, + {flow_direction = "output", direction = defines.direction.south, position = {0, 3}}, }, production_type = "output" }, @@ -144,25 +143,4 @@ data:extend({ apparent_volume = 0.1, }, }, -}) - ---{ --- production_type = "input", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = -1, --- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, --- }, --- }, --- { --- production_type = "output", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, --- }, --- off_when_no_fluid_recipe = true \ No newline at end of file +}) \ No newline at end of file diff --git a/248k_2/prototypes/electronic/el_tank.lua b/248k_2/prototypes/electronic/el_tank.lua index a7e7359..5e72e57 100644 --- a/248k_2/prototypes/electronic/el_tank.lua +++ b/248k_2/prototypes/electronic/el_tank.lua @@ -87,24 +87,23 @@ data:extend({ }, flow_length_in_ticks = 1, fluid_box = { - base_area = 5000, - height = 1, + volume = 500000, base_level = 0, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input-output", position = {-4, 1}}, - {type = "input-output", position = {-4, -1}}, + {flow_direction = "input-output", direction = defines.direction.west, position = {-3, 1}}, + {flow_direction = "input-output", direction = defines.direction.west, position = {-3, -1}}, - {type = "input-output", position = {4, 1}}, - {type = "input-output", position = {4, -1}}, + {flow_direction = "input-output", direction = defines.direction.east, position = {3, 1}}, + {flow_direction = "input-output", direction = defines.direction.east, position = {3, -1}}, - {type = "input-output", position = {1, 4}}, - {type = "input-output", position = {1, -4}}, + {flow_direction = "input-output", direction = defines.direction.south, position = {1, 3}}, + {flow_direction = "input-output", direction = defines.direction.south, position = {-1, 3}}, - {type = "input-output", position = {-1, 4}}, - {type = "input-output", position = {-1, -4}} + {flow_direction = "input-output", direction = defines.direction.north, position = {1, -3}}, + {flow_direction = "input-output", direction = defines.direction.north, position = {-1, -3}} }, production_type = "input-output" }, diff --git a/248k_2/prototypes/electronic/el_water_generator.lua b/248k_2/prototypes/electronic/el_water_generator.lua index 6df2577..83159f2 100644 --- a/248k_2/prototypes/electronic/el_water_generator.lua +++ b/248k_2/prototypes/electronic/el_water_generator.lua @@ -62,8 +62,8 @@ data:extend({ max_power_output = water_output(), effectivity = 0.9, fluid_box = { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, filter = 'el_pressurized_water', minimum_temperature = 0, @@ -72,8 +72,8 @@ data:extend({ pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "input-output", position = {2, 0}}, - {type = "input-output", position = {-2, 0}}, + {flow_direction = "input-output", direction = defines.direction.east, position = {1, 0}}, + {flow_direction = "input-output", direction = defines.direction.west, position = {-1, 0}}, }, }, fluid_input = { diff --git a/248k_2/prototypes/fission/fi_compound_machine.lua b/248k_2/prototypes/fission/fi_compound_machine.lua index d6ad533..d719c9e 100644 --- a/248k_2/prototypes/fission/fi_compound_machine.lua +++ b/248k_2/prototypes/fission/fi_compound_machine.lua @@ -58,55 +58,50 @@ data:extend({ energy_usage = '400kW', fluid_boxes = { { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -4}}, - }, - 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 = {-4, 0}} - }, - 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 = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, }, production_type = "input" }, { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, 4}}, + {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.east, position = {3, 0}}, + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.south, position = {0, 3}}, }, production_type = "input" }, @@ -143,25 +138,4 @@ data:extend({ apparent_volume = 0.3, }, }, -}) - ---{ --- production_type = "input", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = -1, --- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, --- }, --- }, --- { --- production_type = "output", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, --- }, --- off_when_no_fluid_recipe = true \ No newline at end of file +}) \ No newline at end of file diff --git a/248k_2/prototypes/fission/fi_refinery.lua b/248k_2/prototypes/fission/fi_refinery.lua index 4279076..ab2fdd3 100644 --- a/248k_2/prototypes/fission/fi_refinery.lua +++ b/248k_2/prototypes/fission/fi_refinery.lua @@ -60,101 +60,101 @@ data:extend({ fluid_boxes = { { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {1, 4}}, + {flow_direction = "input", direction = defines.direction.south, position = {1, 3}}, }, production_type = "input" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-1, 4}}, + {flow_direction = "input", direction = defines.direction.south, position = {-1, 3}}, }, production_type = "input" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {1, -4}}, + {flow_direction = "output", direction = defines.direction.north, position = {1, -3}}, }, production_type = "output" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {-1, -4}}, + {flow_direction = "output", direction = defines.direction.north, position = {-1, -3}}, }, production_type = "output" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-4, -1}}, + {flow_direction = "input", direction = defines.direction.west, position = {-3, -1}}, }, production_type = "input" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-4, 1}}, + {flow_direction = "input", direction = defines.direction.west, position = {-3, 1}}, }, production_type = "input" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {4, 1}}, + {flow_direction = "output", direction = defines.direction.east, position = {3, 1}}, }, production_type = "output" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {4, -1}}, + {flow_direction = "output", direction = defines.direction.east, position = {3, -1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_activator.lua b/248k_2/prototypes/fusion/fu_activator.lua index 51e3b00..d4a9e5a 100644 --- a/248k_2/prototypes/fusion/fu_activator.lua +++ b/248k_2/prototypes/fusion/fu_activator.lua @@ -58,51 +58,51 @@ data:extend({ }, --fluids fluid_boxes = { - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "input", position = {-2, 0}} + {flow_direction = "input", direction = defines.direction.west, position = {-1, 0}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 100, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "input", position = {0, 2}} + {flow_direction = "input", direction = defines.direction.south, position = {0, 1}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 100, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "output", position = {2, 0}}, + {flow_direction = "output", direction = defines.direction.east, position = {1, 0}}, }, production_type = "output" }, { - base_area = 1, - height = 2, + + volume = 100, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "output", position = {0, -2}}, + {flow_direction = "output", direction = defines.direction.north, position = {0, -1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_boiler.lua b/248k_2/prototypes/fusion/fu_boiler.lua index c637631..a48ce1e 100644 --- a/248k_2/prototypes/fusion/fu_boiler.lua +++ b/248k_2/prototypes/fusion/fu_boiler.lua @@ -66,37 +66,37 @@ data:extend({ fluid_boxes = { { filter = 'water', - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "input", position = {-2.5, -0.5}} + {flow_direction = "input", direction = defines.direction.west, position = {-1.5, -0.5}} }, production_type = "input" }, { filter = 'fu_hydrogen', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "output", position = {2.5, -0.5}}, + {flow_direction = "output", direction = defines.direction.east, position = {1.5, -0.5}}, }, production_type = "output" }, { filter = 'fu_oxygen', - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "output", position = {0.5, 2.5}}, + {flow_direction = "output", direction = defines.direction.south, position = {0.5, 1.5}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_burner.lua b/248k_2/prototypes/fusion/fu_burner.lua index 7f72af9..b1dbd48 100644 --- a/248k_2/prototypes/fusion/fu_burner.lua +++ b/248k_2/prototypes/fusion/fu_burner.lua @@ -60,27 +60,25 @@ data:extend({ energy_usage = '500kW', fluid_boxes = { { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, production_type = 'input', pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "input", position = {2, 0}}, - --{type = "output", position = {-2, 0}}, + {flow_direction = "input", direction = defines.direction.east, position = {1, 0}}, }, }, { - base_area = 1, - height = 2, + + volume = 200, base_level = 1, production_type = 'output', pipe_covers = pipecoverspictures(), pipe_picture = south_basic_pipe_picture, pipe_connections = { - {type = "output", position = {-2, 0}}, - --{type = "output", position = {-2, 0}}, + {flow_direction = "output", direction = defines.direction.west, position = {-1, 0}}, }, } }, diff --git a/248k_2/prototypes/fusion/fu_exchanger.lua b/248k_2/prototypes/fusion/fu_exchanger.lua index 114dda6..2cd95b9 100644 --- a/248k_2/prototypes/fusion/fu_exchanger.lua +++ b/248k_2/prototypes/fusion/fu_exchanger.lua @@ -56,51 +56,51 @@ data:extend({ }, --fluids fluid_boxes = { - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-2.5, -0.5}} + {flow_direction = "input", direction = defines.direction.west, position = {-1.5, -0.5}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-2.5, 1.5}} + {flow_direction = "input", direction = defines.direction.west, position = {-1.5, 1.5}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {2.5, -0.5}}, + {flow_direction = "output", direction = defines.direction.east, position = {1.5, -0.5}}, }, production_type = "output" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {2.5, 1.5}}, + {flow_direction = "output", direction = defines.direction.east, position = {1.5, 1.5}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_fusor.lua b/248k_2/prototypes/fusion/fu_fusor.lua index 7809fc8..92d57b4 100644 --- a/248k_2/prototypes/fusion/fu_fusor.lua +++ b/248k_2/prototypes/fusion/fu_fusor.lua @@ -68,24 +68,24 @@ data:extend({ --fluid fluid_boxes = { { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "input", position = {-1.5, -3}}, + {flow_direction = "input", direction = defines.direction.north, position = {-1.5, -2}}, }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "input", position = {1.5, -3}} + {flow_direction = "input", direction = defines.direction.north, position = {1.5, -2}} }, production_type = "input" }, diff --git a/248k_2/prototypes/fusion/fu_ingot.lua b/248k_2/prototypes/fusion/fu_ingot.lua index d8fc26f..3321259 100644 --- a/248k_2/prototypes/fusion/fu_ingot.lua +++ b/248k_2/prototypes/fusion/fu_ingot.lua @@ -59,55 +59,50 @@ data:extend({ }, fluid_boxes = { { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -4}}, - }, - 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 = {-4, 0}} - }, - 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 = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, }, production_type = "input" }, { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, 4}}, + {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.east, position = {3, 0}}, + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.south, position = {0, 3}}, }, production_type = "input" }, @@ -118,10 +113,8 @@ data:extend({ size = {512,512}, scale = 0.54, line_length = 1, - --lines_per_file = 2, frame_count = 1, - --animation_speed = 0.2, - shift = {0,-0.3} + shift = {0,-0.3} }, working_visualisations = { { @@ -159,8 +152,8 @@ data:extend({ -- base_area = 10, -- base_level = -1, -- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, +-- { flow_direction="input", direction = defines.direction.north, position = {-2, -2,5} }, +-- { flow_direction="input", direction = defines.direction.north, position = {2, -2.5} }, -- }, -- }, -- { @@ -169,6 +162,6 @@ data:extend({ --pipe_covers = pipecoverspictures(), -- base_area = 10, -- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, +-- pipe_connections = {{ flow_direction="output", direction = defines.direction.north, position = {2, 2.5} }}, -- }, -- off_when_no_fluid_recipe = true \ No newline at end of file diff --git a/248k_2/prototypes/fusion/fu_laser.lua b/248k_2/prototypes/fusion/fu_laser.lua index 4adcf87..6fb1aeb 100644 --- a/248k_2/prototypes/fusion/fu_laser.lua +++ b/248k_2/prototypes/fusion/fu_laser.lua @@ -59,55 +59,50 @@ data:extend({ energy_usage = '60MW', fluid_boxes = { { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -4}}, + {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, }, production_type = "input" }, - { - - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-4, 0}} + {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} }, production_type = "input" }, - { - - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "output", direction = defines.direction.east, position = {3, 0}}, }, production_type = "output" }, { - - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 4}}, + {flow_direction = "output", direction = defines.direction.south, position = {0, 3}}, }, production_type = "output" }, @@ -159,8 +154,8 @@ data:extend({ -- base_area = 10, -- base_level = -1, -- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, +-- { flow_direction="input", direction = defines.direction.north, position = {-2, -2,5} }, +-- { flow_direction="input", direction = defines.direction.north, position = {2, -2.5} }, -- }, -- }, -- { @@ -169,6 +164,6 @@ data:extend({ --pipe_covers = pipecoverspictures(), -- base_area = 10, -- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, +-- pipe_connections = {{ flow_direction="output", direction = defines.direction.north, position = {2, 2.5} }}, -- }, -- off_when_no_fluid_recipe = true \ No newline at end of file diff --git a/248k_2/prototypes/fusion/fu_magnet.lua b/248k_2/prototypes/fusion/fu_magnet.lua index 5931568..e262c6f 100644 --- a/248k_2/prototypes/fusion/fu_magnet.lua +++ b/248k_2/prototypes/fusion/fu_magnet.lua @@ -59,55 +59,50 @@ data:extend({ }, fluid_boxes = { { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -4}}, + {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, }, production_type = "input" }, - { - - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-4, 0}} + {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} }, production_type = "input" }, - { - - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "output", direction = defines.direction.east, position = {3, 0}}, }, production_type = "output" }, { - - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 4}}, + {flow_direction = "output", direction = defines.direction.south, position = {0, 3}}, }, production_type = "output" }, @@ -151,25 +146,4 @@ data:extend({ apparent_volume = 0.3, }, }, -}) - ---{ --- production_type = "input", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = -1, --- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, --- }, --- }, --- { --- production_type = "output", - --pipe_picture = assembler2pipepictures(), - --pipe_covers = pipecoverspictures(), --- base_area = 10, --- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, --- }, --- off_when_no_fluid_recipe = true \ No newline at end of file +}) \ No newline at end of file diff --git a/248k_2/prototypes/fusion/fu_plasma.lua b/248k_2/prototypes/fusion/fu_plasma.lua index c44f60c..7f9bf13 100644 --- a/248k_2/prototypes/fusion/fu_plasma.lua +++ b/248k_2/prototypes/fusion/fu_plasma.lua @@ -59,55 +59,50 @@ data:extend({ }, fluid_boxes = { { - - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {0, -4}}, + {flow_direction = "input", direction = defines.direction.north, position = {0, -3}}, }, production_type = "input" }, - { - - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-4, 0}} + {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}} }, production_type = "input" }, - { - - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {4, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "output", direction = defines.direction.east, position = {3, 0}}, }, production_type = "output" }, { - - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 4}}, + {flow_direction = "output", direction = defines.direction.south, position = {0, 3}}, }, production_type = "output" }, @@ -159,8 +154,8 @@ data:extend({ -- base_area = 10, -- base_level = -1, -- pipe_connections = { --- { type="input", position = {-2, -2,5} }, --- { type="input", position = {2, -2.5} }, +-- { flow_direction="input", direction = defines.direction.north, position = {-2, -2,5} }, +-- { flow_direction="input", direction = defines.direction.north, position = {2, -2.5} }, -- }, -- }, -- { @@ -169,6 +164,6 @@ data:extend({ --pipe_covers = pipecoverspictures(), -- base_area = 10, -- base_level = 1, --- pipe_connections = {{ type="output", position = {2, 2.5} }}, +-- pipe_connections = {{ flow_direction="output", direction = defines.direction.north, position = {2, 2.5} }}, -- }, -- off_when_no_fluid_recipe = true \ No newline at end of file diff --git a/248k_2/prototypes/fusion/fu_reactor.lua b/248k_2/prototypes/fusion/fu_reactor.lua index f00a6f4..46f01eb 100644 --- a/248k_2/prototypes/fusion/fu_reactor.lua +++ b/248k_2/prototypes/fusion/fu_reactor.lua @@ -62,51 +62,51 @@ data:extend({ fluid_boxes = { { filter = "fu_lead_fluid_cold", - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {2, 7}} + {flow_direction = "input", direction = defines.direction.south, position = {2, 6}} }, production_type = "input" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-2, -7}}, + {flow_direction = "input", direction = defines.direction.north, position = {-2, -6}}, }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {2, -7}} + {flow_direction = "input", direction = defines.direction.north, position = {2, -6}} }, production_type = "input" }, { filter = "fu_lead_fluid_hot", - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {-2, 7}} + {flow_direction = "output", direction = defines.direction.south, position = {-2, 6}} }, production_type = "output" } @@ -177,51 +177,51 @@ data:extend({ fluid_boxes = { { filter = "fu_lead_fluid_cold", - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {2, 7}} + {flow_direction = "input", direction = defines.direction.south, position = {2, 6}} }, production_type = "input" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-2, -7}}, + {flow_direction = "input", direction = defines.direction.north, position = {-2, -6}}, }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {2, -7}} + {flow_direction = "input", direction = defines.direction.north, position = {2, -6}} }, production_type = "input" }, { filter = "fu_lead_fluid_hot", - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {-2, 7}} + {flow_direction = "output", direction = defines.direction.south, position = {-2, 6}} }, production_type = "output" } diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_caster.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_caster.lua index 9c7bada..7726015 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_caster.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_caster.lua @@ -56,47 +56,47 @@ data:extend({ }, --fluids fluid_boxes = { - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "input", position = {-2.5, -0.5}} + {flow_direction = "input", direction = defines.direction.west, position = {-1.5, -0.5}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "input", position = {-2.5, 1.5}} + {flow_direction = "input", direction = defines.direction.west, position = {-1.5, 1.5}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "output", position = {2.5, -0.5}}, + {flow_direction = "output", direction = defines.direction.east, position = {1.5, -0.5}}, }, production_type = "output" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "output", position = {2.5, 1.5}}, + {flow_direction = "output", direction = defines.direction.east, position = {1.5, 1.5}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua index 4bad7bc..a34f91a 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua @@ -50,87 +50,87 @@ data:extend({ energy_usage = '0.5GW', --fluids fluid_boxes = { - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {-2, -9.5}} + {flow_direction = "input", direction = defines.direction.north, position = {-2, -8.5}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input", position = {2, -9.5}} + {flow_direction = "input", direction = defines.direction.north, position = {2, -8.5}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {0, 9.5}}, + {flow_direction = "output", direction = defines.direction.south, position = {0, 8.5}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {-2, 9.5}}, + {flow_direction = "output", direction = defines.direction.south, position = {-2, 8.5}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {2, 9.5}}, + {flow_direction = "output", direction = defines.direction.south, position = {2, 8.5}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {-4, 9.5}}, + {flow_direction = "output", direction = defines.direction.south, position = {-4, 8.5}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "output", position = {4, 9.5}}, + {flow_direction = "output", direction = defines.direction.south, position = {4, 8.5}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua index 70740f1..28aa229 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua @@ -50,80 +50,80 @@ data:extend({ energy_usage = '0.5GW', --fluids fluid_boxes = { - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {-2, 9.5}} + {flow_direction = "input", direction = defines.direction.south, position = {-2, 8.5}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {2, 9.5}} + {flow_direction = "input", direction = defines.direction.south, position = {2, 8.5}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {0, -9.5}}, + {flow_direction = "output", direction = defines.direction.north, position = {0, -8.5}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {-2, -9.5}}, + {flow_direction = "output", direction = defines.direction.north, position = {-2, -8.5}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {2, -9.5}}, + {flow_direction = "output", direction = defines.direction.north, position = {2, -8.5}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {-4, -9.5}}, + {flow_direction = "output", direction = defines.direction.north, position = {-4, -8.5}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {4, -9.5}}, + {flow_direction = "output", direction = defines.direction.north, position = {4, -8.5}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua index 5457bb2..7edd95d 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua @@ -52,87 +52,87 @@ data:extend({ fluid_boxes = { --in --right - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {-9, 3}} + {flow_direction = "input", direction = defines.direction.west, position = {-8, 3}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {-9, 1}} + {flow_direction = "input", direction = defines.direction.west, position = {-8, 1}} }, production_type = "input" }, --left - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {9, 3}} + {flow_direction = "input", direction = defines.direction.east, position = {8, 3}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {9, 1}} + {flow_direction = "input", direction = defines.direction.east, position = {8, 1}} }, production_type = "input" }, --out --up - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {-2, -5}}, + {flow_direction = "output", direction = defines.direction.north, position = {-2, -4}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {2, -5}}, + {flow_direction = "output", direction = defines.direction.north, position = {2, -4}}, }, production_type = "output" }, --down - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {-2, 9}}, + {flow_direction = "output", direction = defines.direction.south, position = {-2, 8}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {2, 9}}, + {flow_direction = "output", direction = defines.direction.south, position = {2, 8}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua index 71ce05d..b1d1164 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua @@ -50,58 +50,58 @@ data:extend({ energy_usage = '0.7GW', --fluids fluid_boxes = { - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {9, 0}} + {flow_direction = "input", direction = defines.direction.east, position = {8, 0}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {9, 2}} + {flow_direction = "input", direction = defines.direction.east, position = {8, 2}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {9, -2}} + {flow_direction = "input", direction = defines.direction.east, position = {8, -2}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {-11, -1}}, + {flow_direction = "output", direction = defines.direction.west, position = {-10, -1}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {-11, 1}}, + {flow_direction = "output", direction = defines.direction.west, position = {-10, 1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua index f88c104..a55265b 100644 --- a/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua +++ b/248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua @@ -50,58 +50,58 @@ data:extend({ energy_usage = '0.7GW', --fluids fluid_boxes = { - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {-9, 0}} + {flow_direction = "input", direction = defines.direction.west, position = {-8, 0}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {-9, 2}} + {flow_direction = "input", direction = defines.direction.west, position = {-8, 2}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = -1, pipe_connections = { - {type = "input", position = {-9, -2}} + {flow_direction = "input", direction = defines.direction.west, position = {-8, -2}} }, production_type = "input" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {11, -1}}, + {flow_direction = "output", direction = defines.direction.east, position = {10, -1}}, }, production_type = "output" }, - { - base_area = 1, - height = 2, + { + + volume = 200, base_level = 1, pipe_connections = { - {type = "output", position = {11, 1}}, + {flow_direction = "output", direction = defines.direction.east, position = {10, 1}}, }, production_type = "output" }, diff --git a/248k_2/prototypes/fusion/fu_turbine.lua b/248k_2/prototypes/fusion/fu_turbine.lua index 22b9664..526f8f7 100644 --- a/248k_2/prototypes/fusion/fu_turbine.lua +++ b/248k_2/prototypes/fusion/fu_turbine.lua @@ -50,17 +50,17 @@ data:extend({ max_power_output = "200MW", fluid_box = { filter = "fu_hot_steam", - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_picture = grey_south_pipe_picture, pipe_connections = { - {type = "input-output", position = {-4, 0}}, - {type = "input-output", position = {4, 0}}, - {type = "input-output", position = {0, 4}}, - {type = "input-output", position = {0, -4}} + {flow_direction = "input-output", direction = defines.direction.west, position = {-3, 0}}, + {flow_direction = "input-output", direction = defines.direction.east, position = {3, 0}}, + {flow_direction = "input-output", direction = defines.direction.south, position = {0, 3}}, + {flow_direction = "input-output", direction = defines.direction.north, position = {0, -3}} }, production_type = "input-output" }, diff --git a/248k_2/prototypes/gravitation/gr_cooker.lua b/248k_2/prototypes/gravitation/gr_cooker.lua index 7a3814e..880ee06 100644 --- a/248k_2/prototypes/gravitation/gr_cooker.lua +++ b/248k_2/prototypes/gravitation/gr_cooker.lua @@ -52,47 +52,46 @@ data:extend({ energy_usage = '4MW', fluid_boxes = { { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "input", position = {0, -3}}, - }, - production_type = "input" - }, - { - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_connections = - { - {type = "input", position = {-3, 0}} - }, - production_type = "input" - }, - { - base_area = 1, - height = 2, - base_level = -1, - pipe_covers = pipecoverspictures(), - pipe_connections = - { - {type = "input", position = {3, 0}}, - --{type = "output", position = {2, -2.5}} + {flow_direction = "input", direction = defines.direction.north, position = {0, -2}}, }, production_type = "input" }, { - base_area = 1, - height = 2, + + volume = 200, base_level = -1, pipe_covers = pipecoverspictures(), pipe_connections = { - {type = "input", position = {0, 3}}, + {flow_direction = "input", direction = defines.direction.west, position = {-2, 0}} + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.east, position = {2, 0}}, + }, + production_type = "input" + }, + { + + volume = 200, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {flow_direction = "input", direction = defines.direction.south, position = {0, 2}}, }, production_type = "input" },