diff --git a/ArcFormats/ArcFormats.csproj b/ArcFormats/ArcFormats.csproj
index 7669fa33..bcd729e9 100644
--- a/ArcFormats/ArcFormats.csproj
+++ b/ArcFormats/ArcFormats.csproj
@@ -66,6 +66,8 @@
+
+
diff --git a/ArcFormats/elf/ImageG24.cs b/ArcFormats/elf/ImageG24.cs
new file mode 100644
index 00000000..2492550b
--- /dev/null
+++ b/ArcFormats/elf/ImageG24.cs
@@ -0,0 +1,80 @@
+//! \file ImageG24.cs
+//! \date Mon Oct 12 16:14:47 2015
+//! \brief Ai5 engine RGB image.
+//
+// Copyright (C) 2015 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 GameRes.Compression;
+using System.ComponentModel.Composition;
+using System.IO;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace GameRes.Formats.Elf
+{
+ [Export(typeof(ImageFormat))]
+ public class G24Format : ImageFormat
+ {
+ public override string Tag { get { return "G24"; } }
+ public override string Description { get { return "Ai5 engine RGB image format"; } }
+ public override uint Signature { get { return 0; } }
+
+ public override ImageMetaData ReadMetaData (Stream stream)
+ {
+ using (var input = new ArcView.Reader (stream))
+ {
+ int x = input.ReadInt16();
+ int y = input.ReadInt16();
+ int w = input.ReadInt16();
+ int h = input.ReadInt16();
+ if (w <= 0 || w > 0x1000 || h <= 0 || h > 0x1000
+ || x < 0 || x > 0x800 || h < 0 || h > 0x800)
+ return null;
+ return new ImageMetaData {
+ Width = (uint)w,
+ Height = (uint)h,
+ OffsetX = x,
+ OffsetY = y,
+ BPP = 24,
+ };
+ }
+ }
+
+ public override ImageData Read (Stream stream, ImageMetaData info)
+ {
+ stream.Position = 8;
+ int stride = (((int)info.Width * 3 + 3) & -4);
+ var pixels = new byte[stride * (int)info.Height];
+ using (var reader = new LzssStream (stream, LzssMode.Decompress, true))
+ {
+ if (pixels.Length != reader.Read (pixels, 0, pixels.Length))
+ throw new InvalidFormatException();
+ return ImageData.CreateFlipped (info, PixelFormats.Bgr24, null, pixels, stride);
+ }
+ }
+
+ public override void Write (Stream file, ImageData image)
+ {
+ throw new System.NotImplementedException ("G24Format.Write not implemented");
+ }
+ }
+}
diff --git a/ArcFormats/elf/ImageGP8.cs b/ArcFormats/elf/ImageGP8.cs
new file mode 100644
index 00000000..7c730cbe
--- /dev/null
+++ b/ArcFormats/elf/ImageGP8.cs
@@ -0,0 +1,144 @@
+//! \file ImageGP8.cs
+//! \date Mon Oct 12 15:50:34 2015
+//! \brief Ai5 engine indexed image.
+//
+// Copyright (C) 2015 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 GameRes.Compression;
+using GameRes.Utility;
+using System.ComponentModel.Composition;
+using System.IO;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace GameRes.Formats.Elf
+{
+ [Export(typeof(ImageFormat))]
+ public class Gp8Format : ImageFormat
+ {
+ public override string Tag { get { return "GP8"; } }
+ public override string Description { get { return "Ai5 engine indexed image format"; } }
+ public override uint Signature { get { return 0; } }
+
+ public override ImageMetaData ReadMetaData (Stream stream)
+ {
+ if (stream.Length <= 0x408)
+ return null;
+ var header = new byte[8];
+ stream.Read (header, 0, 8);
+ if (0 != LittleEndian.ToInt32 (header, 0))
+ return null;
+ int w = LittleEndian.ToInt16 (header, 4);
+ int h = LittleEndian.ToInt16 (header, 6);
+ if (w <= 0 || w > 0x1000 || h <= 0 || h > 0x1000)
+ return null;
+ return new ImageMetaData {
+ Width = (uint)w,
+ Height = (uint)h,
+ BPP = 8,
+ };
+ }
+
+ public override ImageData Read (Stream stream, ImageMetaData info)
+ {
+ stream.Position = 8;
+ var palette = ReadPalette (stream);
+ var pixels = new byte[info.Width * info.Height];
+ using (var reader = new LzssStream (stream, LzssMode.Decompress, true))
+ {
+ if (pixels.Length != reader.Read (pixels, 0, pixels.Length))
+ throw new InvalidFormatException();
+ return ImageData.CreateFlipped (info, PixelFormats.Indexed8, palette, pixels, (int)info.Width);
+ }
+ }
+
+ public static BitmapPalette ReadPalette (Stream input)
+ {
+ var palette_data = new byte[0x400];
+ if (palette_data.Length != input.Read (palette_data, 0, palette_data.Length))
+ throw new InvalidFormatException();
+ var palette = new Color[0x100];
+ for (int i = 0; i < palette.Length; ++i)
+ {
+ int c = i * 4;
+ palette[i] = Color.FromRgb (palette_data[c+2], palette_data[c+1], palette_data[c]);
+ }
+ return new BitmapPalette (palette);
+ }
+
+ public override void Write (Stream file, ImageData image)
+ {
+ throw new System.NotImplementedException ("Gp8Format.Write not implemented");
+ }
+ }
+
+ [Export(typeof(ImageFormat))]
+ public class MskFormat : ImageFormat
+ {
+ public override string Tag { get { return "MSK/AI5"; } }
+ public override string Description { get { return "Ai5 engine image mask"; } }
+ public override uint Signature { get { return 0; } }
+
+ public MskFormat ()
+ {
+ Extensions = new string[] { "msk" };
+ }
+
+ public override ImageMetaData ReadMetaData (Stream stream)
+ {
+ using (var input = new ArcView.Reader (stream))
+ {
+ int x = input.ReadInt16();
+ int y = input.ReadInt16();
+ int w = input.ReadInt16();
+ int h = input.ReadInt16();
+ if (w <= 0 || w > 0x1000 || h <= 0 || h > 0x1000
+ || x < 0 || x > 0x800 || h < 0 || h > 0x800)
+ return null;
+ return new ImageMetaData {
+ Width = (uint)w,
+ Height = (uint)h,
+ OffsetX = x,
+ OffsetY = y,
+ BPP = 8,
+ };
+ }
+ }
+
+ public override ImageData Read (Stream stream, ImageMetaData info)
+ {
+ stream.Position = 8;
+ var pixels = new byte[info.Width * info.Height];
+ using (var reader = new LzssStream (stream, LzssMode.Decompress, true))
+ {
+ if (pixels.Length != reader.Read (pixels, 0, pixels.Length))
+ throw new InvalidFormatException();
+ return ImageData.CreateFlipped (info, PixelFormats.Gray8, null, pixels, (int)info.Width);
+ }
+ }
+
+ public override void Write (Stream file, ImageData image)
+ {
+ throw new System.NotImplementedException ("MskFormat.Write not implemented");
+ }
+ }
+}