diff --git a/FreeMote.PsBuild/Properties/AssemblyInfo.cs b/FreeMote.PsBuild/Properties/AssemblyInfo.cs index ffc4b91..6ef4f57 100644 --- a/FreeMote.PsBuild/Properties/AssemblyInfo.cs +++ b/FreeMote.PsBuild/Properties/AssemblyInfo.cs @@ -18,5 +18,5 @@ [assembly: InternalsVisibleTo("FreeMote.Editor")] // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.2.1.0")] -[assembly: AssemblyFileVersion("3.2.1.0")] \ No newline at end of file +[assembly: AssemblyVersion("3.3.0.0")] +[assembly: AssemblyFileVersion("3.3.0.0")] \ No newline at end of file diff --git a/FreeMote.PsBuild/PsbCompiler.cs b/FreeMote.PsBuild/PsbCompiler.cs index c1f510c..68d8f96 100644 --- a/FreeMote.PsBuild/PsbCompiler.cs +++ b/FreeMote.PsBuild/PsbCompiler.cs @@ -244,7 +244,7 @@ public static (PSB Psb, Dictionary Context) LoadPsbAndContextFro psb.Link(resx, baseDir); } - if (resx.Platform != null) + if (resx.Platform != null && resx.Platform != PsbSpec.none) { psb.SwitchSpec(resx.Platform.Value, resx.Platform.Value.DefaultPixelFormat()); } diff --git a/FreeMote.Psb/Properties/AssemblyInfo.cs b/FreeMote.Psb/Properties/AssemblyInfo.cs index 752a01d..12efc70 100644 --- a/FreeMote.Psb/Properties/AssemblyInfo.cs +++ b/FreeMote.Psb/Properties/AssemblyInfo.cs @@ -21,5 +21,5 @@ [assembly: InternalsVisibleTo("FreeMote.Editor")] // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.2.1.0")] -[assembly: AssemblyFileVersion("3.2.1.0")] +[assembly: AssemblyVersion("3.3.0.0")] +[assembly: AssemblyFileVersion("3.3.0.0")] diff --git a/FreeMote.Psb/Types/ArchiveType.cs b/FreeMote.Psb/Types/ArchiveType.cs index a5db244..d40e474 100644 --- a/FreeMote.Psb/Types/ArchiveType.cs +++ b/FreeMote.Psb/Types/ArchiveType.cs @@ -8,7 +8,7 @@ class ArchiveType : IPsbType public PsbType PsbType => PsbType.ArchiveInfo; public bool IsThisType(PSB psb) { - return psb.TypeId == "archive"; //&& psb.Objects.ContainsKey("file_info") + return psb.TypeId == "archive" || (psb.TypeId == "scenario" && psb.Objects.ContainsKey("file_info")); //&& psb.Objects.ContainsKey("file_info") } public List CollectResources(PSB psb, bool deDuplication = true) where T : IResourceMetadata diff --git a/FreeMote.Tools.PsBuild/Program.cs b/FreeMote.Tools.PsBuild/Program.cs index b6f3570..fdbc1e6 100644 --- a/FreeMote.Tools.PsBuild/Program.cs +++ b/FreeMote.Tools.PsBuild/Program.cs @@ -428,8 +428,7 @@ public static void PackArchive(string jsonPath, string key, bool intersect, bool PSB infoPsb = PsbCompiler.LoadPsbFromJsonFile(jsonPath); if (infoPsb.Type != PsbType.ArchiveInfo) { - Console.WriteLine("Json is not an ArchiveInfo PSB."); - return; + Console.WriteLine($"[WARN] The json ({infoPsb.Type}) seems not to be an ArchiveInfo type."); } var archiveInfoType = infoPsb.GetArchiveInfoType(); diff --git a/FreeMote.Tools.PsBuild/Properties/AssemblyInfo.cs b/FreeMote.Tools.PsBuild/Properties/AssemblyInfo.cs index 1713068..1c14b94 100644 --- a/FreeMote.Tools.PsBuild/Properties/AssemblyInfo.cs +++ b/FreeMote.Tools.PsBuild/Properties/AssemblyInfo.cs @@ -14,5 +14,5 @@ [assembly: Guid("d877dbdb-41d7-4c6f-9a46-957cecdaefa8")] -[assembly: AssemblyVersion("3.2.1.0")] -[assembly: AssemblyFileVersion("3.2.1.0")] +[assembly: AssemblyVersion("3.3.0.0")] +[assembly: AssemblyFileVersion("3.3.0.0")] diff --git a/FreeMote.Tools.PsbDecompile/Program.cs b/FreeMote.Tools.PsbDecompile/Program.cs index 5cc5148..40141fc 100644 --- a/FreeMote.Tools.PsbDecompile/Program.cs +++ b/FreeMote.Tools.PsbDecompile/Program.cs @@ -558,6 +558,9 @@ static void ExtractArchive(string filePath, string key, Dictionary