Fixed hitmarkers being read incorrectly. Added WIP voice recording.

Author: xLoadingx

ERRORMODS-ReplayMod-1.0.0/Mods/ReplayMod.dll

@@ -14,6 +14,18 @@
 
     <ItemGroup>
       <Reference Include=".ref/*.dll" Private="false" />
+      <Reference Include="NAudio">
+        <HintPath>..\..\SteamLibrary\steamapps\common\RUMBLE\UserLibs\NAudio.dll</HintPath>
+      </Reference>
+      <Reference Include="NAudio.Core">
+        <HintPath>..\..\SteamLibrary\steamapps\common\RUMBLE\UserLibs\NAudio.Core.dll</HintPath>
+      </Reference>
+      <Reference Include="NAudio.Wasapi">
+        <HintPath>..\..\SteamLibrary\steamapps\common\RUMBLE\UserLibs\NAudio.Wasapi.dll</HintPath>
+      </Reference>
+      <Reference Include="NAudio.WinMM">
+        <HintPath>..\..\SteamLibrary\steamapps\common\RUMBLE\UserLibs\NAudio.WinMM.dll</HintPath>
+      </Reference>
       <Reference Include="RumbleModdingAPI">
         <HintPath>..\..\SteamLibrary\steamapps\common\RUMBLE\Mods\RumbleModdingAPI.dll</HintPath>
       </Reference>

ReplayMod.csproj

@@ -121,7 +121,7 @@ static void Postfix(PooledMonoBehaviour __result, Vector3 position, Quaternion r
                     type = EventType.OneShotFX,
                     fxType = FXOneShotType.Hitmarker,
                     position = vfx.transform.position,
-                    damage = (int)vfx.GetFloat("Damage")
+                    damage = (byte)vfx.GetFloat("Damage")
                 };
 
                 Main.Recording.Events.Add(evt);

src/Core/Patches.cs

@@ -383,7 +383,6 @@ public static void ReloadReplays()
         }
 
         RefreshUI();
-        SelectReplayFromExplorer();
     }
 
     public static void RefreshUI()

src/Replay/Files/ReplayFiles.cs

@@ -5,7 +5,10 @@
 using Il2CppPhoton.Voice.PUN;
 using Il2CppPhoton.Voice.Unity;
 using Il2CppRUMBLE.Managers;
+using Il2CppSystem;
+using MelonLoader;
 using MelonLoader.Utils;
+using NAudio.Wave;
 using ReplayMod.Replay.Serialization;
 using UnityEngine;
 
@@ -16,76 +19,165 @@ namespace ReplayMod.Replay;
 // Kept for future ideas
 internal static class ReplayVoices
 {
-    // Remote
     private static PunVoiceClient voice;
-    
+
     private static readonly Dictionary<(int playerId, int voiceId), VoiceStreamWriter> writers = new();
-    public static string tempVoiceDir = Path.Combine(MelonEnvironment.UserDataDirectory, "ReplayMod", "TempVoices");
-    
-    public static List<VoiceTrackInfo> voiceTrackInfos = new();
 
-    public static void HookRemote()
+    public static string TempVoiceDir = Path.Combine(MelonEnvironment.UserDataDirectory, "ReplayMod", "TempVoices");
+
+    public static List<VoiceTrackInfo> VoiceTrackInfos = new();
+
+    private static bool isRecording;
+    private static bool subscribed;
+
+    public static void StartRecording()
     {
+        isRecording = true;
+        
         voice ??= PunVoiceClient.Instance;
-    
-        voice.RemoteVoiceAdded += (Il2CppSystem.Action<RemoteVoiceLink>)(OnRemoteVoiceAdded);
-    
-        Directory.CreateDirectory(tempVoiceDir);
+
+        if (voice is not null)
+        {
+            if (!subscribed)
+            {
+                voice.RemoteVoiceAdded += (Action<RemoteVoiceLink>)OnVoiceLinkAdded;
+                subscribed = true;
+            }
+            
+            foreach (var remoteVoiceLink in voice.cachedRemoteVoices)
+                OnVoiceLinkAdded(remoteVoiceLink);
+            
+            Directory.CreateDirectory(TempVoiceDir);
+        }
     }
-    
-    public static void OnRemoteVoiceAdded(RemoteVoiceLink link)
+
+    public static void OnVoiceLinkAdded(RemoteVoiceLink link)
     {
         int playerId = link.PlayerId;
         int voiceId = link.VoiceId;
 
+        MelonLogger.Msg($"VoiceAdded actor={playerId} voice={voiceId}");
+
         string name = PlayerManager.instance.AllPlayers.ToArray()
-                .FirstOrDefault(p => p.Data.GeneralData.ActorNo == playerId)?
-                .Data.GeneralData.PublicUsername
-            ?? $"Unknown";
+            .FirstOrDefault(p => p.Data.GeneralData.ActorNo == playerId)?
+            .Data.GeneralData.PublicUsername
+            ?? "Unknown";
 
         name = Utilities.CleanName(name);
 
-        string fileName = $"{name}_actor_{playerId}_voice_{voiceId}.ogg";
-        
-        voiceTrackInfos.Add(new VoiceTrackInfo
+        var key = (playerId, voiceId);
+
+        link.FloatFrameDecoded += (Action<FrameOut<float>>)((FrameOut<float> frame) =>
         {
-            ActorId = playerId,
-            FileName = fileName,
-            StartTime = Time.time
-        });
+            if (!isRecording)
+                return;
+            
+            if (!writers.TryGetValue(key, out var writer))
+            {
+                string fileName = $"{name}_actor_{playerId}_voice_{voiceId}_{Time.frameCount}.wav";
+                string path = Path.Combine(TempVoiceDir, fileName);
 
-        string path = Path.Combine(
-            tempVoiceDir,
-            fileName
-        );
+                writer = new VoiceStreamWriter(
+                    playerId,
+                    link.VoiceInfo.SamplingRate,
+                    link.VoiceInfo.Channels,
+                    path
+                );
 
-        var writer = new VoiceStreamWriter(
-            playerId,
-            link.VoiceInfo.SamplingRate,
-            link.VoiceInfo.Channels,
-            path
-        );
+                writers[key] = writer;
 
-        var key = (playerId, voiceId);
-        writers[key] = writer;
+                VoiceTrackInfos.Add(new VoiceTrackInfo(
+                    playerId,
+                    fileName,
+                    Time.time
+                ));
 
-        link.FloatFrameDecoded += (Il2CppSystem.Action<FrameOut<float>>)((FrameOut<float> frame) =>
-        {
-            if (!writers.TryGetValue(key, out var w))
-                return;
+                MelonLogger.Msg($"VoiceClipStart actor={playerId} voice={voiceId}");
+            }
 
-            w.Write(frame.Buf);
+            writer.Write(frame.Buf);
 
             if (frame.EndOfStream)
+            {
+                MelonLogger.Msg($"VoiceClipEnd actor={playerId} voice={voiceId}");
                 StopWriter(key);
+            }
         });
 
-        link.RemoteVoiceRemoved += (Il2CppSystem.Action)(() =>
+        link.RemoteVoiceRemoved += (Action)(() =>
         {
+            MelonLogger.Msg($"VoiceRemoved actor={playerId} voice={voiceId}");
             StopWriter(key);
         });
     }
 
+    public static void StopRecording()
+    {
+        isRecording = false;
+        
+        foreach (var key in writers.Keys.ToList())
+            StopWriter(key);
+
+        MergeVoiceClips();
+
+        VoiceTrackInfos.Clear();
+    }
+
+    private static void MergeVoiceClips()
+    {
+        if (VoiceTrackInfos.Count == 0)
+            return;
+
+        var groups = VoiceTrackInfos.GroupBy(v => v.ActorId);
+
+        foreach (var group in groups)
+        {
+            var sorted = group.OrderBy(v => v.StartTime).ToList();
+            
+            string outputPath = Path.Combine(TempVoiceDir, $"actor_{group.Key}_merged.wav");
+
+            int sampleRate = 48000;
+            int channels = 1;
+
+            using var output = new WaveFileWriter(
+                outputPath,
+                WaveFormat.CreateIeeeFloatWaveFormat(sampleRate, channels)
+            );
+
+            float lastTime = sorted[0].StartTime;
+
+            foreach (var clip in sorted)
+            {
+                string path = Path.Combine(TempVoiceDir, clip.FileName);
+
+                if (!File.Exists(path))
+                    continue;
+            
+                using var reader = new WaveFileReader(path);
+
+                float gap = clip.StartTime - lastTime;
+
+                if (gap > 0)
+                {
+                    int silentSamples = (int)(gap * sampleRate);
+                    float[] silence = new float[silentSamples];
+                    output.WriteSamples(silence, 0, silence.Length);
+                }
+            
+                var sampleProvider = reader.ToSampleProvider();
+                float[] buffer = new float[sampleRate];
+
+                int read;
+                while ((read = sampleProvider.Read(buffer, 0, buffer.Length)) > 0)
+                {
+                    output.WriteSamples(buffer, 0, read);
+                }
+
+                lastTime = clip.StartTime + (float)reader.TotalTime.TotalSeconds;
+            }
+        }
+    }
+
     private static void StopWriter((int playerId, int voiceId) key)
     {
         if (!writers.Remove(key, out var writer))
@@ -103,8 +195,8 @@ public class VoiceStreamWriter
         public readonly string Path;
         public bool HasFrames { get; private set; }
 
-        private readonly FileStream file;
-        // private readonly OpusOggWriteStream ogg;
+        private readonly FileStream fileStream;
+        private readonly WaveFileWriter wav;
 
         public VoiceStreamWriter(
             int actorId,
@@ -116,21 +208,11 @@ string path
             ActorId = actorId;
             Path = path;
 
-            file = File.Create(path);
-            
-            // Causes system.runtime error
-            // var encoder = new OpusEncoder(
-            //     sampleRate,
-            //     channels,
-            //     OpusApplication.OPUS_APPLICATION_VOIP
-            // );
-            
-            // encoder.Bitrate = 24000;
-            // encoder.UseVBR = true;
-            // encoder.UseDTX = true;
-            // encoder.Complexity = 6;
-            //
-            // ogg = new OpusOggWriteStream(encoder, file);
+            fileStream = File.Create(path);
+            wav = new WaveFileWriter(
+                fileStream,
+                WaveFormat.CreateIeeeFloatWaveFormat(sampleRate, channels)
+            );
         }
 
         public void Write(float[] samples)
@@ -139,13 +221,13 @@ public void Write(float[] samples)
                 return;
 
             HasFrames = true;
-            // ogg.WriteSamples(samples, 0, samples.Length);
+            wav.WriteSamples(samples, 0, samples.Length);
         }
 
         public void Dispose()
         {
-            // ogg.Finish();
-            file?.Dispose();
+            wav.Dispose();
+            fileStream?.Dispose();
         }
     }
 }

src/Replay/ReplayVoices.cs

@@ -942,7 +942,7 @@ static EventChunk ReadEventChunk(BinaryReader br)
                     case EventField.rotation: e.rotation = r.ReadQuaternion(); break;
                     case EventField.masterId: e.masterId = r.ReadString(); break;
                     case EventField.playerIndex: e.playerIndex = r.ReadInt32(); break;
-                    case EventField.damage: e.damage = r.ReadInt32(); break;
+                    case EventField.damage: e.damage = r.ReadByte(); break;
                     case EventField.fxType: e.fxType = (FXOneShotType)r.ReadByte(); break;
                     case EventField.structureId: e.structureId = r.ReadInt32(); break;
                 }
@@ -1249,6 +1249,17 @@ public enum PlayerShiftstoneVFX : byte
 [Serializable]
 public class VoiceTrackInfo
 {
+    public VoiceTrackInfo(
+        int ActorId,
+        string FileName,
+        float StartTime
+    )
+    {
+        this.ActorId = ActorId;
+        this.FileName = FileName;
+        this.StartTime = StartTime;
+    }
+    
     public int ActorId;
     public string FileName;
     public float StartTime;
@@ -1309,7 +1320,7 @@ public class EventChunk
     public int structureId = -1;
 
     // Damage HitMarker
-    public int damage;
+    public byte damage;
 
     // FX
     public FXOneShotType fxType;