diff --git a/ArcFormats/ArcFormats.csproj b/ArcFormats/ArcFormats.csproj
index f08d931c..13a6fc79 100644
--- a/ArcFormats/ArcFormats.csproj
+++ b/ArcFormats/ArcFormats.csproj
@@ -230,6 +230,7 @@
+
diff --git a/ArcFormats/rUGP/ImageS5I.cs b/ArcFormats/rUGP/ImageS5I.cs
new file mode 100644
index 00000000..e3ddcc82
--- /dev/null
+++ b/ArcFormats/rUGP/ImageS5I.cs
@@ -0,0 +1,73 @@
+//! \file ImageS5I.cs
+//! \date Wed Nov 09 16:25:17 2016
+//! \brief rUGP engine image format.
+//
+// Copyright (C) 2016 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.ComponentModel.Composition;
+using System.IO;
+using System.Windows.Media;
+
+namespace GameRes.Formats.Rugp
+{
+ [Export(typeof(ImageFormat))]
+ public class S5iFormat : ImageFormat
+ {
+ public override string Tag { get { return "S5I"; } }
+ public override string Description { get { return "rUGP engine image format"; } }
+ public override uint Signature { get { return 0; } }
+
+ public override ImageMetaData ReadMetaData (IBinaryStream file)
+ {
+ if (file.Signature != CRioArchive.ObjectSignature)
+ return null;
+ var rio = new CRioArchive (file);
+ uint signature;
+ var class_ref = rio.LoadRioTypeCore (out signature);
+ uint object_pos = (uint)file.Position;
+ if ("CS5i" != class_ref)
+ return null;
+ file.Seek (8, SeekOrigin.Current);
+ return new RioMetaData
+ {
+ Width = file.ReadUInt16(),
+ Height = file.ReadUInt16(),
+ BPP = 32,
+ ObjectOffset = object_pos,
+ };
+ }
+
+ public override ImageData Read (IBinaryStream file, ImageMetaData info)
+ {
+ var meta = (RioMetaData)info;
+ file.Position = meta.ObjectOffset + 0x14;
+ int size = file.ReadInt32();
+ var pixels = file.ReadBytes (size);
+ return ImageData.Create (info, PixelFormats.Bgra32, null, pixels);
+ }
+
+ public override void Write (Stream file, ImageData image)
+ {
+ throw new System.NotImplementedException ("S5iFormat.Write not implemented");
+ }
+ }
+}
diff --git a/supported.html b/supported.html
index 8ed027d5..5f195e4d 100644
--- a/supported.html
+++ b/supported.html
@@ -1108,6 +1108,7 @@ Eijin-sou
Etsuraku no Tane
Fuka no Jugoku
Gakkou Yarashii Kaidan
+Gokkun♪ Vampire ☆ Princess
Hanamaru! 2
Hime Kami 1/2
In'youchuu Goku ~Ryoujoku Jigoku Taimaroku~
@@ -1241,7 +1242,15 @@ Pigeon Blood
| *.adp | - | No |
| *.cab | PackDat3 | No | Entertainment Executive Engine |
Ryoujoku Fukushuu Gakuen ~Rinkan no Houkago~
+Shin Onna Kyoushi Yuuwaku Shinro Shidoushitsu
|
+| *.dat | - | No | YaneSDK |
+Ore-sama no RagnaRock
+ |
+| *.rio | - | No | age |
+Kaseki no Uta
+ |
+*.rip *.s5i | - | No |
Non-encrypted only