fenris: updates

Author: neptuwunium

TACTLib/Core/Product/Fenris/CoreTOC.cs

@@ -10,36 +10,44 @@ namespace TACTLib.Core.Product.Fenris;
 
 public class CoreTOC {
     [StructLayout(LayoutKind.Sequential, Pack = 1, Size = 0xC)]
-    public struct TOCEntry {
+    public record struct TOCEntry {
         public SnoHandle Sno;
         public int NameOffset;
     }
 
     public int[] GroupCounts { get; }
     public int[] GroupOffsets { get; }
     public int[] GroupCounts2 { get; }
+    public uint[] GroupFormats { get; }
     public uint PrimaryId { get; }
-    public Dictionary<SnoHandle, string> Files { get; } = new();
+    public Dictionary<SnoHandle, string> Files { get; } = [];
 
     public CoreTOC(Stream? stream, EncryptedSnos encrypted) {
         using var _ = new PerfCounter("CoreTOC::cctor`Stream`EncryptedSnos");
         if (stream == null) {
             throw new ArgumentNullException(nameof(stream));
         }
 
+        var magic = stream.Read<uint>();
+        var isNew = magic == 0xBCDE6611;
+        if (!isNew) {
+            stream.Position = 0;
+        }
+
         var count = stream.Read<int>();
         GroupCounts = stream.ReadArray<int>(count);
         GroupOffsets = stream.ReadArray<int>(count);
         GroupCounts2 = stream.ReadArray<int>(count);
+        GroupFormats = isNew ? stream.ReadArray<uint>(count) : [];
 
         PrimaryId = stream.Read<uint>();
 
         var baseOffset = stream.Position;
 
-        Span<byte> stringBuffer = stackalloc byte[0xFF];
+        Span<byte> stringBuffer = stackalloc byte[0x1FF];
         for (var i = 0; i < count; ++i) {
             // I'm assuming that GroupCounts2 is the count but with replaced files included.
-            Debug.Assert(GroupCounts[i] == GroupCounts2[i], "GroupCounts[i] == GroupCounts2[i]");
+            Debug.Assert(GroupCounts[i] == GroupCounts2[i]);
             stream.Position = baseOffset + GroupOffsets[i];
 
             var stringOffset = baseOffset + GroupOffsets[i] + 0xC * GroupCounts[i];

TACTLib/Core/Product/Fenris/EncryptedNameDict.cs

@@ -7,7 +7,7 @@
 namespace TACTLib.Core.Product.Fenris;
 
 public class EncryptedNameDict {
-    public Dictionary<SnoHandle, string> Files { get; } = new();
+    public Dictionary<SnoHandle, string> Files { get; } = [];
 
     public EncryptedNameDict(Stream stream) {
         var magic = stream.Read<uint>();

TACTLib/Core/Product/Fenris/EncryptedSnos.cs

@@ -9,18 +9,18 @@ namespace TACTLib.Core.Product.Fenris;
 
 public class EncryptedSnos {
     [StructLayout(LayoutKind.Sequential, Pack = 1, Size = 0x10)]
-    public struct EncryptedSno {
+    public record struct EncryptedSno {
         public SnoHandle Sno;
         public ulong KeyId;
     }
 
     public EncryptedSno[] Entries { get; }
-    public Dictionary<SnoHandle, ulong> Lookup = new();
+    public Dictionary<SnoHandle, ulong> Lookup = [];
 
     public EncryptedSnos(Stream? stream) {
         using var _ = new PerfCounter("EncryptedSnos::cctor`Stream");
         if (stream == null) {
-            Entries = Array.Empty<EncryptedSno>();
+            Entries = [];
             return;
         }
 

TACTLib/Core/Product/Fenris/ProductHandler_Fenris.cs

@@ -21,7 +21,7 @@ public class ProductHandler_Fenris : IProductHandler {
     public ReplacedSnos ReplacedSnos { get; }
     public SharedPayloadsMapping SharedPayloads { get; }
     public CoreTOC TOC { get; }
-    public Dictionary<ulong, EncryptedNameDict> EncryptedNameDicts = new();
+    public Dictionary<ulong, EncryptedNameDict> EncryptedNameDicts = [];
 
 #endregion
 
@@ -166,6 +166,23 @@ private void LoadLocale() {
         return null;
     }
 
+    public SnoHandle LocateHandle(uint id) {
+        // i assume if replacedId is zero then it's deleted
+        if (ReplacedSnos.Lookup.TryGetValue(id, out var replacedId)) {
+            id = replacedId;
+        }
+
+        if (id is 0 or uint.MaxValue) { // 0 = null
+            if (LogLevel >= 1) {
+                Logger.Debug("Fenris", $"{id} is deleted");
+            }
+
+            return SnoHandle.Invalid;
+        }
+
+        return TOC.Files.Keys.FirstOrDefault(file => file.Id == id, SnoHandle.Invalid);
+    }
+
     // logLevel 2 logs reads, logLevel 1 logs missing.
     public Stream? OpenFile(uint id, SnoType type, uint subId = 0, bool waterfall = true) {
         // i assume if replacedId is zero then it's deleted

TACTLib/Core/Product/Fenris/ReplacedSnos.cs

@@ -16,12 +16,12 @@ public struct ReplacedSno {
     }
 
     public ReplacedSno[] Entries { get; }
-    public Dictionary<uint, uint> Lookup = new();
+    public Dictionary<uint, uint> Lookup = [];
 
     public ReplacedSnos(Stream? stream) {
         using var _ = new PerfCounter("ReplacedSnos::cctor`Stream");
         if (stream == null) {
-            Entries = Array.Empty<ReplacedSno>();
+            Entries = [];
             return;
         }
 

TACTLib/Core/Product/Fenris/SharedPayloadsMapping.cs

@@ -5,8 +5,8 @@
 namespace TACTLib.Core.Product.Fenris;
 
 public class SharedPayloadsMapping {
-    public Dictionary<uint, uint> SharedPayloads { get; set; } = new();
-    public Dictionary<SnoChild, SnoChild> SharedChildren { get; set; } = new();
+    public Dictionary<uint, uint> SharedPayloads { get; set; } = [];
+    public Dictionary<SnoChild, SnoChild> SharedChildren { get; set; } = [];
 
     public SharedPayloadsMapping(Stream? stream) {
         using var _ = new PerfCounter("SharedPayloadsMapping::cctor`Stream");

TACTLib/Core/Product/Fenris/SnoChild.cs

@@ -3,7 +3,7 @@
 namespace TACTLib.Core.Product.Fenris;
 
 [StructLayout(LayoutKind.Sequential, Pack = 1, Size = 0x8)]
-public struct SnoChild {
+public record struct SnoChild {
     public uint SnoId;
     public uint SubId;
 }

TACTLib/Core/Product/Fenris/SnoHandle.cs

@@ -3,7 +3,9 @@
 namespace TACTLib.Core.Product.Fenris;
 
 [StructLayout(LayoutKind.Sequential, Pack = 1, Size = 0x8)]
-public struct SnoHandle {
+public record struct SnoHandle {
     public uint Group; // 0xFFFFFFFF if none
     public uint Id; // 0 if none
-}
+    public static SnoHandle Invalid { get; } = new() { Group = uint.MaxValue };
+    public bool IsInvalid => Group == uint.MaxValue && Id == 0;
+}

TACTLib/Core/Product/Fenris/SnoManifest.cs

@@ -13,17 +13,20 @@ public enum SnoManifestRole {
 }
 
 public class SnoManifest {
-
     public Locale Locale { get; set; }
     public SnoManifestRole Role { get; set; }
     public HashSet<uint> SnoIds { get; }
+    public HashSet<uint> SnoIds2 { get; }
     public HashSet<SnoChild> ChildIds { get; }
+    public HashSet<SnoChild> ChildIds2 { get; }
 
     public SnoManifest(Stream? stream) { // used to assist lookups, i think.
         using var _ = new PerfCounter("SnoManifest::cctor`Stream");
         if (stream == null) {
-            SnoIds = new HashSet<uint>();
-            ChildIds = new HashSet<SnoChild>();
+            SnoIds = [];
+            ChildIds = [];
+            SnoIds2 = [];
+            ChildIds2 = [];
             return;
         }
 
@@ -39,13 +42,30 @@ public SnoManifest(Stream? stream) { // used to assist lookups, i think.
         count = stream.Read<int>();
         var childIds = stream.ReadArray<SnoChild>(count);
         ChildIds = new HashSet<SnoChild>(childIds);
+
+        if (stream.Position == stream.Length) {
+            SnoIds2 = [];
+            ChildIds2 = [];
+            return;
+        }
+
+        count = stream.Read<int>();
+        var childIds2 = stream.ReadArray<SnoChild>(count);
+        ChildIds2 = new HashSet<SnoChild>(childIds2);
+
+        count = stream.Read<int>();
+        var snoIds2 = stream.ReadArray<uint>(count);
+        SnoIds2 = new HashSet<uint>(snoIds2);
     }
 
     public bool ContainsChild(uint id, uint subId) =>
-        ChildIds.Contains(new SnoChild() {
+        ChildIds.Contains(new SnoChild {
+            SnoId = id,
+            SubId = subId,
+        }) || ChildIds2.Contains(new SnoChild {
             SnoId = id,
             SubId = subId,
         });
 
-    public bool Contains(uint id) => SnoIds.Contains(id);
+    public bool Contains(uint id) => SnoIds.Contains(id) || SnoIds2.Contains(id);
 }