From b6789443ce038f70c49dbd0610ff190cefae26a4 Mon Sep 17 00:00:00 2001 From: KillzXGaming Date: Fri, 28 Oct 2022 20:09:47 -0400 Subject: [PATCH] Some more pak and model fixes --- File_Format_Library/FileFormats/DKCTF/FileData/CMDL.cs | 3 ++- File_Format_Library/FileFormats/DKCTF/PAK.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/File_Format_Library/FileFormats/DKCTF/FileData/CMDL.cs b/File_Format_Library/FileFormats/DKCTF/FileData/CMDL.cs index a7cb096a..81358267 100644 --- a/File_Format_Library/FileFormats/DKCTF/FileData/CMDL.cs +++ b/File_Format_Library/FileFormats/DKCTF/FileData/CMDL.cs @@ -38,7 +38,8 @@ namespace DKCTF /// Determines which variant of the file to parse. Switch reads strings and materials differently. /// bool IsSwitch => this.FileHeader.FormType == "SMDL" && this.FileHeader.VersionA >= 0x3A || - this.FileHeader.FormType == "CMDL" && this.FileHeader.VersionA >= 0x35; + this.FileHeader.FormType == "CMDL" && this.FileHeader.VersionA >= 0x35 || + this.FileHeader.FormType == "WMDL" && this.FileHeader.VersionA >= 0x36; /// /// The meta data header for parsing gpu buffers and decompressing. diff --git a/File_Format_Library/FileFormats/DKCTF/PAK.cs b/File_Format_Library/FileFormats/DKCTF/PAK.cs index 9ccfe96c..f1eb3e5f 100644 --- a/File_Format_Library/FileFormats/DKCTF/PAK.cs +++ b/File_Format_Library/FileFormats/DKCTF/PAK.cs @@ -98,7 +98,8 @@ namespace DKCTF foreach (var c in CharFiles) { - SkeletonFiles[c.Value.SkeletonFileID.ToString()].FileName = $"Characters/{c.Value.Name}/Models/{c.Value.SkeletonFileID}.skel"; + if (SkeletonFiles.ContainsKey(c.Value.SkeletonFileID.ToString())) + SkeletonFiles[c.Value.SkeletonFileID.ToString()].FileName = $"Characters/{c.Value.Name}/Models/{c.Value.SkeletonFileID}.skel"; foreach (var m in c.Value.Models) {