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

4
prototypes/fusion/fu_activator.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 = {-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}},

6
prototypes/fusion/fu_exchanger.lua
View file

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

8
prototypes/fusion/fu_laser.lua
View file

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

12
prototypes/fusion/fu_magnet.lua
View file

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

8
prototypes/fusion/fu_plasma.lua
View file

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

178
prototypes/fusion/fu_reactor.lua
View file

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

27
prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua
View file

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

2
prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua
View file

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

2
prototypes/fusion/fu_star_engine/fu_star_engine_core.lua
View file

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

2
prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua
View file

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

2
prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua
View file

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