Change Notes:

- Moved states info into the event dat as we didn't need them as separate dats.

Author: Pear-231

Editors/Audio/Shared/AudioProject/Compiler/AudioProjectCompilerService.cs

@@ -239,20 +239,24 @@ private void GenerateSoundBanks(AudioProjectFile audioProject)
 
         private void GenerateDatFiles(AudioProjectFile audioProject, string audioProjectFileNameWithoutExtension)
         {
-            // The .dat file is seems to only necessary for playing movie Action Events and any triggered via common.trigger_soundevent()
-            // but without testing all the different types of Action Event sounds it's safer to just make a .dat for all as it's little overhead.
+            // The .dat file is seems to only necessary for Action Events for movies, quest battles or anything triggered via common.trigger_soundevent()
+            // but without testing all the different types of Action Event sounds it's safer to just make a .dat for all.
+            // We store States in there so we can display them in the Audio Explorer.
             var actionEvents = audioProject.GetActionEvents();
-            if (actionEvents.Count != 0)
+            if (actionEvents.Count != 0 && audioProject.StateGroups != null && audioProject.StateGroups.Count != 0)
             {
-                _logger.Here().Information($"Generating Event .dat");
-                _datGeneratorService.GenerateEventDatFile(actionEvents, audioProjectFileNameWithoutExtension);
+                _logger.Here().Information($"Generating event data .dat");
+                _datGeneratorService.GenerateEventDatFile(audioProjectFileNameWithoutExtension, actionEvents, audioProject.StateGroups);
             }
-
-            // We create the states .dat file so we can see the modded states in the Audio Explorer, it isn't necessary for the game
-            if (audioProject.StateGroups != null && audioProject.StateGroups.Count != 0)
+            else if (actionEvents.Count != 0 && audioProject.StateGroups == null)
+            {
+                _logger.Here().Information($"Generating event data .dat");
+                _datGeneratorService.GenerateEventDatFile(audioProjectFileNameWithoutExtension, actionEvents: actionEvents);
+            }
+            else if (actionEvents.Count == 0 && audioProject.StateGroups != null && audioProject.StateGroups.Count != 0)
             {
-                _logger.Here().Information($"Generating States .dat");
-                _datGeneratorService.GenerateStatesDatFile(audioProject.StateGroups, audioProjectFileNameWithoutExtension);
+                _logger.Here().Information($"Generating event data .dat");
+                _datGeneratorService.GenerateEventDatFile(audioProjectFileNameWithoutExtension, stateGroups: audioProject.StateGroups);
             }
         }
     }

Editors/Audio/Shared/Dat/DatGeneratorService.cs

@@ -8,42 +8,39 @@ namespace Editors.Audio.Shared.Dat
 {
     public interface IDatGeneratorService
     {
-        void GenerateEventDatFile(List<ActionEvent> actionEvents, string audioProjectFileNameWithoutExtension);
-        void GenerateStatesDatFile(List<StateGroup> stateGroups, string audioProjectFileNameWithoutExtension);
+        void GenerateEventDatFile(string audioProjectFileNameWithoutExtension, List<ActionEvent> actionEvents = null, List<StateGroup> stateGroups = null);
     }
 
     public class DatGeneratorService(IFileSaveService fileSaveService) : IDatGeneratorService
     {
         private readonly IFileSaveService _fileSaveService = fileSaveService;
 
-        public void GenerateEventDatFile(List<ActionEvent> actionEvents, string audioProjectFileNameWithoutExtension)
+        public void GenerateEventDatFile(string audioProjectFileNameWithoutExtension, List<ActionEvent> actionEvents = null, List<StateGroup> stateGroups = null)
         {
-            var soundDatFile = new SoundDatFile();
+            var datFile = new SoundDatFile();
 
-            foreach (var actionEvent in actionEvents)
-                soundDatFile.EventWithStateGroup.Add(new SoundDatFile.DatEventWithStateGroup() { Event = actionEvent.Name, Value = 400 });
-
-            var datFileName = $"event_data__{audioProjectFileNameWithoutExtension}.dat";
-            var datFilePath = $"audio\\wwise\\{datFileName}";
-            SaveDatFileToPack(soundDatFile, datFileName, datFilePath);
-        }
-
-        public void GenerateStatesDatFile(List<StateGroup> stateGroups, string audioProjectFileNameWithoutExtension)
-        {
-            var stateDatFile = new SoundDatFile();
+            if (actionEvents != null && actionEvents.Count > 0)
+            {
+                foreach (var actionEvent in actionEvents)
+                    datFile.EventWithStateGroup.Add(new SoundDatFile.DatEventWithStateGroup() { Event = actionEvent.Name, Value = 400 });
+            }
 
-            foreach (var stateGroup in stateGroups)
+            if (stateGroups != null && stateGroups.Count > 0)
             {
-                var states = new List<string>();
-                foreach (var state in stateGroup.States)
-                    states.Add(state.Name);
 
-                stateDatFile.StateGroupsWithStates1.Add(new SoundDatFile.DatStateGroupsWithStates() { StateGroup = stateGroup.Name, States = states });
+                foreach (var stateGroup in stateGroups)
+                {
+                    var states = new List<string>();
+                    foreach (var state in stateGroup.States)
+                        states.Add(state.Name);
+
+                    datFile.StateGroupsWithStates1.Add(new SoundDatFile.DatStateGroupsWithStates() { StateGroup = stateGroup.Name, States = states });
+                }
             }
 
-            var datFileName = $"states_data__{audioProjectFileNameWithoutExtension}.dat";
+            var datFileName = $"event_data__{audioProjectFileNameWithoutExtension}.dat";
             var datFilePath = $"audio\\wwise\\{datFileName}";
-            SaveDatFileToPack(stateDatFile, datFileName, datFilePath);
+            SaveDatFileToPack(datFile, datFileName, datFilePath);
         }
 
         private void SaveDatFileToPack(SoundDatFile datFile, string datFileName, string datFilePath)