Skip to content

Commit

Permalink
Add EAL sound volume and remaining known data
Browse files Browse the repository at this point in the history
  • Loading branch information
@danwilkins
danwilkins committed Jul 18, 2023
1 parent dba2bdc commit 643f1dc
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 46 deletions.
32 changes: 18 additions & 14 deletions LanternExtractor/EQ/Sound/AudioInstance.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,40 +40,44 @@ public MusicInstance(AudioType type, float posX, float posY, float posZ, float r

public abstract class SoundInstance : AudioInstance
{
public int Volume { get; }
public int SoundId1 { get; }
public string Sound1 { get; }
public float Volume1 { get; }
public int Cooldown1 { get; }
public int CooldownRandom { get; }

protected SoundInstance(AudioType type, float posX, float posY, float posZ, float radius, int volume,
int soundId1, int cooldown1) : base(type, posX, posY, posZ, radius)
protected SoundInstance(AudioType type, float posX, float posY, float posZ, float radius, float volume1,
string sound1, int cooldown1, int cooldownRandom) : base(type, posX, posY, posZ, radius)
{
Volume = volume;
SoundId1 = soundId1;
Sound1 = sound1;
Volume1 = volume1;
Cooldown1 = cooldown1;
CooldownRandom = cooldownRandom;
}
}

public class SoundInstance2d : SoundInstance
{
public int SoundId2 { get; }
public string Sound2 { get; }
public float Volume2 { get; }
public int Cooldown2 { get; }

public SoundInstance2d(AudioType type, float posX, float posY, float posZ, float radius, int volume,
int soundId1, int cooldown1, int soundId2, int cooldown2) : base(type, posX, posY, posZ, radius, volume,
soundId1, cooldown1)
public SoundInstance2d(AudioType type, float posX, float posY, float posZ, float radius, float volume1,
string sound1, int cooldown1, string sound2, int cooldown2, int cooldownRandom, float volume2) : base(type, posX, posY, posZ, radius, volume1,
sound1, cooldown1, cooldownRandom)
{
SoundId2 = soundId2;
Sound2 = sound2;
Cooldown2 = cooldown2;
Volume2 = volume2;
}
}

public class SoundInstance3d : SoundInstance
{
public int Multiplier;

public SoundInstance3d(AudioType type, float posX, float posY, float posZ, float radius, int volume,
int soundId1, int cooldown1, int multiplier) : base(type, posX, posY, posZ, radius, volume, soundId1,
cooldown1)
public SoundInstance3d(AudioType type, float posX, float posY, float posZ, float radius, float volume,
string sound1, int cooldown1, int cooldownRandom, int multiplier) : base(type, posX, posY, posZ, radius, volume, sound1,
cooldown1, cooldownRandom)
{
Multiplier = multiplier;
}
Expand Down
82 changes: 52 additions & 30 deletions LanternExtractor/EQ/Sound/EffSounds.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public class EffSounds
/// The sound bank referenced for sound names
/// </summary>
private readonly EffSndBnk _soundBank;

private readonly EnvAudio _envAudio;
private readonly string _soundFilePath;
private readonly List<AudioInstance> _audioInstances = new List<AudioInstance>();
Expand Down Expand Up @@ -71,6 +72,7 @@ public void Initialize(ILogger logger)
var type = (AudioType)typeByte;
reader.BaseStream.Position = basePosition + 48;
int soundId1 = reader.ReadInt32();
string sound1 = GetSoundName(soundId1);

if (type == AudioType.Music)
{
Expand All @@ -86,25 +88,33 @@ public void Initialize(ILogger logger)
else if (type == AudioType.Sound2d)
{
int soundId2 = reader.ReadInt32();
string sound2 = GetSoundName(soundId2);
reader.BaseStream.Position = basePosition + 32;
int cooldown1 = reader.ReadInt32();
int cooldown2 = reader.ReadInt32();
int cooldownRandom = reader.ReadInt32();
reader.BaseStream.Position = basePosition + 60;
int volume = reader.ReadInt32();
var soundInstance = new SoundInstance2d(type, posX, posY, posZ, radius, volume, soundId1, cooldown1,
soundId2, cooldown2);
int volume1Raw = reader.ReadInt32();
float volume1 = GetEalSoundVolume(sound1, volume1Raw);
int volume2Raw = reader.ReadInt32();
float volume2 = GetEalSoundVolume(sound2, volume2Raw);
var soundInstance = new SoundInstance2d(type, posX, posY, posZ, radius, volume1, sound1, cooldown1,
sound2, cooldown2, cooldownRandom, volume2);
_audioInstances.Add(soundInstance);
}
else
{
reader.BaseStream.Position = basePosition + 32;
int cooldown1 = reader.ReadInt32();
reader.BaseStream.Position = basePosition + 40;
int cooldownRandom = reader.ReadInt32();
reader.BaseStream.Position = basePosition + 60;
int volume = reader.ReadInt32();
int volumeRaw = reader.ReadInt32();
float volume = GetEalSoundVolume(sound1, volumeRaw);
reader.BaseStream.Position = basePosition + 72;
int multiplier = reader.ReadInt32();
var soundInstance = new SoundInstance3d(type, posX, posY, posZ, radius, volume, soundId1, cooldown1,
multiplier);
var soundInstance = new SoundInstance3d(type, posX, posY, posZ, radius, volume, sound1,
cooldown1, cooldownRandom, multiplier);
_audioInstances.Add(soundInstance);
}
}
Expand All @@ -128,10 +138,14 @@ private string GetSoundName(int soundId)
}
}

private float GetEalSoundVolume(int soundId)
private float GetEalSoundVolume(string soundName, int volumeRaw)
{
var soundName = GetSoundName(soundId);
return _envAudio.GetVolumeLinear(soundName);
if (volumeRaw > 0)
{
volumeRaw = -volumeRaw;
}

return volumeRaw == 0 ? _envAudio.GetVolumeLinear(soundName) : _envAudio.GetVolumeLinear(volumeRaw);
}

private EmissionType GetEmissionType(int soundId)
Expand All @@ -151,15 +165,15 @@ private EmissionType GetEmissionType(int soundId)

public void ExportSoundData(string zoneName, string rootFolder)
{
var soundExport = new StringBuilder();
var sound2dExport = new StringBuilder();
var sound3dExport = new StringBuilder();
var musicExport = new StringBuilder();

foreach (var entry in _audioInstances)
{
if (entry.AudioType == AudioType.Music)
{
var music = entry as MusicInstance;
if (music == null)
if (!(entry is MusicInstance music))
{
continue;
}
Expand All @@ -170,51 +184,59 @@ public void ExportSoundData(string zoneName, string rootFolder)
}
else if (entry.AudioType == AudioType.Sound2d)
{
var sound2d = entry as SoundInstance2d;
if (sound2d == null)
if (!(entry is SoundInstance2d sound2d))
{
continue;
}

soundExport.AppendLine(string.Join(",", (byte)sound2d.AudioType, sound2d.PosX, sound2d.PosY,
sound2d.PosZ, sound2d.Radius, GetSoundName(sound2d.SoundId1), GetSoundName(sound2d.SoundId2),
sound2d.Cooldown1, sound2d.Cooldown2, sound2d.Cooldown2, sound2d.Volume));
sound2dExport.AppendLine(string.Join(",", sound2d.PosX, sound2d.PosY,
sound2d.PosZ, sound2d.Radius, sound2d.Sound1, sound2d.Sound2,
sound2d.Cooldown1, sound2d.Cooldown2, sound2d.CooldownRandom, sound2d.Volume1, sound2d.Volume2));
}
else
{
var sound3d = entry as SoundInstance3d;
if (sound3d == null)
if (!(entry is SoundInstance3d sound3d))
{
continue;
}

soundExport.AppendLine(string.Join(",", (byte)sound3d.AudioType, sound3d.PosX, sound3d.PosY,
sound3d.PosZ, sound3d.Radius, GetSoundName(sound3d.SoundId1), sound3d.Cooldown1, sound3d.Volume,
sound3dExport.AppendLine(string.Join(",", sound3d.PosX, sound3d.PosY,
sound3d.PosZ, sound3d.Radius, sound3d.Sound1, sound3d.Cooldown1, sound3d.CooldownRandom, sound3d.Volume1,
sound3d.Multiplier));
}
}

string exportPath = Path.Combine(rootFolder, zoneName, "Zone/");

if (soundExport.Length > 0)
if (musicExport.Length > 0)
{
StringBuilder exportHeader = new StringBuilder();
exportHeader.AppendLine(LanternStrings.ExportHeaderTitle + "Sound Instances");
exportHeader.AppendLine(LanternStrings.ExportHeaderTitle + "Music Instances");
exportHeader.AppendLine(
"# Format: SoundType, PosX, PosY, PosZ, Radius, SoundIdDay, SoundIdNight, CooldownDay, CooldownNight, RandomDelay");
"# Format: PosX, PosY, PosZ, Radius, MusicIndexDay, MusicIndexNight, LoopCountDay, LoopCountNight, FadeOutMs");
Directory.CreateDirectory(exportPath);
File.WriteAllText(exportPath + "sound_instances.txt", exportHeader.ToString() + soundExport);
File.WriteAllText(exportPath + "music_instances.txt", exportHeader.ToString() + musicExport);
}

if (musicExport.Length > 0)
if (sound2dExport.Length > 0)
{
StringBuilder exportHeader = new StringBuilder();
exportHeader.AppendLine(LanternStrings.ExportHeaderTitle + "Music Instances");
exportHeader.AppendLine(LanternStrings.ExportHeaderTitle + "Sound 2D Instances");
exportHeader.AppendLine(
"# Format: PosX, PosY, PosZ, Radius, MusicIndexDay, MusicIndexNight, LoopCountDay, LoopCountNight, FadeOutMs");
"# Format: PosX, PosY, PosZ, Radius, SoundNameDay, SoundNameNight, CooldownDay, CooldownNight, CooldownRandom, VolumeDay, VolumeNight");
Directory.CreateDirectory(exportPath);
File.WriteAllText(exportPath + "music_instances.txt", exportHeader.ToString() + musicExport);
File.WriteAllText(exportPath + "sound2d_instances.txt", exportHeader.ToString() + sound2dExport);
}

if (sound3dExport.Length > 0)
{
StringBuilder exportHeader = new StringBuilder();
exportHeader.AppendLine(LanternStrings.ExportHeaderTitle + "Sound 3D Instances");
exportHeader.AppendLine(
"# Format: PosX, PosY, PosZ, Radius, SoundName, Cooldown, CooldownRandom, Volume, Multiplier");
Directory.CreateDirectory(exportPath);
File.WriteAllText(exportPath + "sound3d_instances.txt", exportHeader.ToString() + sound3dExport);
}
}
}
}
}
9 changes: 7 additions & 2 deletions LanternExtractor/EQ/Sound/EnvAudio.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public bool Load(string ealFilePath)
return true;
}

public int GetVolumeEq(string soundFile)
private int GetVolumeEq(string soundFile)
{
var volume = 0;
_sourceLevels?.TryGetValue(soundFile, out volume);
Expand All @@ -73,7 +73,12 @@ public int GetVolumeEq(string soundFile)
public float GetVolumeLinear(string soundFile)
{
var volumeEq = GetVolumeEq(soundFile);
var linear = MathF.Pow(10.0f, volumeEq / 2000.0f);
return GetVolumeLinear(volumeEq);
}

public float GetVolumeLinear(int directAudioLevel)
{
var linear = MathF.Pow(10.0f, directAudioLevel / 2000.0f);
return Math.Clamp(linear, 0f, 1f);
}
}
Expand Down

0 comments on commit 643f1dc

Please sign in to comment.