(WARC): support archives versions 1.40 and 1.20

This commit is contained in:
morkt 2017-01-25 09:35:56 +04:00
parent f40102bef9
commit 93293d3aed
3 changed files with 12 additions and 3 deletions

View File

@ -84,7 +84,7 @@ namespace GameRes.Formats.ShiinaRio // 椎名里緒
return null; return null;
int version = file.View.ReadByte (7) - 0x30; int version = file.View.ReadByte (7) - 0x30;
version = 100 + version * 10; version = 100 + version * 10;
if (170 != version && 130 != version && 150 != version) if (170 != version && 150 != version && 140 != version && 130 != version && 120 != version)
throw new NotSupportedException ("Not supported WARC version"); throw new NotSupportedException ("Not supported WARC version");
uint index_offset = 0xf182ad82u ^ file.View.ReadUInt32 (8); uint index_offset = 0xf182ad82u ^ file.View.ReadUInt32 (8);
if (index_offset >= file.MaxOffset) if (index_offset >= file.MaxOffset)

View File

@ -141,9 +141,9 @@ namespace GameRes.Formats.ShiinaRio
uint effective_length = Math.Min (data_length, 1024u); uint effective_length = Math.Min (data_length, 1024u);
int a, b; int a, b;
uint fac = 0; uint fac = 0;
Rand = data_length;
if (WarcVersion > 120) if (WarcVersion > 120)
{ {
Rand = data_length;
a = (sbyte)data[index] ^ (sbyte)data_length; a = (sbyte)data[index] ^ (sbyte)data_length;
b = (sbyte)data[index+1] ^ (sbyte)(data_length / 2); b = (sbyte)data[index+1] ^ (sbyte)(data_length / 2);
if (data_length != MaxIndexLength) if (data_length != MaxIndexLength)

View File

@ -221,6 +221,7 @@ Hapihosu! ~Osewasaremasu Nyuuin Seikatsu~<br/>
I/O<br/> I/O<br/>
Natsuiro Kouen ~Denpatou no Shita de Ai wo Kataru~<br/> Natsuiro Kouen ~Denpatou no Shita de Ai wo Kataru~<br/>
Onegai O-Hoshi-sama<br/> Onegai O-Hoshi-sama<br/>
Onna Kyoushi Chijoku no Senritsu<br/>
Reijou Caster 2<br/> Reijou Caster 2<br/>
Seido Maria ~Hakudaku Mamire no Zangeshitsu~<br/> Seido Maria ~Hakudaku Mamire no Zangeshitsu~<br/>
Toriko Hime ~Hakudaku Mamire no Reijou~<br/> Toriko Hime ~Hakudaku Mamire no Reijou~<br/>
@ -308,6 +309,9 @@ Suiheisen made Nan Mile?<br/>
Swan Song<br/> Swan Song<br/>
Teakamamire no Tenshi<br/> Teakamamire no Tenshi<br/>
Towazugatari ~Shoujo Ryoujoku Hishou~<br/> Towazugatari ~Shoujo Ryoujoku Hishou~<br/>
Yomibito Shirazu ~Amai Meshibe no Seichoushi~<br/>
Yuugu ~Nyomitsu Gangu Adesugata~<br/>
Yuugu 2 ~Dai Ni Kinsho no Nozomu Mono~<br/>
Zecchou Spiral!!<br/> Zecchou Spiral!!<br/>
Zettai Karen! Ojou-sama<br/> Zettai Karen! Ojou-sama<br/>
</td></tr> </td></tr>
@ -428,7 +432,7 @@ Shouhei-kun no Hani-Kami Life☆<br/>
Touka Gettan<br/> Touka Gettan<br/>
</td></tr> </td></tr>
<tr class="odd last"><td>*</td><td><tt>\x00\x00\x04\x00</tt></td><td>No</td></tr> <tr class="odd last"><td>*</td><td><tt>\x00\x00\x04\x00</tt></td><td>No</td></tr>
<tr><td>*.war</td><td><tt>WARC 1.7</tt><br/><tt>WARC 1.5</tt><br/><tt>WARC 1.3</tt></td><td>No</td><td rowspan="5">Shiina Rio</td><td rowspan="5"> <tr><td>*.war</td><td><tt>WARC 1.7</tt><br/><tt>WARC 1.5</tt><br/><tt>WARC 1.4</tt><br/><tt>WARC 1.3</tt><br/><tt>WARC 1.2</tt></td><td>No</td><td rowspan="5">Shiina Rio</td><td rowspan="5">
Aneiro <span class="footnote">ShiinaRio v2.49</span><br/> Aneiro <span class="footnote">ShiinaRio v2.49</span><br/>
Can Fes! ~Itazura Majo to Naisho no Gakuensai~ <span class="footnote">ShiinaRio v2.47</span><br/> Can Fes! ~Itazura Majo to Naisho no Gakuensai~ <span class="footnote">ShiinaRio v2.47</span><br/>
Chikan Circle <span class="footnote">ShiinaRio v2.46</span><br/> Chikan Circle <span class="footnote">ShiinaRio v2.46</span><br/>
@ -442,6 +446,9 @@ Draculius <span class="footnote">ShiinaRio v2.38</span><br/>
Enkaku Sousa <span class="footnote">2.36 or 2.37</span><br/> Enkaku Sousa <span class="footnote">2.36 or 2.37</span><br/>
Gensou no Idea ~Oratorio Phantasm Historia~<span class="footnote">ShiinaRio v2.49</span><br/> Gensou no Idea ~Oratorio Phantasm Historia~<span class="footnote">ShiinaRio v2.49</span><br/>
Gohoushi Nurse ~Mayonaka no Kyousei Call~ <span class="footnote">ShiinaRio v2.50</span><br/> Gohoushi Nurse ~Mayonaka no Kyousei Call~ <span class="footnote">ShiinaRio v2.50</span><br/>
Hana no Kioku 1-2-3 <span class="footnote">ShiinaRio v2.10</span><br/>
Hana no Kioku 4-5-6 <span class="footnote">ShiinaRio v2.19</span><br/>
Hana no Kioku 7 <span class="footnote">ShiinaRio v2.18</span><br/>
Hana to Otome ni Shukufuku o <span class="footnote">ShiinaRio v2.46</span><br/> Hana to Otome ni Shukufuku o <span class="footnote">ShiinaRio v2.46</span><br/>
Helter Skelter <span class="footnote">ShiinaRio v2.40</span><br/> Helter Skelter <span class="footnote">ShiinaRio v2.40</span><br/>
Hin wa Bokura no Fuku no Kami <span class="footnote">ShiinaRio v2.49</span><br/> Hin wa Bokura no Fuku no Kami <span class="footnote">ShiinaRio v2.49</span><br/>
@ -490,6 +497,7 @@ Gokujou Chikan Densha<br/>
Hokenshitsu no Sensei ~Onedari Bakunyuu Lesson~<br/> Hokenshitsu no Sensei ~Onedari Bakunyuu Lesson~<br/>
Jokyoushi wo Kurau<br/> Jokyoushi wo Kurau<br/>
Kangoku Suieibu<br/> Kangoku Suieibu<br/>
Kanjuku Jokyoushi ~ Nikuyoku ni Nureru Wana<br/>
Lovers Collection<br/> Lovers Collection<br/>
Maho☆Gaku ~Mahoroba Kokusai Bouei Daigaku Fuzoku Gakuen~<br/> Maho☆Gaku ~Mahoroba Kokusai Bouei Daigaku Fuzoku Gakuen~<br/>
Nachtmusik<br/> Nachtmusik<br/>
@ -758,6 +766,7 @@ Vampire Crusaders<br/>
<tr><td>*.gpk+*.gtb<br/>*.vpk+*.vtb</td><td>-</td><td>No</td><td rowspan="3">Black Cyc</td><td rowspan="3"> <tr><td>*.gpk+*.gtb<br/>*.vpk+*.vtb</td><td>-</td><td>No</td><td rowspan="3">Black Cyc</td><td rowspan="3">
Before Dawn Daybreak ~Shinen no Utahime~<br/> Before Dawn Daybreak ~Shinen no Utahime~<br/>
Extravaganza ~Mushi Mederu Shoujo~<br/> Extravaganza ~Mushi Mederu Shoujo~<br/>
Gokuin no Sentou<br/>
Gun-Katana<br/> Gun-Katana<br/>
Hana Goyomi<br/> Hana Goyomi<br/>
Jishou Seirei Majutsushi vs Shinsei Daiikkyuu Akuma<br/> Jishou Seirei Majutsushi vs Shinsei Daiikkyuu Akuma<br/>