Parse more stats chunks

WarthogInc/BlfChunks/Author.cs

@@ -65,7 +65,7 @@ public void WriteChunk(ref BitStream<StreamByteStream> hoppersStream)
             }
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             var buildNameBytes = new byte[16];
             var buildNameLen = -1;

WarthogInc/BlfChunks/BLFChunkReader.cs

@@ -12,7 +12,14 @@ namespace SunriseBlfTool.BlfChunks
 {
     public class BLFChunkReader
     {
-        public IBLFChunk ReadChunk(ref BitStream<StreamByteStream> outputStream, AbstractBlfChunkNameMap chunkNameMap)
+        AbstractBlfChunkNameMap chunkNameMap;
+
+        public BLFChunkReader(AbstractBlfChunkNameMap chunkNameMap)
+        {
+            this.chunkNameMap = chunkNameMap;
+        }
+
+        public IBLFChunk ReadChunk(ref BitStream<StreamByteStream> outputStream)
         {
             int chunkStartOffset = outputStream.ByteOffset;
             BLFChunkHeader header = new BLFChunkHeader();
@@ -24,7 +31,7 @@ public IBLFChunk ReadChunk(ref BitStream<StreamByteStream> outputStream, Abstrac
             try
             {
                 IBLFChunk chunk = chunkNameMap.GetChunk(header.blfChunkName);
-                chunk.ReadChunk(ref outputStream);
+                chunk.ReadChunk(ref outputStream, this);
 
                 // In case the full chunk isn't read (perhaps it's zero-padded), we ensure we're moved on to the next chunk.
                 outputStream.Seek(chunkStartOffset + (int)header.chunkLength);

WarthogInc/BlfChunks/ChunkNameMaps/Halo3/BlfChunkNameMap12070.cs

@@ -38,8 +38,12 @@ private void RegisterChunks()
             RegisterChunk<MachineNetworkStatistics>();
             RegisterChunk<MessageOfTheDay>();
             RegisterChunk<MultiplayerPlayers>();
+            RegisterChunk<MultiplayerPlayerStatistics>();
+            RegisterChunk<MultiplayerPlayerVsPlayerStatistics>();
+            RegisterChunk<MultiplayerTeamStatistics>();
             RegisterChunk<MultiplayerTeams>();
             RegisterChunk<MatchmakingOptions>();
+            RegisterChunk<Parent>();
         }
 
         public override string GetVersion()

WarthogInc/BlfChunks/ContentHeader.cs

@@ -100,7 +100,7 @@ public void WriteChunk(ref BitStream<StreamByteStream> hoppersStream)
             hoppersStream.WriteLong(gameId, 64);
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             buildNumber = hoppersStream.Read<short>(16);
             mapVersion = hoppersStream.Read<short>(16);

WarthogInc/BlfChunks/EndOfFile.cs

@@ -37,7 +37,7 @@ public void WriteChunk(ref BitStream<StreamByteStream> hoppersStream)
             //hoppersStream.Seek(hoppersStream.NextByteIndex);
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             lengthUpToEOF = hoppersStream.Read<int>(32);
             unknown = hoppersStream.Read<byte>(8);

WarthogInc/BlfChunks/FileQueue.cs

@@ -36,7 +36,7 @@ public ushort GetVersion()
             return 1;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             throw new NotImplementedException();
         }

WarthogInc/BlfChunks/GameSet1.cs

@@ -55,7 +55,7 @@ public ushort GetVersion()
             return 1;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             throw new NotImplementedException();
         }

WarthogInc/BlfChunks/GameSet15.cs

@@ -77,7 +77,7 @@ private void WriteCompressedHopperData(ref BitStream<StreamByteStream> hoppersSt
             hoppersStream.SeekRelative(compressedHopperTableLength + 4);
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             var decompressedStream = ReadCompressedHopperData(ref hoppersStream);
 

WarthogInc/BlfChunks/GameSet2.cs

@@ -55,7 +55,7 @@ public ushort GetVersion()
             return 2;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             throw new NotImplementedException();
         }

WarthogInc/BlfChunks/GameSet3.cs

@@ -56,7 +56,7 @@ public ushort GetVersion()
             return 3;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             throw new NotImplementedException();
         }

WarthogInc/BlfChunks/GameSet6.cs

@@ -39,7 +39,7 @@ public ushort GetVersion()
             return 6;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             byte gameEntryCount = hoppersStream.Read<byte>(6);
             gameEntries = new GameEntry[gameEntryCount];

WarthogInc/BlfChunks/GameVariant.cs

@@ -94,7 +94,7 @@ public ushort GetVersion()
             return 3;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             throw new NotImplementedException();
 

WarthogInc/BlfChunks/HopperConfigurationTable11.cs

@@ -43,7 +43,7 @@ public ushort GetVersion()
             return 11;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             byte categoryCount = hoppersStream.Read<byte>(3);
             categories = new HopperCategory[categoryCount];

WarthogInc/BlfChunks/HopperConfigurationTable2.cs

@@ -175,7 +175,7 @@ public ushort GetVersion()
             return 2;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             throw new NotImplementedException();
         }

WarthogInc/BlfChunks/HopperConfigurationTable27.cs

@@ -80,7 +80,7 @@ private void WriteCompressedHopperData(ref BitStream<StreamByteStream> hoppersSt
             hoppersStream.SeekRelative(compressedHopperTableLength + 4);
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             var decompressedStream = ReadCompressedHopperData(ref hoppersStream);
 

WarthogInc/BlfChunks/HopperConfigurationTable8.cs

@@ -217,7 +217,7 @@ public ushort GetVersion()
             return 8;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             throw new NotImplementedException();
         }

WarthogInc/BlfChunks/HopperConfigurationTable9.cs

@@ -220,7 +220,7 @@ public ushort GetVersion()
             return 9;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             throw new NotImplementedException();
         }

WarthogInc/BlfChunks/IBLFChunk.cs

@@ -15,6 +15,6 @@ public interface IBLFChunk
         public string GetName();
         public uint GetLength();
         public void WriteChunk(ref BitStream<StreamByteStream> hoppersStream);
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream);
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader);
     }
 }

WarthogInc/BlfChunks/MachineNetworkStatistics.cs

@@ -54,7 +54,7 @@ public ushort GetVersion()
             return 1;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             throw new NotImplementedException();
         }

WarthogInc/BlfChunks/Manifest.cs

@@ -49,7 +49,7 @@ public void SetFileHash(string filePath, byte[] hash)
             }
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             int fileCount = hoppersStream.Read<int>(32);
             files = new FileEntry[fileCount];

WarthogInc/BlfChunks/Manifest_PC.cs

@@ -50,7 +50,7 @@ public void SetFileHash(string filePath, byte[] hash)
             }
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             throw new NotImplementedException();
         }

WarthogInc/BlfChunks/MapManifest.cs

@@ -37,7 +37,7 @@ public ushort GetVersion()
             return 1;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             int mapCount = hoppersStream.Read<int>(32);
             mapRSAs = new MapEntry[mapCount];

WarthogInc/BlfChunks/MapVariant.cs

@@ -84,7 +84,7 @@ public ushort GetVersion()
             return 12;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             metadata = new BaseGameVariant.VariantMetadata(ref hoppersStream);
             mapVariantVersion = hoppersStream.Read<short>(16);

WarthogInc/BlfChunks/MatchmakingBanhammerMessages.cs

@@ -37,7 +37,7 @@ public ushort GetVersion()
             return 1;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             int tipCount = hoppersStream.Read<int>(32);
             messages = new string[tipCount];

WarthogInc/BlfChunks/MatchmakingHopperDescriptions1.cs

@@ -49,7 +49,7 @@ public ushort GetVersion()
             return 1;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             throw new NotImplementedException();
         }

WarthogInc/BlfChunks/MatchmakingHopperDescriptions2.cs

@@ -49,7 +49,7 @@ public ushort GetVersion()
             return 2;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             throw new NotImplementedException();
         }

WarthogInc/BlfChunks/MatchmakingHopperDescriptions3.cs

@@ -39,7 +39,7 @@ public ushort GetVersion()
             return 3;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             byte descriptionCount = hoppersStream.Read<byte>(6);
             descriptions = new HopperDescription[descriptionCount];

WarthogInc/BlfChunks/MatchmakingHopperStatistics.cs

@@ -36,7 +36,7 @@ public ushort GetVersion()
             return 3;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             totalPlayers = hoppersStream.Read<uint>(32);
             statistics = new HopperPopulation[32];

WarthogInc/BlfChunks/MatchmakingHopperStatistics_PC.cs

@@ -45,7 +45,7 @@ public ushort GetVersion()
             return 3;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             totalPlayers = hoppersStream.Read<uint>(32);
             statistics = new HopperPopulation[32];

WarthogInc/BlfChunks/MatchmakingOptions.cs

@@ -2,6 +2,7 @@
 using Newtonsoft.Json.Converters;
 using Sewer56.BitStream;
 using Sewer56.BitStream.ByteStreams;
+using SunriseBlfTool.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,11 +18,11 @@ public class MatchmakingOptions : IBLFChunk
         public bool isRanked;
         public bool teamsEnabled;
         public string hopperName;
-        public ulong drawProbability;
-        public ulong beta;
-        public ulong tau;
-        public ulong expBaseIncrement;
-        public ulong expPenaltyDecrement;
+        public int drawProbability;
+        public float beta;
+        public float tau;
+        public int expBaseIncrement;
+        public int expPenaltyDecrement;
 
         public ushort GetAuthentication()
         {
@@ -43,28 +44,32 @@ public uint GetLength()
             return 0x5C;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
-            Console.ForegroundColor = ConsoleColor.DarkYellow;
-            Console.WriteLine("Warning: mpmo chunk definition is incomplete.");
-            Console.ResetColor();
-
             hopperIdentifier = hoppersStream.Read<ushort>(16);
 
             LinkedList<byte> nameBytes = new LinkedList<byte>();
-            for (int si = 0; si < 16; si++)
+            for (int si = 0; si < 32; si++)
             {
                 byte left = hoppersStream.Read<byte>(8);
                 byte right = hoppersStream.Read<byte>(8);
-                if (((left == 0 && right == 0) || si == 16) && hopperName == null)
+                if (((left == 0 && right == 0) || si == 32) && hopperName == null)
                 {
                     hopperName = Encoding.BigEndianUnicode.GetString(nameBytes.ToArray());
                 }
                 nameBytes.AddLast(left);
                 nameBytes.AddLast(right);
             }
 
-            hoppersStream.SeekRelative(0x3A);
+            isRanked = hoppersStream.Read<byte>(8) > 0;
+            teamsEnabled = hoppersStream.Read<byte>(8) > 0;
+            xLastIndex = hoppersStream.Read<byte>(8);
+            drawProbability = hoppersStream.Read<int>(32);
+            beta = hoppersStream.ReadFloat(32);
+            tau = hoppersStream.ReadFloat(32);
+            expBaseIncrement = hoppersStream.Read<int>(32);
+            expPenaltyDecrement = hoppersStream.Read<int>(32);
+
         }
         public void WriteChunk(ref BitStream<StreamByteStream> hoppersStream)
         {

WarthogInc/BlfChunks/MatchmakingTips.cs

@@ -37,7 +37,7 @@ public ushort GetVersion()
             return 1;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             int tipCount = hoppersStream.Read<int>(32);
             tips = new string[tipCount];

WarthogInc/BlfChunks/MessageOfTheDay.cs

@@ -35,7 +35,7 @@ public ushort GetVersion()
             return 1;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             uint motdLength = hoppersStream.Read<uint>(32);
             byte[] motdBytes = new byte[motdLength];

WarthogInc/BlfChunks/MessageOfTheDayPopup.cs

@@ -57,7 +57,7 @@ public ushort GetVersion()
             return 4;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             motdIdentifier = hoppersStream.Read<uint>(32);
             acceptWaitMilliseconds = hoppersStream.Read<uint>(32);

WarthogInc/BlfChunks/MessageOfTheDayPopup_PC.cs

@@ -64,7 +64,7 @@ public ushort GetVersion()
             return 4;
         }
 
-        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream)
+        public void ReadChunk(ref BitStream<StreamByteStream> hoppersStream, BLFChunkReader reader)
         {
             throw new NotImplementedException();
         }