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

v1.4.4.1 (Blood in the Water Update)

Browse Source
This commit is contained in:
Regalis11
2024-04-24 18:09:05 +03:00
parent 89b91d1c3e
commit ff1b8951a7
397 changed files with 15250 additions and 6479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/StatusEffects/StatusEffect.cs
+44 -6
View File
@@ -29,6 +29,8 @@ namespace Barotrauma
/// </summary>
private bool forcePlaySounds;
private CoroutineHandle playSoundAfterLoadedCoroutine;
partial void InitProjSpecific(ContentXElement element, string parentDebugName)
{
particleEmitters = new List<ParticleEmitter>();
@@ -150,9 +152,7 @@ namespace Barotrauma
GameAnalyticsManager.AddErrorEventOnce("StatusEffect.ApplyProjSpecific:SoundNull1" + Environment.StackTrace.CleanupStackTrace(), GameAnalyticsManager.ErrorSeverity.Error, errorMsg);
return;
}
soundChannel = SoundPlayer.PlaySound(sound.Sound, worldPosition, sound.Volume, sound.Range, hullGuess: hull, ignoreMuffling: sound.IgnoreMuffling, freqMult: sound.GetRandomFrequencyMultiplier());
ignoreMuffling = sound.IgnoreMuffling;
if (soundChannel != null) { soundChannel.Looping = loopSound; }
PlaySoundOrDelayIfNotLoaded(sound);
}
}
else
@@ -177,9 +177,7 @@ namespace Barotrauma
GameAnalyticsManager.AddErrorEventOnce("StatusEffect.ApplyProjSpecific:SoundNull2" + Environment.StackTrace.CleanupStackTrace(), GameAnalyticsManager.ErrorSeverity.Error, errorMsg);
return;
}
soundChannel = SoundPlayer.PlaySound(selectedSound.Sound, worldPosition, selectedSound.Volume, selectedSound.Range, hullGuess: hull, ignoreMuffling: selectedSound.IgnoreMuffling, freqMult: selectedSound.GetRandomFrequencyMultiplier());
ignoreMuffling = selectedSound.IgnoreMuffling;
if (soundChannel != null) { soundChannel.Looping = loopSound; }
PlaySoundOrDelayIfNotLoaded(selectedSound);
}
}
else
@@ -193,6 +191,46 @@ namespace Barotrauma
soundEmitter = entity;
loopStartTime = Timing.TotalTime;
}
void PlaySoundOrDelayIfNotLoaded(RoundSound selectedSound)
{
if (playSoundAfterLoadedCoroutine != null) { return; }
if (selectedSound.Sound.Loading)
{
playSoundAfterLoadedCoroutine = CoroutineManager.StartCoroutine(PlaySoundAfterLoaded(selectedSound));
}
else
{
PlaySound(selectedSound);
}
}
IEnumerable<CoroutineStatus> PlaySoundAfterLoaded(RoundSound selectedSound)
{
float maxWaitTimer = 1.0f;
while (selectedSound.Sound.Loading && maxWaitTimer > 0.0f)
{
maxWaitTimer -= CoroutineManager.DeltaTime;
yield return CoroutineStatus.Running;
}
if (!selectedSound.Sound.Loading)
{
PlaySound(selectedSound);
}
yield return CoroutineStatus.Success;
}
void PlaySound(RoundSound selectedSound)
{
//if the sound loops, we must make sure the existing channel
System.Diagnostics.Debug.Assert(
soundChannel == null || !soundChannel.IsPlaying || soundChannel.FadingOutAndDisposing || !soundChannel.Looping,
"A StatusEffect attempted to play a sound, but an looping sound is already playing. The looping sound should be stopped before playing a new one, or it will keep looping indefinitely.");
soundChannel = SoundPlayer.PlaySound(selectedSound.Sound, worldPosition, selectedSound.Volume, selectedSound.Range, hullGuess: hull, ignoreMuffling: selectedSound.IgnoreMuffling, freqMult: selectedSound.GetRandomFrequencyMultiplier());
ignoreMuffling = selectedSound.IgnoreMuffling;
if (soundChannel != null) { soundChannel.Looping = loopSound; }
}
}
static partial void UpdateAllProjSpecific(float deltaTime)