Skip to content

Multiple audio adjustments #5599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sprunk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Multiple audio adjustments #5599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion LuaRules/Gadgets/weapon_noexplode_speed_damage.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ for i = 1,#WeaponDefs do
initialCeg = wcp.thermite_ceg_initial,
damageCeg = wcp.thermite_ceg_damage,
sound = wcp.thermite_sound,
volume = tonumber(wcp.thermite_sound_volume) or 1,
hitSound = wcp.thermite_sound_hit,
}
if wcp.thermite_dps_start and wcp.thermite_dps_end then
Expand Down Expand Up @@ -277,7 +278,7 @@ local function UpdateProjectile(proID, proData, index, frame)
proData.resetNextFrame = false
if def.sound then
if (not proData.nextSoundFrame) or proData.nextSoundFrame < frame then
Spring.PlaySoundFile(def.sound, 3.5*(math.random()*0.5 + 0.5) + 0.3*proData.damageMod + (proData.hasDamaged and 4 or 0), px, py, pz, 'sfx')
Spring.PlaySoundFile(def.sound, def.volume * (3.5*(math.random()*0.5 + 0.5) + 0.3*proData.damageMod + (proData.hasDamaged and 4 or 0)), px, py, pz, 'sfx')
proData.nextSoundFrame = frame + 28 + math.random()*5 - 0.2*proData.damageMod
end
end
Expand Down
22 changes: 11 additions & 11 deletions LuaUI/Configs/sounds_noises.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
local VOLUME_MULT = 1.13

local volumeOverrides = {
builder_start = 1.1,
builder_start = 1,
light_bot_select2 = 0.55,
light_bot_select = 0.58,
light_bot_move = 0.8,
bot_select = 0.2,
bot_move2 = 0.25,
medium_bot_select = 0.52,
heavy_bot_move = 0.21,
amph_move = 0.39,
amph_select = 0.3,
amph_move = 0.3,
amph_select = 0.27,

crawlie_select = 0.18,
spider_move = 0.18,
Expand All @@ -25,18 +25,18 @@ local volumeOverrides = {
vehicle_move = 0.27,
vehicle_select = 0.67,

tank_move = 0.26,
tank_select = 0.37,
tank_move = 0.25,
tank_select = 0.34,
light_tank_move2 = 0.37,

hovercraft_move = 0.63,
hovercraft_move = 0.59,
hovercraft_select = 0.83,

gunship_select = 0.31,
gunship_move2 = 0.35,
light_gunship_select = 0.28,
heavy_gunship_select = 0.2,
heavy_gunship_move = 0.78,
gunship_move2 = 0.34,
light_gunship_select = 0.26,
heavy_gunship_select = 0.19,
heavy_gunship_move = 0.77,

fighter_move = 0.17,
fighter_select = 0.3,
Expand All @@ -49,7 +49,7 @@ local volumeOverrides = {

building_select1 = 0.8,
building_select2 = 0.58,
windmill = 0.48,
windmill = 0.52,
fusion_select = 0.37,
adv_fusion_select = 0.37,
geo_select = 0.43,
Expand Down
4 changes: 2 additions & 2 deletions LuaUI/Widgets/snd_noises.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ function WG.sounds_gaveOrderToUnit(unitID, isBuild)
CoolNoisePlay(sounds.ok[1], options.commandSoundCooldown.value, (sounds.ok.volume or 1)*options.ordernoisevolume.value)
end
elseif sounds.build then
CoolNoisePlay(sounds.build[1], options.commandSoundCooldown.value, options.ordernoisevolume.value)
CoolNoisePlay(sounds.build[1], options.commandSoundCooldown.value, (sounds.build.volume or 1)*options.ordernoisevolume.value)
end
end

Expand All @@ -204,7 +204,7 @@ local function PlayResponse(unitID, cmdID)
CoolNoisePlay(sounds.ok[1], options.commandSoundCooldown.value, (sounds.ok.volume or 1)*options.ordernoisevolume.value)
end
elseif (sounds and sounds.build) then
CoolNoisePlay(sounds.build[1], options.commandSoundCooldown.value, options.ordernoisevolume.value)
CoolNoisePlay(sounds.build[1], options.commandSoundCooldown.value, (sounds.build.volume or 1)*options.ordernoisevolume.value)
end
end

Expand Down
5 changes: 3 additions & 2 deletions gamedata/modularcomms/weapons/disintegrator.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ local weaponDef = {
range = 200,
reloadtime = 30,
size = 6,
soundHit = [[explosion/ex_med6]],
soundHit = [[dgun_hit]],
soundHitVolume = 8.5,
soundStart = [[weapon/laser/heavy_laser4]],
soundTrigger = true,
soundStartVolume = 8,
turret = true,
waterWeapon = true,
weaponType = [[DGun]],
Expand Down
3 changes: 2 additions & 1 deletion gamedata/modularcomms/weapons/heatray.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ local weaponDef = {
reloadtime = 0.1,
rgbColor = [[1 0.1 0]],
rgbColor2 = [[1 1 0.25]],
soundStart = [[weapon/heatray_fire]],
soundStart = [[weapon/heatray_fire7]],
soundStartVolume = 4,
thickness = 3,
tolerance = 5000,
turret = true,
Expand Down
Loading