Add support "Ore no Hitomi de Maruhadaka! Fukachi na Mirai to Misukasu Vision"

Bug: path not resolved before file check

ArcFormats/Emote/ImageDREF.cs

@@ -73,10 +73,9 @@ namespace GameRes.Formats.Emote
                     var match = PathRe.Match (line);
                     if (!match.Success)
                         return null;
-                    var pak_name = match.Groups[1].Value;
+                    var pak_name = VFS.CombinePath (dir, match.Groups[1].Value);
                     if (!VFS.FileExists (pak_name))
                         return null;
-                    pak_name = VFS.CombinePath (dir, pak_name);
                     layers.Add (Tuple.Create (pak_name, match.Groups[2].Value));
                 }
                 if (0 == layers.Count)

ArcFormats/KiriKiri/CryptAlgorithms.cs

@@ -1513,4 +1513,46 @@ namespace GameRes.Formats.KiriKiri
             }
         }
     }
+
+    [Serializable]
+    public class SyangrilaSmartCrypt : ICrypt
+    {
+        byte[] GetKey (uint hash)
+        {
+            return new byte[5]
+            {
+                (byte)(hash >> 5),
+                (byte)(hash >> 5),
+                (byte)(hash >> 7),
+                (byte)(hash >> 1),
+                (byte)(hash >> 4),
+            };
+        }
+
+        public override byte Decrypt (Xp3Entry entry, long offset, byte value)
+        {
+            var key = GetKey (entry.Hash);
+            if (offset <= 0x64)
+                return (byte)(value ^ key[4]);
+            else
+                return (byte)(value ^ key[offset & 3]);
+        }
+
+        public override void Decrypt (Xp3Entry entry, long offset, byte[] buffer, int pos, int count)
+        {
+            var key = GetKey (entry.Hash);
+            for (var i = 0; i < count; i++)
+            {
+                if (offset+i <= 0x64)
+                    buffer[pos+i] ^= key[4];
+                else
+                    buffer[pos+i] ^= key[(offset+i) & 3];
+            }
+        }
+
+        public override void Encrypt (Xp3Entry entry, long offset, byte[] buffer, int pos, int count)
+        {
+            Decrypt (entry, offset, buffer, pos, count);
+        }
+    }
 }

Experimental/SakanaGL/ArcSX.cs

@@ -28,17 +28,25 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.IO;
+using System.Linq;
 using System.Text;
 
 namespace GameRes.Formats.Sakana
 {
     internal class SxEntry : PackedEntry
     {
+        public int      Storage;
         public ushort   Flags;
 
         public bool IsEncrypted  { get { return 0 == (Flags & 0x10); } }
     }
 
+    internal class SxStorage
+    {
+        public uint Size;
+        public ulong Timestamp;
+    }
+
     [Export(typeof(ArchiveFormat))]
     public class SxOpener : ArchiveFormat
     {
@@ -52,9 +60,7 @@ namespace GameRes.Formats.Sakana
         
         public override ArcFile TryOpen (ArcView file)
         {
-            var base_name = Path.GetFileName (file.Name);
-            var sx_name = base_name.Substring (0, 4) + "(00).sx";
-            sx_name = VFS.ChangeFileName (file.Name, sx_name);
+            var sx_name = FindSxName (file.Name);
             if (!VFS.FileExists (sx_name) || file.Name.Equals (sx_name, StringComparison.InvariantCultureIgnoreCase))
                 return null;
             byte[] index_data;
@@ -140,6 +146,20 @@ namespace GameRes.Formats.Sakana
                 }
             }
         }
+
+        internal static string FindSxName(string name)
+        {
+            var base_name = Path.GetFileName (name);
+            var file_name = Path.GetFileNameWithoutExtension (base_name);
+            for (var i = 1; i <= file_name.Length; i++)
+            {
+                var sx_name = file_name.Substring (0, i) + "(00).sx";
+                sx_name = VFS.ChangeFileName (name, sx_name);
+                if (VFS.FileExists (sx_name))
+                    return sx_name;
+            }
+            return name;
+        }
     }
 
     internal class SxIndexDeserializer
@@ -170,36 +190,47 @@ namespace GameRes.Formats.Sakana
             m_dir = new List<Entry> (count);
             for (int i = 0; i < count; ++i)
             {
-                m_index.ReadUInt16();
+                m_index.ReadByte();
+                int storage  = m_index.ReadByte();
                 ushort flags = Binary.BigEndian (m_index.ReadUInt16());
                 uint offset  = Binary.BigEndian (m_index.ReadUInt32());
                 uint size    = Binary.BigEndian (m_index.ReadUInt32());
                 var entry = new SxEntry {
+                    Storage = storage,
                     Flags  = flags,
                     Offset = (long)offset << 4,
                     Size   = size,
                     IsPacked = 0 != (flags & 0x03),
                 };
-                if (!entry.CheckPlacement (m_max_offset))
-                    return null;
                 m_dir.Add (entry);
             }
 
             count = Binary.BigEndian (m_index.ReadUInt16());
+            var storages = new List<SxStorage>(count);
             for (int i = 0; i < count; ++i)
             {
                 m_index.ReadUInt32();
                 m_index.ReadUInt32();
                 m_index.ReadUInt32();
-                Binary.BigEndian (m_index.ReadUInt32()); // archive body length
-                m_index.ReadUInt64();
-                m_index.Seek (16, SeekOrigin.Current); // MD5 sum
+                var storage = new SxStorage {
+                    Size = Binary.BigEndian (m_index.ReadUInt32()) << 4,
+                    Timestamp = Binary.BigEndian (m_index.ReadUInt64()),
+                };
+                storages.Add (storage);
+                m_index.Seek (16, SeekOrigin.Current); // MD5
             }
 
             count = Binary.BigEndian (m_index.ReadUInt16());
             if (count > 0)
                 m_index.Seek (count * 24, SeekOrigin.Current);
             DeserializeTree();
+            // Remove entries in other archives
+            // Note using file size as archive identification can be problematic, but faster than MD5
+            var current_storage = storages.FindIndex (s => m_max_offset == s.Size);
+            if (-1 != current_storage)
+            {
+                m_dir = m_dir.Where (e => e.CheckPlacement (m_max_offset) && (e as SxEntry).Storage == current_storage).ToList();
+            }
             return m_dir;
         }
 

GUI/App.config

@@ -100,7 +100,7 @@
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
                 <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-                <bindingRedirect oldVersion="4.0.4.1" newVersion="6.0.0.0"/>
+                <bindingRedirect oldVersion="4.0.4.1" newVersion="4.0.5.0"/>
             </dependentAssembly>
         </assemblyBinding>
     </runtime>

SchemeTool/App.config

@@ -7,7 +7,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

SchemeTool/SchemeTool.csproj

@@ -45,8 +45,8 @@
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

SchemeTool/packages.config

@@ -3,5 +3,5 @@
   <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
   <package id="System.Memory" version="4.5.4" targetFramework="net461" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net461" />
 </packages>