lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-07-08 01:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

(ArcDAT): more special cases work-arounds.

Browse Source
This commit is contained in:
poddav
2022-04-29 13:27:44 +04:00
parent 03c03016d0
commit 7bd0e4532b
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ArcFormats/Cyberworks/ArcDAT.cs
View File

@@ -205,7 +205,10 @@ namespace GameRes.Formats.Cyberworks
string game_name = arc_name != "Arc06.dat" ? TryParseMeta (VFS.CombinePath (dir_name, "Arc06.dat")) : null; string game_name = arc_name != "Arc06.dat" ? TryParseMeta (VFS.CombinePath (dir_name, "Arc06.dat")) : null;
Tuple<string, int> parsed = null; Tuple<string, int> parsed = null;
if (string.IsNullOrEmpty (game_name)) if (string.IsNullOrEmpty (game_name))
{
game_name = TryParseMeta (VFS.CombinePath (dir_name, "Arc00.dat"));
parsed = s_name_parsers.Select (p => p.ParseName (arc_name)).FirstOrDefault (p => p != null); parsed = s_name_parsers.Select (p => p.ParseName (arc_name)).FirstOrDefault (p => p != null);
}
else // Shukujo no Tsuyagoto special case else // Shukujo no Tsuyagoto special case
parsed = OldDatOpener.ArcNameParser.ParseName (arc_name); parsed = OldDatOpener.ArcNameParser.ParseName (arc_name);
if (null == parsed) if (null == parsed)
@@ -217,7 +220,7 @@ namespace GameRes.Formats.Cyberworks
var toc = ReadToc (toc_name, 8); var toc = ReadToc (toc_name, 8);
if (null == toc) if (null == toc)
return null; return null;
using (var index = new ArcIndexReader (toc, file, arc_idx)) using (var index = new ArcIndexReader (toc, file, arc_idx, game_name))
{ {
if (!index.Read()) if (!index.Read())
return null; return null;
@@ -311,10 +314,8 @@ namespace GameRes.Formats.Cyberworks
if ('c' == type || 'b' == type) if ('c' == type || 'b' == type)
{ {
uint img_size = Binary.BigEndian (input.ReadUInt32()); uint img_size = Binary.BigEndian (input.ReadUInt32());
if (input.Length - 5 == img_size) long start_pos = input.Length - img_size;
{ input = BinaryStream.FromStream (new StreamRegion (input.AsStream, start_pos, img_size), input.Name);
input = BinaryStream.FromStream (new StreamRegion (input.AsStream, 5, img_size), input.Name);
}
} }
else if (scheme != null && ('a' == type || 'd' == type) && input.Length > 21) else if (scheme != null && ('a' == type || 'd' == type) && input.Length > 21)
{ {
@@ -618,9 +619,13 @@ namespace GameRes.Formats.Cyberworks
return true; return true;
} }
uint m_fault_id = 100000;
internal PackedEntry ReadEntryInfo () internal PackedEntry ReadEntryInfo ()
{ {
uint id = m_index.ReadUInt32(); uint id = m_index.ReadUInt32();
if (id > m_fault_id)
id = m_fault_id++;
var entry = new PackedEntry { Name = id.ToString ("D6") }; var entry = new PackedEntry { Name = id.ToString ("D6") };
entry.UnpackedSize = m_index.ReadUInt32(); entry.UnpackedSize = m_index.ReadUInt32();
entry.Size = m_index.ReadUInt32(); entry.Size = m_index.ReadUInt32();
@@ -650,10 +655,14 @@ namespace GameRes.Formats.Cyberworks
internal class ArcIndexReader : IndexReader internal class ArcIndexReader : IndexReader
{ {
int m_arc_number; int m_arc_number;
string m_game_name;
bool m_ignore_b_files = false;
public ArcIndexReader (byte[] toc, ArcView file, int arc_number) : base (toc, file) public ArcIndexReader (byte[] toc, ArcView file, int arc_number, string game_name = null) : base (toc, file)
{ {
m_arc_number = arc_number; m_arc_number = arc_number;
m_game_name = game_name;
m_ignore_b_files = m_game_name == "ドキドキ母娘レッスン ～教えて♪Ｈなお勉強～";
} }
char[] m_type = new char[2]; char[] m_type = new char[2];
@@ -677,7 +686,7 @@ namespace GameRes.Formats.Cyberworks
ext = new string (m_type); ext = new string (m_type);
else else
ext = new string (m_type[0], 1); ext = new string (m_type[0], 1);
if ("b0" == ext || "n0" == ext || "o0" == ext || "0b" == ext || "b" == ext) if ("b0" == ext || "n0" == ext || "o0" == ext || "0b" == ext || ("b" == ext && !m_ignore_b_files))
{ {
entry.Type = "image"; entry.Type = "image";
HasImages = true; HasImages = true;