vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved a bunch of hard-coded sound paths to the sound config file.

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-02-26 22:31:07 +02:00
parent 77940fa992
commit 3564abf31b
3 changed files with 60 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Map/Hull.cs
+3 -3
View File
@@ -147,10 +147,10 @@ namespace Barotrauma
soundVolume = soundVolume + ((strongestFlow < 100.0f) ? -deltaTime * 0.5f : deltaTime * 0.5f);
soundVolume = MathHelper.Clamp(soundVolume, 0.0f, 1.0f);
int index = (int)Math.Floor(strongestFlow / 100.0f);
index = Math.Min(index, 2);
int index = (int)Math.Floor(MathHelper.Lerp(0, SoundPlayer.FlowSounds.Count - 1, strongestFlow / 600.0f));
index = Math.Min(index, SoundPlayer.FlowSounds.Count - 1);
var flowSound = SoundPlayer.flowSounds[index];
var flowSound = SoundPlayer.FlowSounds[index];
if (flowSound != currentFlowSound && soundIndex > -1)
{
Sounds.SoundManager.Stop(soundIndex);
Barotrauma/BarotraumaClient/Source/Sounds/SoundPlayer.cs
+37 -50
View File
@@ -58,25 +58,25 @@ namespace Barotrauma
private static BackgroundMusic currentMusic;
private static BackgroundMusic targetMusic;
private static BackgroundMusic[] musicClips;
private static List<BackgroundMusic> musicClips;
private static float currMusicVolume;
private static float updateMusicTimer;
//ambience
private static Sound[] waterAmbiences = new Sound[2];
private static List<Sound> waterAmbiences = new List<Sound>();
private static int[] waterAmbienceIndexes = new int[2];
private static float ambientSoundTimer;
private static Vector2 ambientSoundInterval = new Vector2(20.0f, 40.0f); //x = min, y = max
//misc
public static Sound[] flowSounds = new Sound[3];
public static Sound[] SplashSounds = new Sound[10];
public static List<Sound> FlowSounds = new List<Sound>();
public static List<Sound> SplashSounds = new List<Sound>();
private static List<DamageSound> damageSounds;
private static Sound startDrone;
private static Sound startUpSound;
public static bool Initialized;
@@ -104,50 +104,20 @@ namespace Barotrauma
}
}
SoundCount = 16 + soundElements.Count();
SoundCount = 1 + soundElements.Count();
startDrone = Sound.Load("Content/Sounds/startDrone.ogg", false);
startDrone.Play();
yield return CoroutineStatus.Running;
waterAmbiences[0] = Sound.Load("Content/Sounds/Water/WaterAmbience1.ogg", false);
yield return CoroutineStatus.Running;
waterAmbiences[1] = Sound.Load("Content/Sounds/Water/WaterAmbience2.ogg", false);
yield return CoroutineStatus.Running;
flowSounds[0] = Sound.Load("Content/Sounds/Water/FlowSmall.ogg", false);
yield return CoroutineStatus.Running;
flowSounds[1] = Sound.Load("Content/Sounds/Water/FlowMedium.ogg", false);
yield return CoroutineStatus.Running;
flowSounds[2] = Sound.Load("Content/Sounds/Water/FlowLarge.ogg", false);
yield return CoroutineStatus.Running;
for (int j = 0; j < 10; j++)
var startUpSoundElement = soundElements.Find(e => e.Name.ToString().ToLowerInvariant() == "startupsound");
if (startUpSoundElement != null)
{
SplashSounds[j] = Sound.Load("Content/Sounds/Water/Splash" + j + ".ogg", false);
yield return CoroutineStatus.Running;
startUpSound = Sound.Load(startUpSoundElement, false);
startUpSound.Play();
}
var musicElements = soundElements.FindAll(e => e.Name.ToString().ToLowerInvariant() == "music");
musicClips = new BackgroundMusic[musicElements.Count];
int i = 0;
foreach (XElement element in musicElements)
{
string file = element.GetAttributeString("file", "");
string type = element.GetAttributeString("type", "").ToLowerInvariant();
Vector2 priority = element.GetAttributeVector2("priorityrange", new Vector2(0.0f, 100.0f));
musicClips[i] = new BackgroundMusic(file, type, priority);
yield return CoroutineStatus.Running;
i++;
}
yield return CoroutineStatus.Running;
List<KeyValuePair<string, Sound>> miscSoundList = new List<KeyValuePair<string, Sound>>();
damageSounds = new List<DamageSound>();
musicClips = new List<BackgroundMusic>();
foreach (XElement soundElement in soundElements)
{
@@ -156,7 +126,21 @@ namespace Barotrauma
switch (soundElement.Name.ToString().ToLowerInvariant())
{
case "music":
continue;
string file = soundElement.GetAttributeString("file", "");
string type = soundElement.GetAttributeString("type", "").ToLowerInvariant();
Vector2 priority = soundElement.GetAttributeVector2("priorityrange", new Vector2(0.0f, 100.0f));
musicClips.Add(new BackgroundMusic(file, type, priority));
break;
case "splash":
SplashSounds.Add(Sound.Load(soundElement, false));
break;
case "flow":
FlowSounds.Add(Sound.Load(soundElement, false));
break;
case "waterambience":
waterAmbiences.Add(Sound.Load(soundElement, false));
break;
case "damagesound":
Sound damageSound = Sound.Load(soundElement.GetAttributeString("file", ""), false);
if (damageSound == null) continue;
@@ -194,10 +178,10 @@ namespace Barotrauma
{
UpdateMusic(deltaTime);
if (startDrone != null && !startDrone.IsPlaying)
if (startUpSound != null && !startUpSound.IsPlaying)
{
startDrone.Remove();
startDrone = null;
startUpSound.Remove();
startUpSound = null;
}
//stop submarine ambient sounds if no sub is loaded
@@ -262,8 +246,11 @@ namespace Barotrauma
}
SoundManager.LowPassHFGain = lowpassHFGain;
waterAmbienceIndexes[0] = waterAmbiences[0].Loop(waterAmbienceIndexes[0], ambienceVolume * (1.0f - movementSoundVolume));
waterAmbienceIndexes[1] = waterAmbiences[1].Loop(waterAmbienceIndexes[1], ambienceVolume * movementSoundVolume);
if (waterAmbiences.Count > 1)
{
waterAmbienceIndexes[0] = waterAmbiences[0].Loop(waterAmbienceIndexes[0], ambienceVolume * (1.0f - movementSoundVolume));
waterAmbienceIndexes[1] = waterAmbiences[1].Loop(waterAmbienceIndexes[1], ambienceVolume * movementSoundVolume);
}
}
@@ -436,7 +423,7 @@ namespace Barotrauma
public static void PlaySplashSound(Vector2 worldPosition, float strength)
{
int splashIndex = MathHelper.Clamp((int)(strength + Rand.Range(-2,2)), 0, SplashSounds.Length-1);
int splashIndex = MathHelper.Clamp((int)(strength + Rand.Range(-2, 2)), 0, SplashSounds.Count - 1);
SplashSounds[splashIndex].Play(1.0f, 800.0f, worldPosition);
}
Barotrauma/BarotraumaShared/Content/Sounds/sounds.xml
+20
View File
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<sounds>
<startupsound file="Content/Sounds/startDrone.ogg"/>
<damagesound file="Content/Sounds/Damage/StructureBlunt1.ogg" damagerange="0.0,30.0" damagesoundtype="StructureBlunt"/>
<damagesound file="Content/Sounds/Damage/StructureBlunt2.ogg" damagerange="20.0,30.0" damagesoundtype="StructureBlunt"/>
<damagesound file="Content/Sounds/Damage/StructureBlunt3.ogg" damagerange="25.0,50.0" damagesoundtype="StructureBlunt"/>
@@ -56,6 +58,24 @@
<drown file="Content/Sounds/Water/Drown3.ogg"/>
<drown file="Content/Sounds/Water/Drown4.ogg"/>
<splash file="Content/Sounds/Water/Splash0.ogg"/>
<splash file="Content/Sounds/Water/Splash1.ogg"/>
<splash file="Content/Sounds/Water/Splash2.ogg"/>
<splash file="Content/Sounds/Water/Splash3.ogg"/>
<splash file="Content/Sounds/Water/Splash4.ogg"/>
<splash file="Content/Sounds/Water/Splash5.ogg"/>
<splash file="Content/Sounds/Water/Splash6.ogg"/>
<splash file="Content/Sounds/Water/Splash7.ogg"/>
<splash file="Content/Sounds/Water/Splash8.ogg"/>
<splash file="Content/Sounds/Water/Splash9.ogg"/>
<flow file="Content/Sounds/Water/FlowSmall.ogg"/>
<flow file="Content/Sounds/Water/FlowMedium.ogg"/>
<flow file="Content/Sounds/Water/FlowLarge.ogg"/>
<waterambience file="Content/Sounds/Water/WaterAmbience1.ogg"/>
<waterambience file="Content/Sounds/Water/WaterAmbience2.ogg"/>
<footstep file="Content/Sounds/Footsteps/step.ogg"/>
<footstep_metal file="Content/Sounds/Footsteps/Metal/metal-01.ogg"/>
<footstep_metal file="Content/Sounds/Footsteps/Metal/metal-02.ogg"/>