cacklingfiend/248k_2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed squeak trhough + adjusted fluid boxes

Browse source
This commit is contained in:
PreLeyZero 2022-04-05 23:58:49 +02:00
parent 6a2de84406
commit 547c712efb
30 changed files with 386 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

6
prototypes/electronic/el_arc_furnace.lua
View file

@ -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 = {
{

12
prototypes/electronic/el_caster.lua
View file

@ -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 =

4
prototypes/electronic/el_grower.lua
View file

@ -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}},

154
prototypes/electronic/el_ki/el_ki_core.lua
View file

@ -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"
}

1
prototypes/electronic/el_ki/el_ki_cpu.lua
View file

@ -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}},

1
prototypes/electronic/el_ki/el_ki_memory.lua
View file

@ -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}},

1
prototypes/electronic/el_ki/fi_ki_circuit.lua
View file

@ -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}},

1
prototypes/electronic/el_ki/fu_ki_circuit.lua
View file

@ -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}},

4
prototypes/electronic/el_pressurizer.lua
View file

@ -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}},

12
prototypes/electronic/el_purifier.lua
View file

@ -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 =

2
prototypes/electronic/el_tank.lua
View file

@ -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 = {

11
prototypes/electronic/el_water_generator.lua
View file

@ -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,
},
},
})
})