diff --git a/Legacy/Legacy.csproj b/Legacy/Legacy.csproj
index 784f7f8b..9a6dadf0 100644
--- a/Legacy/Legacy.csproj
+++ b/Legacy/Legacy.csproj
@@ -44,6 +44,10 @@
true
+
+ False
+ ..\packages\SharpZipLib.1.0.0-alpha2\lib\netstandard1.3\ICSharpCode.SharpZipLib.dll
+
@@ -57,13 +61,18 @@
+
+
+
+
+
@@ -82,6 +91,8 @@
+
+
@@ -102,18 +113,24 @@
+
+
+
+
+
+
diff --git a/Legacy/Witch/ArcDAT.cs b/Legacy/Witch/ArcDAT.cs
new file mode 100644
index 00000000..185a9854
--- /dev/null
+++ b/Legacy/Witch/ArcDAT.cs
@@ -0,0 +1,74 @@
+//! \file ArcDAT.cs
+//! \date 2018 Aug 19
+//! \brief Witch image archive.
+//
+// Copyright (C) 2018 by morkt
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//
+
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+
+namespace GameRes.Formats.Witch
+{
+ [Export(typeof(ArchiveFormat))]
+ public class DatOpener : ImageDataOpener
+ {
+ public override string Tag { get { return "DAT/MK"; } }
+ public override string Description { get { return "Witch resource archive"; } }
+ public override uint Signature { get { return 0x144B4D; } } // 'MK'
+ public override bool IsHierarchic { get { return false; } }
+ public override bool CanWrite { get { return false; } }
+
+ public override ArcFile TryOpen (ArcView file)
+ {
+ int count = file.View.ReadInt32 (4);
+ if (!IsSaneCount (count))
+ return null;
+
+ uint index_offset = 8;
+ var dir = new List (count);
+ for (int i = 0; i < count; ++i)
+ {
+ uint name_length = file.View.ReadUInt32 (index_offset);
+ if (0 == name_length)
+ return null;
+ var name = file.View.ReadString (index_offset+4, name_length);
+ index_offset += 4 + name_length;
+ var entry = new PcdEntry {
+ Name = name,
+ Type = "image",
+ Size = file.View.ReadUInt32 (index_offset+8),
+ Offset = file.View.ReadUInt32 (index_offset+12),
+ };
+ if (!entry.CheckPlacement (file.MaxOffset))
+ return null;
+ entry.Info = new ImageMetaData {
+ Width = file.View.ReadUInt32 (index_offset),
+ Height = file.View.ReadUInt32 (index_offset+4),
+ BPP = 8,
+ };
+ dir.Add (entry);
+ index_offset += 16;
+ }
+ return new ArcFile (file, this, dir);
+ }
+ }
+}
diff --git a/Legacy/Witch/ArcPCD.cs b/Legacy/Witch/ArcPCD.cs
new file mode 100644
index 00000000..2852d6d1
--- /dev/null
+++ b/Legacy/Witch/ArcPCD.cs
@@ -0,0 +1,176 @@
+//! \file ArcPCD.cs
+//! \date 2018 Aug 18
+//! \brief Witch image archive.
+//
+// Copyright (C) 2018 by morkt
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//
+
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.IO;
+using System.Windows.Media;
+using GameRes.Compression;
+using GameRes.Utility;
+using ICSharpCode.SharpZipLib.BZip2;
+
+// [030627][Witch] Tsurupeta
+
+namespace GameRes.Formats.Witch
+{
+ internal class PcdEntry : PackedEntry
+ {
+ public ImageMetaData Info;
+ }
+
+ [Export(typeof(ArchiveFormat))]
+ public class ImageDataOpener : ArchiveFormat
+ {
+ public override string Tag { get { return "PCD/IMAGE"; } }
+ public override string Description { get { return "Witch images archive"; } }
+ public override uint Signature { get { return 0x47414D49; } } // 'IMAGEDATE'
+ public override bool IsHierarchic { get { return true; } }
+ public override bool CanWrite { get { return false; } }
+
+ public override ArcFile TryOpen (ArcView file)
+ {
+ if (!file.View.AsciiEqual (0, "IMAGEDATE "))
+ return null;
+ int count = file.View.ReadInt32 (0xA);
+ if (!IsSaneCount (count))
+ return null;
+ long index_offset = 0xE;
+ var dir = new List (count);
+ var name_buffer = new byte[0x100];
+ for (int i = 0; i < count; ++i)
+ {
+ int left = file.View.ReadInt32 (index_offset+8);
+ int top = file.View.ReadInt32 (index_offset+0xC);
+ int right = file.View.ReadInt32 (index_offset+0x10);
+ int bottom = file.View.ReadInt32 (index_offset+0x14);
+ index_offset += 0x18;
+ int name_length = file.View.ReadInt32 (index_offset);
+ if (name_length <= 0)
+ return null;
+ if (name_length > name_buffer.Length)
+ name_buffer = new byte[name_length];
+ file.View.Read (index_offset+4, name_buffer, 0, (uint)name_length);
+ DecryptName (name_buffer, 0, name_length);
+ var name = Binary.GetCString (name_buffer, 0, name_length);
+ index_offset += 4 + name_length;
+
+ name_length = file.View.ReadInt32 (index_offset);
+ if (name_length > name_buffer.Length)
+ name_buffer = new byte[name_length];
+ file.View.Read (index_offset+4, name_buffer, 0, (uint)name_length);
+ DecryptName (name_buffer, 0, name_length);
+ var frame_name = Binary.GetCString (name_buffer, 0, name_length);
+ if (frame_name != "NO NAME")
+ {
+ frame_name = frame_name.Replace ('/', '／');
+ name = Path.Combine (name, frame_name);
+ }
+ index_offset += 4 + name_length;
+
+ var entry = new PcdEntry {
+ Name = name,
+ Type = "image",
+ Offset = file.View.ReadUInt32 (index_offset),
+ };
+ if (entry.Offset > file.MaxOffset)
+ return null;
+ entry.Info = new ImageMetaData {
+ Width = (uint)(right - left),
+ Height = (uint)(bottom - top),
+ OffsetX = left,
+ OffsetY = top,
+ BPP = 32,
+ };
+ dir.Add (entry);
+ index_offset += 4;
+ }
+ SetAdjacentEntriesSize (dir, file.MaxOffset);
+ return new ArcFile (file, this, dir);
+ }
+
+ public override Stream OpenEntry (ArcFile arc, Entry entry)
+ {
+ uint format_id = arc.File.View.ReadUInt32 (entry.Offset);
+ switch (format_id)
+ {
+ case 0: // no compression
+ return arc.File.CreateStream (entry.Offset+0x20, entry.Size-0x20);
+ case 1: // zlib
+ case 2: // bzip2
+ break;
+ default:
+ return arc.File.CreateStream (entry.Offset, entry.Size);
+ }
+ var pent = (PcdEntry)entry;
+ if (!pent.IsPacked)
+ {
+ pent.IsPacked = true;
+ pent.UnpackedSize = arc.File.View.ReadUInt32 (entry.Offset+4);
+ }
+ var input = arc.File.CreateStream (entry.Offset+0x20, entry.Size-0x20);
+ if (1 == format_id)
+ return new ZLibStream (input, CompressionMode.Decompress);
+ else
+ return new BZip2InputStream (input);
+ }
+
+ public override IImageDecoder OpenImage (ArcFile arc, Entry entry)
+ {
+ var pent = (PcdEntry)entry;
+ var input = arc.OpenBinaryEntry (entry);
+ return new PsdFormatDecoder (input, pent);
+ }
+
+ internal static void DecryptName (byte[] buffer, int pos, int length)
+ {
+ for (int i = 0; i < length; ++i)
+ buffer[pos+i] ^= 0xFF;
+ }
+
+ internal static void SetAdjacentEntriesSize (List dir, long max_offset)
+ {
+ int count = dir.Count;
+ for (int i = 1; i < count; ++i)
+ dir[i-1].Size = (uint)(dir[i].Offset - dir[i-1].Offset);
+ dir[count-1].Size = (uint)(max_offset - dir[count-1].Offset);
+ }
+ }
+
+ internal class PsdFormatDecoder : BinaryImageDecoder
+ {
+ public PsdFormatDecoder (IBinaryStream input, PcdEntry entry) : base (input, entry.Info)
+ {
+ }
+
+ protected override ImageData GetImageData ()
+ {
+ int bpp = Info.BPP / 8;
+ int stride = (int)Info.Width * bpp;
+ var pixels = m_input.ReadBytes (stride * (int)Info.Height);
+ PixelFormat format = 4 == bpp ? PixelFormats.Bgra32 : PixelFormats.Gray8;
+ return ImageData.Create (Info, format, null, pixels, stride);
+ }
+ }
+}
diff --git a/Legacy/Witch/ArcVBD.cs b/Legacy/Witch/ArcVBD.cs
new file mode 100644
index 00000000..a198db49
--- /dev/null
+++ b/Legacy/Witch/ArcVBD.cs
@@ -0,0 +1,74 @@
+//! \file ArcVBD.cs
+//! \date 2018 Aug 18
+//! \brief Witch audio archive.
+//
+// Copyright (C) 2018 by morkt
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//
+
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using GameRes.Utility;
+
+namespace GameRes.Formats.Witch
+{
+ [Export(typeof(ArchiveFormat))]
+ public class SoundDataOpener : ArchiveFormat
+ {
+ public override string Tag { get { return "VBD/SOUND"; } }
+ public override string Description { get { return "Witch audio archive"; } }
+ public override uint Signature { get { return 0x4E554F53; } } // 'SOUNDDATE'
+ public override bool IsHierarchic { get { return false; } }
+ public override bool CanWrite { get { return false; } }
+
+ public override ArcFile TryOpen (ArcView file)
+ {
+ if (!file.View.AsciiEqual (0, "SOUNDDATE "))
+ return null;
+ int count = file.View.ReadInt32 (0xA);
+ if (!IsSaneCount (count))
+ return null;
+ long index_offset = 0xE;
+ var dir = new List (count);
+ var name_buffer = new byte[0x100];
+ for (int i = 0; i < count; ++i)
+ {
+ uint offset = file.View.ReadUInt32 (index_offset);
+ if (offset <= index_offset || offset > file.MaxOffset)
+ return null;
+ int name_length = file.View.ReadInt32 (index_offset+4);
+ if (name_length <= 0)
+ return null;
+ if (name_length > name_buffer.Length)
+ name_buffer = new byte[name_length];
+ var name = file.View.ReadString (index_offset+8, (uint)name_length);
+ var entry = new Entry {
+ Name = name,
+ Type = "audio",
+ Offset = offset,
+ };
+ dir.Add (entry);
+ index_offset += 8 + name_length;
+ }
+ ImageDataOpener.SetAdjacentEntriesSize (dir, file.MaxOffset);
+ return new ArcFile (file, this, dir);
+ }
+ }
+}