Update to 2.0

This commit is contained in:
Simon Brodtmann 2025-10-04 21:42:12 +02:00
parent 98ea14df52
commit c2b65301fb
21 changed files with 349 additions and 665 deletions

View file

@ -15,82 +15,48 @@ gf_boiler_entity.fast_replaceable_group = "boiler"
gf_boiler_entity.energy_source = {
type = "fluid",
fluid_box = {
base_area = 1,
height = 1,
base_level = -1,
volume = 100,
pipe_covers = pipecoverspictures(),
pipe_picture = {
north = {
filename = gd.."/graphics/entity/"
.."assembling-machine-1-pipe-N.png",
priority = "extra-high",
width = 35,
height = 18,
shift = util.by_pixel(2.5, 14),
hr_version = {
filename = gd.."/graphics/entity/"
.."hr-assembling-machine-1-pipe-N.png",
priority = "extra-high",
width = 71,
height = 38,
shift = util.by_pixel(2.25, 13.5),
scale = 0.5
}
filename = gd.."/graphics/entity/"
.."hr-assembling-machine-1-pipe-N.png",
priority = "extra-high",
width = 71,
height = 38,
shift = util.by_pixel(2.25, 13.5),
scale = 0.5
},
east = {
filename = gd.."/graphics/entity/"
.."assembling-machine-1-pipe-E.png",
priority = "extra-high",
width = 20,
height = 38,
shift = util.by_pixel(-25, 1),
hr_version = {
filename = gd.."/graphics/entity/"
.."hr-assembling-machine-1-pipe-E.png",
priority = "extra-high",
width = 42,
height = 76,
shift = util.by_pixel(-24.5, 1),
scale = 0.5
}
filename = gd.."/graphics/entity/"
.."hr-assembling-machine-1-pipe-E.png",
priority = "extra-high",
width = 42,
height = 76,
shift = util.by_pixel(-24.5, 1),
scale = 0.5
},
south = {
filename = gd.."/graphics/entity/"
.."assembling-machine-1-pipe-S.png",
priority = "extra-high",
width = 44,
height = 31,
shift = util.by_pixel(0, -31.5),
hr_version = {
filename = gd.."/graphics/entity/"
.."hr-assembling-machine-1-pipe-S.png",
priority = "extra-high",
width = 88,
height = 61,
shift = util.by_pixel(0, -31.25),
scale = 0.5
}
filename = gd.."/graphics/entity/"
.."hr-assembling-machine-1-pipe-S.png",
priority = "extra-high",
width = 88,
height = 61,
shift = util.by_pixel(0, -31.25),
scale = 0.5
},
west = {
filename = gd.."/graphics/entity/"
.."assembling-machine-1-pipe-W.png",
priority = "extra-high",
width = 19,
height = 37,
shift = util.by_pixel(25.5, 1.5),
hr_version = {
filename = gd.."/graphics/entity/"
.."hr-assembling-machine-1-pipe-W.png",
priority = "extra-high",
width = 39,
height = 73,
shift = util.by_pixel(25.75, 1.25),
scale = 0.5
}
filename = gd.."/graphics/entity/"
.."hr-assembling-machine-1-pipe-W.png",
priority = "extra-high",
width = 39,
height = 73,
shift = util.by_pixel(25.75, 1.25),
scale = 0.5
}
},
pipe_connections = {
{type = "input", position = {0, 1.5}},
{direction = defines.direction.south, flow_direction = "input", position = {0, 0.5}},
},
production_type = "input",
secondary_draw_orders = {
@ -102,7 +68,7 @@ gf_boiler_entity.energy_source = {
},
burns_fluid = true,
scale_fluid_usage = true,
emissions_per_minute = 30,
emissions_per_minute = { pollution = 30 },
smoke = {{
name = "smoke",
north_position = util.by_pixel(-38, -47.5),
@ -121,43 +87,34 @@ gf_boiler_entity.energy_source = {
}
gf_boiler_entity.fire_flicker_enabled = false
gf_boiler_entity.fire_glow_flicker_enabled = false
gf_boiler_entity.fire = {}
gf_boiler_entity.fire_glow.north.filename =
gd.."/graphics/entity/"..
"gas-boiler-N-light.png"
gf_boiler_entity.fire_glow.south.filename =
gd.."/graphics/entity/"..
"gas-boiler-S-light.png"
gf_boiler_entity.fire_glow.east.filename =
gd.."/graphics/entity/"..
"gas-boiler-E-light.png"
gf_boiler_entity.fire_glow.west.filename =
gd.."/graphics/entity/"..
"gas-boiler-W-light.png"
gf_boiler_entity.fire_glow.north.hr_version.filename =
gf_boiler_entity.pictures.north.fire = nil
gf_boiler_entity.pictures.south.fire = nil
gf_boiler_entity.pictures.east.fire = nil
gf_boiler_entity.pictures.west.fire = nil
gf_boiler_entity.pictures.north.fire_glow.filename =
gd.."/graphics/entity/"..
"hr-gas-boiler-N-light.png"
gf_boiler_entity.fire_glow.south.hr_version.filename =
gf_boiler_entity.pictures.south.fire_glow.filename =
gd.."/graphics/entity/"..
"hr-gas-boiler-S-light.png"
gf_boiler_entity.fire_glow.east.hr_version.filename =
gf_boiler_entity.pictures.east.fire_glow.filename =
gd.."/graphics/entity/"..
"hr-gas-boiler-E-light.png"
gf_boiler_entity.fire_glow.west.hr_version.filename =
gf_boiler_entity.pictures.west.fire_glow.filename =
gd.."/graphics/entity/"..
"hr-gas-boiler-W-light.png"
gf_boiler_entity.fire_glow.north.apply_runtime_tint = true
gf_boiler_entity.fire_glow.south.apply_runtime_tint = true
gf_boiler_entity.fire_glow.east.apply_runtime_tint = true
gf_boiler_entity.fire_glow.west.apply_runtime_tint = true
gf_boiler_entity.fire_glow.north.tint={r=1,g=0.6,b=0.6,a=0.4}
gf_boiler_entity.fire_glow.south.tint={r=1,g=0.6,b=0.6,a=0.4}
gf_boiler_entity.fire_glow.east.tint={r=1,g=0.6,b=0.6,a=0.4}
gf_boiler_entity.fire_glow.west.tint={r=1,g=0.6,b=0.6,a=0.4}
gf_boiler_entity.fire_glow.north.blend_mode = "additive-soft"
gf_boiler_entity.fire_glow.south.blend_mode = "additive-soft"
gf_boiler_entity.fire_glow.east.blend_mode = "additive-soft"
gf_boiler_entity.fire_glow.west.blend_mode = "additive-soft"
gf_boiler_entity.pictures.north.fire_glow.apply_runtime_tint = true
gf_boiler_entity.pictures.south.fire_glow.apply_runtime_tint = true
gf_boiler_entity.pictures.east.fire_glow.apply_runtime_tint = true
gf_boiler_entity.pictures.west.fire_glow.apply_runtime_tint = true
gf_boiler_entity.pictures.north.fire_glow.tint={r=1,g=0.6,b=0.6,a=0.4}
gf_boiler_entity.pictures.south.fire_glow.tint={r=1,g=0.6,b=0.6,a=0.4}
gf_boiler_entity.pictures.east.fire_glow.tint={r=1,g=0.6,b=0.6,a=0.4}
gf_boiler_entity.pictures.west.fire_glow.tint={r=1,g=0.6,b=0.6,a=0.4}
gf_boiler_entity.pictures.north.fire_glow.blend_mode = "additive-soft"
gf_boiler_entity.pictures.south.fire_glow.blend_mode = "additive-soft"
gf_boiler_entity.pictures.east.fire_glow.blend_mode = "additive-soft"
gf_boiler_entity.pictures.west.fire_glow.blend_mode = "additive-soft"
gf_boiler_item = util.table.deepcopy(data.raw.item.boiler)
@ -171,12 +128,10 @@ gf_boiler_recipe = {
type = "recipe",
name = "gas-boiler",
enabled = false,
ingredients = {{
"boiler",1
},{
"pump",1
}},
result = "gas-boiler"
ingredients = {
{ type = "item", name = "boiler", amount = 1 },
{ type = "item", name = "pump", amount = 1 }},
results = {{ type = "item", name = "gas-boiler", amount = 1 }}
}
data:extend({

View file

@ -1700,9 +1700,6 @@ end
set_shift = function(shift, tab)
tab.shift = shift
if tab.hr_version then
tab.hr_version.shift = shift
end
return tab
end
@ -1729,16 +1726,10 @@ end
empty_sprite = function()
return {
filename = "__core__/graphics/empty.png",
priority = "extra-high",
width = 1,
height = 1,
hr_version = {
filename = "__core__/graphics/empty.png",
priority = "extra-high",
width = 1,
height = 1,
}
filename = "__core__/graphics/empty.png",
priority = "extra-high",
width = 1,
height = 1,
}
end
@ -1750,209 +1741,104 @@ centrifuge_idle_layers = function(size,speed)
local size = number_or_one(size)
local speed = number_or_one(speed)
return {{
filename =
"__base__/graphics/entity/"
.."centrifuge/centrifuge-C.png",
priority = "extra-high",
line_length = 8,
width = 119,
height = 107,
scale = size,
frame_count = 64,
animation_speed = speed,
shift =
util.by_pixel(
-0.5,
-26.5
),
hr_version = {
filename =
"__base__/graphics/entity/"
.."centrifuge/hr-centrifuge-C.png",
priority = "extra-high",
scale = size*0.5,
line_length = 8,
width = 237,
height = 214,
frame_count = 64,
animation_speed = speed,
shift =
util.by_pixel(
-0.25,
-26.5
)
}
filename =
"__base__/graphics/entity/"
.."centrifuge/hr-centrifuge-C.png",
priority = "extra-high",
scale = size*0.5,
line_length = 8,
width = 237,
height = 214,
frame_count = 64,
animation_speed = speed,
shift =
util.by_pixel(
-0.25,
-26.5
)
},{
filename =
"__base__/graphics/entity/"
.."centrifuge/centrifuge-C-shadow.png",
draw_as_shadow = true,
priority = "extra-high",
line_length = 8,
width = 132,
height = 74,
frame_count = 64,
scale = size,
animation_speed = speed,
shift =
util.by_pixel(
20,
-10
),
hr_version = {
filename =
"__base__/graphics/entity/"
.."centrifuge/hr-centrifuge-C-shadow.png",
draw_as_shadow = true,
priority = "extra-high",
scale = size*0.5,
line_length = 8,
width = 279,
height = 152,
frame_count = 64,
animation_speed = speed,
shift =
util.by_pixel(
16.75,
-10
)
}
filename =
"__base__/graphics/entity/"
.."centrifuge/hr-centrifuge-C-shadow.png",
draw_as_shadow = true,
priority = "extra-high",
scale = size*0.5,
line_length = 8,
width = 279,
height = 152,
frame_count = 64,
animation_speed = speed,
shift =
util.by_pixel(
16.75,
-10
)
},{
filename =
"__base__/graphics/entity/"
.."centrifuge/centrifuge-B.png",
priority = "extra-high",
line_length = 8,
width = 78,
height = 117,
scale = size,
frame_count = 64,
animation_speed = speed,
shift =
util.by_pixel(
23,
6.5
),
hr_version = {
filename =
"__base__/graphics/entity/"
.."centrifuge/hr-centrifuge-B.png",
priority = "extra-high",
scale = size*0.5,
line_length = 8,
width = 156,
height = 234,
frame_count = 64,
animation_speed = speed,
shift =
util.by_pixel(
23,
6.5
)
}
filename =
"__base__/graphics/entity/"
.."centrifuge/hr-centrifuge-B.png",
priority = "extra-high",
scale = size*0.5,
line_length = 8,
width = 156,
height = 234,
frame_count = 64,
animation_speed = speed,
shift =
util.by_pixel(
23,
6.5
)
},{
filename =
"__base__/graphics/entity/"
.."centrifuge/centrifuge-B-shadow.png",
draw_as_shadow = true,
priority = "extra-high",
line_length = 8,
width = 124,
height = 74,
frame_count = 64,
scale = size,
animation_speed = speed,
shift =
util.by_pixel(
63,
16
),
hr_version = {
filename =
"__base__/graphics/entity/"
.."centrifuge/hr-centrifuge-B-shadow.png",
draw_as_shadow = true,
priority = "extra-high",
scale = size*0.5,
line_length = 8,
width = 251,
height = 149,
frame_count = 64,
animation_speed = speed,
shift =
util.by_pixel(
63.25,
15.25
)
}
filename =
"__base__/graphics/entity/"
.."centrifuge/hr-centrifuge-B-shadow.png",
draw_as_shadow = true,
priority = "extra-high",
scale = size*0.5,
line_length = 8,
width = 251,
height = 149,
frame_count = 64,
animation_speed = speed,
shift =
util.by_pixel(
63.25,
15.25
)
},{
filename =
"__base__/graphics/entity/"
.."centrifuge/centrifuge-A.png",
priority = "extra-high",
line_length = 8,
width = 70,
height = 123,
scale = size,
frame_count = 64,
animation_speed = speed,
shift =
util.by_pixel(
-26,
3.5
),
hr_version = {
filename =
"__base__/graphics/entity/"
.."centrifuge/hr-centrifuge-A.png",
priority = "extra-high",
scale = size*0.5,
line_length = 8,
width = 139,
height = 246,
frame_count = 64,
animation_speed = speed,
shift =
util.by_pixel(
-26.25,
3.5
)
}
filename =
"__base__/graphics/entity/"
.."centrifuge/hr-centrifuge-A.png",
priority = "extra-high",
scale = size*0.5,
line_length = 8,
width = 139,
height = 246,
frame_count = 64,
animation_speed = speed,
shift =
util.by_pixel(
-26.25,
3.5
)
},{
filename =
"__base__/graphics/entity/"
.."centrifuge/centrifuge-A-shadow.png",
priority = "extra-high",
draw_as_shadow = true,
line_length = 8,
width = 108,
height = 54,
frame_count = 64,
scale = size,
animation_speed = speed,
shift =
util.by_pixel(
6,
27
),
hr_version = {
filename =
"__base__/graphics/entity/"
.."centrifuge/hr-centrifuge-A-shadow.png",
priority = "extra-high",
draw_as_shadow = true,
scale = size*0.5,
line_length = 8,
width = 230,
height = 124,
frame_count = 64,
animation_speed = speed,
shift =
util.by_pixel(
8.5,
23.5
)
}
filename =
"__base__/graphics/entity/"
.."centrifuge/hr-centrifuge-A-shadow.png",
priority = "extra-high",
draw_as_shadow = true,
scale = size*0.5,
line_length = 8,
width = 230,
height = 124,
frame_count = 64,
animation_speed = speed,
shift =
util.by_pixel(
8.5,
23.5
)
}}
end