released v1.5.40

morkt · morkt · commit ba4ec0aad4d9 · 2018-11-07T12:30:37.000+04:00
diff --git a/ArcFormats/Properties/AssemblyInfo.cs b/ArcFormats/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion ("1.2.43.1920")]
-[assembly: AssemblyFileVersion ("1.2.43.1920")]
+[assembly: AssemblyVersion ("1.2.44.2016")]
+[assembly: AssemblyFileVersion ("1.2.44.2016")]
diff --git a/ArcFormats/Resources/Formats.dat b/ArcFormats/Resources/Formats.dat
diff --git a/GUI/Properties/AssemblyInfo.cs b/GUI/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion ("1.5.39.2590")]
-[assembly: AssemblyFileVersion ("1.5.39.2590")]
+[assembly: AssemblyVersion ("1.5.40.2721")]
+[assembly: AssemblyFileVersion ("1.5.40.2721")]
diff --git a/GameRes/Properties/AssemblyInfo.cs b/GameRes/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion ("1.5.40.302")]
-[assembly: AssemblyFileVersion ("1.5.40.302")]
+[assembly: AssemblyVersion ("1.5.41.310")]
+[assembly: AssemblyFileVersion ("1.5.41.310")]
diff --git a/Legacy/Ags32i/ImageGSS.cs b/Legacy/Ags32i/ImageGSS.cs
@@ -32,6 +32,7 @@
 using GameRes.Utility;
 
 // [041001][Innocence] China Chaime+
+// [041029][Tam's] Fukushuu no Ori ~OL Kankin Ryoujoku no Yakata~
 // [041224][Tam's] Volga Series 1
 
 namespace GameRes.Formats.Ags32i
@@ -52,7 +53,7 @@ public class GssFormat : ImageFormat
 
         public GssFormat ()
         {
-            Signatures = new uint[] { 0x20575A52, 0x20574242, 0 };
+            Signatures = new uint[] { 0x20575A52, 0x20574242, 0x20574346, 0 };
         }
 
         //static readonly uint DefaultKey = 0x20040915;
diff --git a/Legacy/Brownie/ArcNAF.cs b/Legacy/Brownie/ArcNAF.cs
@@ -27,6 +27,8 @@
 using System.ComponentModel.Composition;
 using System.IO;
 
+// [980529][Brownie] Dawn Slave
+
 namespace GameRes.Formats.Brownie
 {
     [Export(typeof(ArchiveFormat))]
diff --git a/Legacy/DigitalMonkey/ArcDM.cs b/Legacy/DigitalMonkey/ArcDM.cs
@@ -28,6 +28,9 @@
 using System.IO;
 using GameRes.Compression;
 
+// [030725][Digital Monkey] Kono Sora ga Tsuieru Toki ni
+// [041112][Yumesta] Seikon ~Kiba to Nie to Kyouki no Yakata~
+
 namespace GameRes.Formats.DigitalMonkey
 {
     [Export(typeof(ArchiveFormat))]
diff --git a/Legacy/Mermaid/ImageMG1.cs b/Legacy/Mermaid/ImageMG1.cs
@@ -27,6 +27,8 @@
 using System.IO;
 using System.Windows.Media;
 
+// [000310][Mermaid] Into Your World
+
 namespace GameRes.Formats.Mermaid
 {
     internal class MgMetaData : ImageMetaData
@@ -35,9 +37,7 @@ internal class MgMetaData : ImageMetaData
         public int  TileCount;
     }
 
-#if DEBUG
     [Export(typeof(ImageFormat))]
-#endif
     public class MgFormat : ImageFormat
     {
         public override string         Tag { get { return "MG1"; } }
@@ -93,7 +93,7 @@ public override ImageData Read (IBinaryStream file, ImageMetaData info)
                 for (int y = tile_count-1; y >= 0; --y)
                 {
                     int tile_dst = dst + y * tile_width;
-                    for (int x = 0; x < tile_count; ++x)
+                    for (int x = 0; x < stride; x += tile_width)
                     {
                         if (tile_dst + tile_width > pixels.Length)
                             file.Seek (tile_width, SeekOrigin.Current);
diff --git a/Legacy/Properties/AssemblyInfo.cs b/Legacy/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion ("1.0.6.129")]
-[assembly: AssemblyFileVersion ("1.0.6.129")]
+[assembly: AssemblyVersion ("1.0.7.157")]
+[assembly: AssemblyFileVersion ("1.0.7.157")]
diff --git a/docs/supported.html b/docs/supported.html
@@ -310,6 +310,7 @@
 Crime Rhyme series<br/>
 Damegane<br/>
 Dare mo ga Kanojo o Neratteru<br/>
+Deep One<br/>
 Distance<br/>
 Ero Mangaka-san to Binbou Shimai<br/>
 ExE<br/>
@@ -601,6 +602,7 @@
 Kanojo ga Ore ni Kureta Mono <span class="footnote">ShiinaRio v2.50</span><br/>
 Kateinai Choukyou <span class="footnote">ShiinaRio v2.31</span><br/>
 Kichiku Nakadashi Suieibu<span class="footnote">ShiinaRio v2.41</span><br/>
+Kuroneko Plus <span class="footnote">ShiinaRio v2.49</span><br/>
 Last Waltz ~Hakudaku Mamire no Natsu Gasshuku~ <span class="footnote">ShiinaRio v2.47</span><br/>
 Libra of the Vampire Princess <span class="footnote">ShiinaRio v2.50</span><br/>
 Mahou Shoujo no Taisetsu na Koto <span class="footnote">ShiinaRio v2.47</span><br/>
@@ -619,6 +621,7 @@
 Puchipuchi Idol Kouhosei <span class="footnote">ShiinaRio v2.49</span><br/>
 Pure Love! <span class="footnote">ShiinaRio v2.47</span><br/>
 Ran→Sem <span class="footnote">ShiinaRio v2.47</span><br/>
+Reizoku ~Kyonyuu Shimai Choukyou Jugyou~ <span class="footnote">ShiinaRio v2.40</span><br/>
 Ren'ai Saimin ~Tsun na Kanojo ga dereru Saimin~ <span class="footnote">ShiinaRio v2.47</span><br/>
 Rin×Sen <span class="footnote">ShiinaRio v2.47</span><br/>
 Re: Rem Plus <span class="footnote">ShiinaRio v2.50</span><br/>
@@ -741,6 +744,7 @@
 Drill Shoujo Spiral Nami<br/>
 Maid Neko-san wa Ikaga Desu ka?<br/>
 Seduce<br/>
+Shirasagi no Naku Koro ni<br/>
 </td></tr>
 <tr class="odd"><td>*.agc</td><td><tt>AGd</tt></td><td></td></tr>
 <tr><td>*.pak+*.idx</td><td>-</td><td></td><td rowspan="2">EAGLS</td><td rowspan="2">
@@ -1994,6 +1998,16 @@
 </td></tr>
 <tr class="odd"><td>*.til</td><td><tt>TIL0</tt></td><td></td></tr>
 <tr class="odd last"><td>*.wm2</td><td><tt>2.0</tt></td><td></td></tr>
+<tr><td>*.gpk</td><td><tt>STKFile0PACKFILE</tt></td><td></td><td>Stack</td><td>
+Shiny Days<br/>
+</td></tr>
+<tr class="odd"><td>*.pak</td><td><tt>KCAP</tt></td><td></td><td rowspan="2">Leaf</td><td rowspan="2">
+Hoshi no Ouji-kun<br/>
+Kizuato Renewal<br/>
+White Album 2<br/>
+Shizuku Renewal<br/>
+</td></tr>
+<tr class="odd last"><td>*.bjr</td><td><tt>BM</tt></td><td></td></tr>
 </table>
 <p><a name="note-1" class="footnote">1</a> Non-encrypted only</p>
 </body>
diff --git a/docs/version.xml b/docs/version.xml
@@ -1,27 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <GARbro>
     <Release>
-        <Version>1.5.39</Version>
+        <Version>1.5.40</Version>
         <Url>https://github.com/morkt/GARbro/releases/latest</Url>
         <Notes>New formats:
-- MIF archives, BCF and NG3 images
-- 'mrg0' archives
-- 'SHA_' archives
-- 'GML_ARC' archives
-- TIL images
-- RAD archives and RSG images
-- PAQ archives DZP images
-- PKZ archives, JBP images and KOG audio
+- PPAC archives, TIM2 and TX images
+- GPK archives
+- CMP images
+- WBM bitmaps and ADP1 audio
+- CPA and AAP archives, CP2 images
+- DM archives and PKT images
+- MPK archives and LAY images
+- HBM images
+- CDPA 'PACK' archives
+- PKK archives
+- Leaf 'KCAP' and 'LEAFPACK' archives
+- FLT archives and FG images
 - updated KiriKiri and ShiinaRio encryption schemes
-
-Improved handling of composite TLG images.
 </Notes>
     </Release>
     <FormatsData>
-        <FileVersion>130</FileVersion>
+        <FileVersion>131</FileVersion>
         <Url>https://github.com/morkt/GARbro/raw/master/ArcFormats/Resources/Formats.dat</Url>
         <Requires>
-            <Assembly Name="ArcFormats" Version="1.2.42.1920"/>
+            <Assembly Name="ArcFormats" Version="1.2.43.2015"/>
             <Assembly Name="GameRes" Version="1.4.26.238"/>
         </Requires>
     </FormatsData>

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`using GameRes.Utility;`
`33`	`33`
`34`	`34`	`// [041001][Innocence] China Chaime+`
	`35`	`+// [041029][Tam's] Fukushuu no Ori ~OL Kankin Ryoujoku no Yakata~`
`35`	`36`	`// [041224][Tam's] Volga Series 1`
`36`	`37`
`37`	`38`	`namespace GameRes.Formats.Ags32i`
`@@ -52,7 +53,7 @@ public class GssFormat : ImageFormat`
`52`	`53`
`53`	`54`	`public GssFormat ()`
`54`	`55`	`{`
`55`		`- Signatures = new uint[] { 0x20575A52, 0x20574242, 0 };`
	`56`	`+ Signatures = new uint[] { 0x20575A52, 0x20574242, 0x20574346, 0 };`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`//static readonly uint DefaultKey = 0x20040915;`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@`
`27`	`27`	`using System.ComponentModel.Composition;`
`28`	`28`	`using System.IO;`
`29`	`29`
	`30`	`+// [980529][Brownie] Dawn Slave`
	`31`	`+`
`30`	`32`	`namespace GameRes.Formats.Brownie`
`31`	`33`	`{`
`32`	`34`	`[Export(typeof(ArchiveFormat))]`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,9 @@`
`28`	`28`	`using System.IO;`
`29`	`29`	`using GameRes.Compression;`
`30`	`30`
	`31`	`+// [030725][Digital Monkey] Kono Sora ga Tsuieru Toki ni`
	`32`	`+// [041112][Yumesta] Seikon ~Kiba to Nie to Kyouki no Yakata~`
	`33`	`+`
`31`	`34`	`namespace GameRes.Formats.DigitalMonkey`
`32`	`35`	`{`
`33`	`36`	`[Export(typeof(ArchiveFormat))]`