consider "id": "scenario" (wtf) as archive PSB #82

UlyssesWu · Jun 9, 2022 · 75a54c3 · 75a54c3
1 parent 766d116
commit 75a54c3
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 13 deletions.
diff --git 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")]
+[assembly: AssemblyVersion("3.3.0.0")]
+[assembly: AssemblyFileVersion("3.3.0.0")]
diff --git a/FreeMote.PsBuild/PsbCompiler.cs b/FreeMote.PsBuild/PsbCompiler.cs
@@ -244,7 +244,7 @@ public static (PSB Psb, Dictionary<string, object> 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
@@ -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
@@ -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<T> CollectResources<T>(PSB psb, bool deDuplication = true) where T : IResourceMetadata

diff --git 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
@@ -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
@@ -558,6 +558,9 @@ static void ExtractArchive(string filePath, string key, Dictionary<string, objec
                         return;
                     }
 
+                    //Maybe PSB is not identified as ArchiveInfo, but since we have tested it with GetArchiveInfoType,
+                    //we just set it here.
+                    resx.PsbType = PsbType.ArchiveInfo;
                     var dic = psb.Objects[archiveInfoType.GetRootKey()] as PsbDictionary;
                     var suffixList = (PsbList) psb.Objects["expire_suffix_list"];
                     var suffix = "";

diff --git a/FreeMote.Tools.PsbDecompile/Properties/AssemblyInfo.cs b/FreeMote.Tools.PsbDecompile/Properties/AssemblyInfo.cs
@@ -14,5 +14,5 @@
 
 [assembly: Guid("943fe440-32bb-4caf-a1da-5f38de7f9b92")]
 
-[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/FreeMoteExtension.cs b/FreeMote/FreeMoteExtension.cs
@@ -255,7 +255,7 @@ public static string DefaultTypeId(this PsbType type)
             {
                 case PsbType.Tachie:
                     return "image";
-                case PsbType.ArchiveInfo:
+                case PsbType.ArchiveInfo: //could also be "scenario"
                     return "archive";
                 case PsbType.BmpFont:
                     return "font";