Compare commits

..

2 commits

Author SHA1 Message Date
Simon Brodtmann
5aca7f8a9d Correctly use audible_distance_modifier 2025-12-16 14:17:22 +01:00
Simon Brodtmann
c4b5dc7730 Integrate quality assembler code into this mod 2025-12-16 14:17:06 +01:00
2 changed files with 37 additions and 15 deletions

View file

@ -175,14 +175,14 @@ data:extend({
max_sounds_per_type = 2, max_sounds_per_type = 2,
sound = { filename = "__space-age__/sound/entity/foundry/foundry.ogg", volume = 0.6 }, sound = { filename = "__space-age__/sound/entity/foundry/foundry.ogg", volume = 0.6 },
sound_accents = { sound_accents = {
{ sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-saw-1.ogg", volume = 0.8 }, frame = 26, audible_distance_modifier = 0.5 }, { sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-saw-1.ogg", volume = 0.8, audible_distance_modifier = 0.5 }, frame = 26 },
{ sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-fall.ogg", volume = 1.2 }, frame = 42, audible_distance_modifier = 0.5 }, { sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-fall.ogg", volume = 1.2, audible_distance_modifier = 0.5 }, frame = 42 },
{ sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-saw-2.ogg", volume = 0.8 }, frame = 53, audible_distance_modifier = 0.4 }, { sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-saw-2.ogg", volume = 0.8, audible_distance_modifier = 0.4 }, frame = 53 },
{ sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-split.ogg", volume = 0.4 }, frame = 62, audible_distance_modifier = 0.3 }, { sound = { filename = Lignumis.sound .. "entity/lumber-mill/lumber-mill-split.ogg", volume = 0.4, audible_distance_modifier = 0.3 }, frame = 62 },
{ sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5) }, frame = 14, audible_distance_modifier = 0.3 }, { sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5), audible_distance_modifier = 0.3 }, frame = 14 },
{ sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5) }, frame = 34, audible_distance_modifier = 0.3 }, { sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5), audible_distance_modifier = 0.3 }, frame = 34 },
{ sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5) }, frame = 54, audible_distance_modifier = 0.3 }, { sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5), audible_distance_modifier = 0.3 }, frame = 54 },
{ sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5) }, frame = 74, audible_distance_modifier = 0.3 }, { sound = { variations = sound_variations(Lignumis.sound .. "entity/lumber-mill/lumber-mill-plank", 3, 0.5), audible_distance_modifier = 0.3 }, frame = 74 },
} }
} }
}, },

View file

@ -3,6 +3,7 @@ local item_sounds = require("__base__.prototypes.item_sounds")
local sounds = require("__base__.prototypes.entity.sounds") local sounds = require("__base__.prototypes.entity.sounds")
local Entity = require("__cf-lib__/data/Entity") local Entity = require("__cf-lib__/data/Entity")
local Technology = require("__cf-lib__/data/Technology") local Technology = require("__cf-lib__/data/Technology")
local machinepipes = require("prototypes/content/gold/machinepipes")
local function assemblerpipepicturesfrozen() local function assemblerpipepicturesfrozen()
return { return {
@ -229,7 +230,7 @@ data:extend({
fluid_boxes = { fluid_boxes = {
{ {
production_type = "input", production_type = "input",
pipe_picture = assembler2pipepictures(), pipe_picture = machinepipes(),
pipe_picture_frozen = assemblerpipepicturesfrozen(), pipe_picture_frozen = assemblerpipepicturesfrozen(),
pipe_covers = pipecoverspictures(), pipe_covers = pipecoverspictures(),
volume = 200, volume = 200,
@ -238,7 +239,7 @@ data:extend({
}, },
{ {
production_type = "input", production_type = "input",
pipe_picture = assembler2pipepictures(), pipe_picture = machinepipes(),
pipe_picture_frozen = assemblerpipepicturesfrozen(), pipe_picture_frozen = assemblerpipepicturesfrozen(),
pipe_covers = pipecoverspictures(), pipe_covers = pipecoverspictures(),
volume = 200, volume = 200,
@ -247,7 +248,7 @@ data:extend({
}, },
{ {
production_type = "output", production_type = "output",
pipe_picture = assembler2pipepictures(), pipe_picture = machinepipes(),
pipe_picture_frozen = assemblerpipepicturesfrozen(), pipe_picture_frozen = assemblerpipepicturesfrozen(),
pipe_covers = pipecoverspictures(), pipe_covers = pipecoverspictures(),
volume = 100, volume = 100,
@ -256,7 +257,7 @@ data:extend({
}, },
{ {
production_type = "output", production_type = "output",
pipe_picture = assembler2pipepictures(), pipe_picture = machinepipes(),
pipe_picture_frozen = assemblerpipepicturesfrozen(), pipe_picture_frozen = assemblerpipepicturesfrozen(),
pipe_covers = pipecoverspictures(), pipe_covers = pipecoverspictures(),
volume = 100, volume = 100,
@ -273,24 +274,45 @@ data:extend({
max_sounds_per_type = 2, max_sounds_per_type = 2,
main_sounds = { main_sounds = {
{ {
sound = { filename = Lignumis.sound .. "entity/quality-assembler/quality-assembler-working-loop.ogg", volume = 0.6 }, sound = { filename = Lignumis.sound .. "entity/quality-assembler/quality-assembler-working-loop.ogg", volume = 0.6, audible_distance_modifier = 0.8 },
probability = 1.0 probability = 1.0
}, },
{ {
sound = { sound = {
filename = Lignumis.sound .. "entity/quality-assembler/quality-assembler-ai.ogg", filename = Lignumis.sound .. "entity/quality-assembler/quality-assembler-ai.ogg",
volume = 0.5, volume = 0.5,
audible_distance_modifier = 0.2, audible_distance_modifier = 0.4,
advanced_volume_control = { advanced_volume_control = {
attenuation = "exponential", attenuation = "exponential",
fades = { fade_in = { curve_type = "linear", from = { control = 0.75, volume_percentage = 0.0 }, to = { 1.5, 100.0 } } } fades = { fade_in = { curve_type = "linear", from = { control = 0.75, volume_percentage = 0.0 }, to = { 1.5, 100.0 } } }
} }
}, },
probability = 1 / (7 * 60) probability = 1 / (7 * 60)
},
{
sound = {
filename = Lignumis.sound .. "entity/quality-assembler/quality-assembler-ai-long.ogg",
volume = 0.3,
audible_distance_modifier = 0.2,
advanced_volume_control = {
attenuation = "exponential",
fades = { fade_in = { curve_type = "linear", from = { control = 0.75, volume_percentage = 0.0 }, to = { 1.5, 100.0 } } }
}
}
} }
}, },
sound_accents = { sound_accents = {
{ sound = { filename = Lignumis.sound .. "entity/quality-assembler/quality-assembler-welding.ogg", min_volume = 0.6, max_volume = 1.0 }, frame = 12, audible_distance_modifier = 0.8 } { sound = { filename = Lignumis.sound .. "entity/quality-assembler/quality-assembler-welding.ogg", min_volume = 0.6, max_volume = 1.0, audible_distance_modifier = 0.8 }, frame = 12 },
{ sound = {
filename = Lignumis.sound .. "entity/quality-assembler/quality-assembler-click.ogg",
min_volume = 0.3,
max_volume = 0.6,
advanced_volume_control = {
attenuation = "exponential",
fades = { fade_in = { curve_type = "linear", from = { control = 0.75, volume_percentage = 0.0 }, to = { 1.5, 100.0 } } }
},
audible_distance_modifier = 0.2
}, frame = 48 }
} }
} }
}, },