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

Fix sounds

Browse source
This commit is contained in:
Simon Brodtmann 2025-07-05 15:29:06 +02:00
parent e66cb49c77
commit 2c078c66fd
6 changed files with 13 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Bio_Industries_2/prototypes/Bio_Farm/entities.lua
View file

@ -9,18 +9,6 @@ local ENTITYPATH = BioInd.modRoot .. "/graphics/entities/biofarm/"
require ("prototypes.Bio_Farm.pipeConnectors")
require ("util")
-- demo-sounds has been removed in Factorio 1.1, so we need to check the game version!
local sound_def = BioInd.check_version("base", "<", "1.1.0") and
require("__base__.prototypes.entity.demo-sounds") or
require("__base__.prototypes.entity.sounds")
local sounds = {}
sounds.car_wood_impact = sound_def.car_wood_impact(0.8)
sounds.generic_impact = sound_def.generic_impact
for _, sound in ipairs(sounds.generic_impact) do
sound.volume = 0.65
end
inv_extension2 = {
filename = ENTITYPATH .. "Bio_Farm_Idle_alt.png",
priority = "high",
@ -64,7 +52,7 @@ data:extend({
collision_box = {{-0.1, -0.1}, {0.1, 0.1}},
selection_box = {{-0.5, -0.5}, {0.5, 0.5}},
subgroup = "trees",
vehicle_impact_sound = sounds.car_wood_impact,
impact_category = "wood",
picture = {
filename = ICONPATH .. "Seedling_b.png",
priority = "extra-high",
@ -106,7 +94,7 @@ data:extend({
collision_box = {{-0.1, -0.1}, {0.1, 0.1}},
selection_box = {{-0.5, -0.5}, {0.5, 0.5}},
subgroup = "trees",
vehicle_impact_sound = sounds.car_wood_impact,
impact_category = "wood",
picture = {
filename = ICONPATH .. "Seedling_b.png",
priority = "extra-high",
@ -147,7 +135,7 @@ data:extend({
collision_box = {{-0.1, -0.1}, {0.1, 0.1}},
selection_box = {{-0.5, -0.5}, {0.5, 0.5}},
subgroup = "trees",
vehicle_impact_sound = sounds.car_wood_impact,
impact_category = "wood",
picture = {
filename = ICONPATH .. "Seedling_b.png",
priority = "extra-high",
@ -231,7 +219,6 @@ data:extend({
ingredient_count = 3,
open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
vehicle_impact_sound = sounds.generic_impact,
module_specification = {
module_slots = 3
},
@ -497,8 +484,7 @@ data:extend({
}
},
open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
vehicle_impact_sound = sounds.generic_impact,
close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }
},
-- COKERY
@ -1028,7 +1014,6 @@ data:extend({
ingredient_count = 3,
open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
vehicle_impact_sound = sounds.generic_impact,
module_specification = {},
},
})
@ -1042,7 +1027,7 @@ data:extend({
local my_seedling = util.table.deepcopy(data.raw.tree["tree-01"])
my_seedling.name = "seedling"
--~ my_seedling.vehicle_impact_sound = { filename = "__base__/sound/car-wood-impact.ogg", volume = 0.8 }
my_seedling.vehicle_impact_sound = vehicle_impact_sound = sounds.car_wood_impact
my_seedling.vehicle_impact_sound = impact_category = "wood"
my_seedling.flags = {"placeable-neutral", "placeable-player", "playeminabler-creation", "breaths-air"}
my_seedling.minable = {mining_particle = "wooden-particle", mining_time = 0.25, result = "seedling", count = 1}
my_seedling.corpse = nil

15
Bio_Industries_2/prototypes/Bio_Fuel/entities.lua
View file

@ -6,20 +6,6 @@ local ENTITYPATH = "__base__/graphics/entity/boiler/"
require ("util")
require ("prototypes.Bio_Fuel.pipeConnectors")
--~ if BI.Settings.BI_Bio_Fuel then
-- demo-sounds has been removed in Factorio 1.1, so we need to check the game version!
local sound_def = BioInd.check_version("base", "<", "1.1.0") and
require("__base__.prototypes.entity.demo-sounds") or
require("__base__.prototypes.entity.sounds")
local sounds = {}
sounds.generic_impact = sound_def.generic_impact
for _, sound in ipairs(sounds.generic_impact) do
sound.volume = 0.65
end
bio_boiler_tint = {r = 0.5, g = 0.5, b = 0.1, a = 0.7}
-- Changed for 0.18.29: We always want to make advanced fertilizer, so we need to
@ -138,7 +124,6 @@ if BI.Settings.BI_Bio_Fuel then
minable = {hardness = 0.2, mining_time = 0.5, result = "bi-bio-boiler"},
max_health = 300,
corpse = "small-remnants",
vehicle_impact_sound = sounds.generic_impact,
mode = "output-to-separate-pipe",
resistances = {
{

14
Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua
View file

@ -10,21 +10,11 @@ local ENTITYPATH = "__Bio_Industries__/graphics/entities/bio_solar_farm/"
if BI.Settings.BI_Solar_Additions then
-- demo-sounds has been removed in Factorio 1.1, so we need to check the game version!
local sound_def = BioInd.check_version("base", "<", "1.1.0") and
require("__base__.prototypes.entity.demo-sounds") or
require("__base__.prototypes.entity.sounds")
local sounds = {}
sounds.car_wood_impact = sound_def.car_wood_impact(1)
sounds.generic_impact = sound_def.generic_impact
for _, sound in ipairs(sounds.generic_impact) do
sound.volume = 0.65
end
sounds.walking_sound = {}
for i = 1, 11 do
sounds.walking_sound[i] = {
filename = "__base__/sound/walking/concrete-" .. (i < 10 and "0" or "") .. i ..".ogg",
filename = "__base__/sound/walking/concrete-" .. i ..".ogg",
volume = 1.2
}
end
@ -133,7 +123,6 @@ data:extend({
},
discharge_cooldown = 60,
discharge_light = {intensity = 0.7, size = 7, color = {r = 1.0, g = 1.0, b = 1.0}},
vehicle_impact_sound = sounds.generic_impact,
working_sound = {
sound = {
filename = "__base__/sound/accumulator-working.ogg",
@ -206,7 +195,6 @@ data:extend({
direction_count = 1,
scale = 0.5,
},
vehicle_impact_sound = sounds.generic_impact,
working_sound = {
sound = { filename = "__base__/sound/substation.ogg" },
apparent_volume = 1.8,

13
Bio_Industries_2/prototypes/Bio_Turret/entity.lua
View file

@ -2,17 +2,6 @@ local BioInd = require('common')('Bio_Industries')
local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
-- demo-sounds has been removed in Factorio 1.1, so we need to check the game version!
local sound_def = BioInd.check_version("base", "<", "1.1.0") and
require("__base__.prototypes.entity.demo-sounds") or
require("__base__.prototypes.entity.sounds")
local sounds = {}
sounds.car_wood_impact = sound_def.car_wood_impact(0.8)
sounds.generic_impact = sound_def.generic_impact
for _, sound in ipairs(sounds.generic_impact) do
sound.volume = 0.65
end
data:extend({
--- Basic Dart
{
@ -265,7 +254,7 @@ data:extend({
folding_animation = turret_pic{direction_count = 8, line_length = 1, run_mode = "backward"},
-- darkfrei: wood impact sound for woods!
vehicle_impact_sound = sounds.car_wood_impact,
impact_category = "wood",
attack_parameters = {
type = "projectile",
ammo_category = "Bio_Turret_Ammo",

25
Bio_Industries_2/prototypes/Wood_Products/containers-entities.lua
View file

@ -11,32 +11,16 @@ BioInd.writeDebug("Creating bigger wooden chests!")
local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
local WOODPATH = BioInd.modRoot .. "/graphics/entities/wood_products/"
local ENTITYPATH = "__base__/graphics/entity/"
local PIPEPATH = ENTITYPATH .. "pipe/"
local SNDPATH = "__base__/sound/"
--~ local BIGICONS = BioInd.check_base_version("0.18.0")
require("prototypes.Wood_Products.demo-remnants-wood")
-- demo-sounds has been removed in Factorio 1.1, so we need to check the game version!
local sound_def = BioInd.check_version("base", "<", "1.1.0") and
require("__base__.prototypes.entity.demo-sounds") or
require("__base__.prototypes.entity.sounds")
local sounds = {}
sounds.car_wood_impact = sound_def.car_wood_impact(0.8)
sounds.generic_impact = sound_def.generic_impact
for _, sound in ipairs(sounds.generic_impact) do
sound.volume = 0.65
end
sounds.open_sound = { filename = "__base__/sound/wooden-chest-open.ogg" }
sounds.close_sound = { filename = SNDPATH .. "wooden-chest-close.ogg" }
sounds.walking_sound = {}
for i = 1, 11 do
sounds.walking_sound[i] = {
filename = SNDPATH .. "walking/concrete-" .. (i < 10 and "0" or "") .. i ..".ogg",
filename = SNDPATH .. "walking/concrete-" .. i ..".ogg",
volume = 1.2
}
end
@ -78,8 +62,7 @@ data:extend({
inventory_size = 128, -- 64
open_sound = { filename = "__base__/sound/wooden-chest-open.ogg" },
close_sound = { filename = "__base__/sound/wooden-chest-close.ogg" },
--~ vehicle_impact_sound = { filename = "__base__/sound/car-wood-impact.ogg", volume = 1.0 },
vehicle_impact_sound = sounds.car_wood_impact,
impact_category = "wood",
picture = {
filename = WOODPATH .. "large_wooden_chest.png",
priority = "extra-high",
@ -122,7 +105,7 @@ data:extend({
open_sound = { filename = "__base__/sound/wooden-chest-open.ogg" },
close_sound = { filename = "__base__/sound/wooden-chest-close.ogg" },
--~ vehicle_impact_sound = { filename = "__base__/sound/car-wood-impact.ogg", volume = 1.0 },
vehicle_impact_sound = sounds.car_wood_impact,
impact_category = "wood",
picture = {
filename = WOODPATH .. "huge_wooden_chest.png",
priority = "extra-high",
@ -165,7 +148,7 @@ data:extend({
open_sound = { filename = "__base__/sound/wooden-chest-open.ogg" },
close_sound = { filename = "__base__/sound/wooden-chest-close.ogg" },
--~ vehicle_impact_sound = { filename = "__base__/sound/car-wood-impact.ogg", volume = 1.0 },
vehicle_impact_sound = sounds.car_wood_impact,
impact_category = "wood",
picture = {
filename = WOODPATH .. "giga_wooden_chest.png",
priority = "extra-high",

21
Bio_Industries_2/prototypes/Wood_Products/entities.lua
View file

@ -10,25 +10,12 @@ local SNDPATH = "__base__/sound/"
--~ local BIGICONS = BioInd.check_base_version("0.18.0")
require("prototypes.Wood_Products.demo-remnants-wood")
-- demo-sounds has been removed in Factorio 1.1, so we need to check the game version!
local sound_def = BioInd.check_version("base", "<", "1.1.0") and
require("__base__.prototypes.entity.demo-sounds") or
require("__base__.prototypes.entity.sounds")
local sounds = {}
sounds.car_wood_impact = sound_def.car_wood_impact(0.8)
sounds.generic_impact = sound_def.generic_impact
for _, sound in ipairs(sounds.generic_impact) do
sound.volume = 0.65
end
--~ sounds.open_sound = { filename = "__base__/sound/wooden-chest-open.ogg" }
--~ sounds.close_sound = { filename = SNDPATH .. "wooden-chest-close.ogg" }
sounds.walking_sound = {}
for i = 1, 11 do
sounds.walking_sound[i] = {
filename = SNDPATH .. "walking/concrete-" .. (i < 10 and "0" or "") .. i ..".ogg",
filename = SNDPATH .. "walking/concrete-" .. i ..".ogg",
volume = 1.2
}
end
@ -486,7 +473,7 @@ data:extend({
corpse = "wall-remnants",
repair_sound = { filename = "__base__/sound/manual-repair-simple.ogg" },
--~ vehicle_impact_sound = { filename = "__base__/sound/car-wood-impact.ogg", volume = 1.0 },
vehicle_impact_sound = sounds.car_wood_impact,
impact_category = "wood",
resistances = {
{
type = "physical",
@ -1057,10 +1044,7 @@ data:extend({
{ position = {-1, 0} }
},
},
--~ vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
vehicle_impact_sound = sounds.generic_impact,
pictures = pipepictures_w(),
--pictures = pipe_pictures,
working_sound = {
sound = {
{
@ -1124,7 +1108,6 @@ data:extend({
scale = 0.5
},
--~ vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
vehicle_impact_sound = sounds.generic_impact,
pictures = {
up = {
filename = ENTITYPATH .. "/pipe-to-ground/hr-pipe-to-ground-up.png",