Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-11-23 05:35:34 +08:00
Code Issues Projects Releases Wiki Activity

(noncolor): tweaked scripts decryption.

Browse Source
This commit is contained in:
morkt 2018-12-23 14:31:24 +04:00
parent abac11dc43
commit 492c3d6a19
3 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ArcFormats/NonColor/ArcACV.cs
View File

@ -53,13 +53,7 @@ namespace GameRes.Formats.NonColor
return null; return null;
using (var index = new NcIndexReader (file, count, key) { IndexPosition = 8 }) using (var index = new NcIndexReader (file, count, key) { IndexPosition = 8 })
{ return index.Read (this, scheme);
var file_map = ReadFilenameMap (scheme);
var dir = index.Read (file_map);
if (null == dir)
return null;
return new ArcDatArchive (file, this, dir, scheme.Hash);
}
} }
} }
} }

31
ArcFormats/NonColor/ArcDAT.cs
View File

@ -59,6 +59,7 @@ namespace GameRes.Formats.NonColor
public ulong Hash; public ulong Hash;
public string FileListName; public string FileListName;
public bool LowCaseNames; public bool LowCaseNames;
public bool IgnoreScriptKey;
public Scheme(string title) public Scheme(string title)
{ {
@ -129,13 +130,7 @@ namespace GameRes.Formats.NonColor
return null; return null;
using (var index = new NcIndexReader (file, count)) using (var index = new NcIndexReader (file, count))
{ return index.Read (this, scheme);
var file_map = ReadFilenameMap (scheme);
var dir = index.Read (file_map);
if (null == dir)
return null;
return new ArcDatArchive (file, this, dir, scheme.Hash);
}
} }
public override Stream OpenEntry (ArcFile arc, Entry entry) public override Stream OpenEntry (ArcFile arc, Entry entry)
@ -147,10 +142,10 @@ namespace GameRes.Formats.NonColor
var data = arc.File.View.ReadBytes (entry.Offset, entry.Size); var data = arc.File.View.ReadBytes (entry.Offset, entry.Size);
if (dent.IsPacked) if (dent.IsPacked)
{ {
if (6 == dent.Flags) if (darc.MasterKey != 0)
DecryptData (data, (uint)dent.Hash);
else if (darc.MasterKey != 0)
DecryptData (data, (uint)(dent.Hash ^ darc.MasterKey)); DecryptData (data, (uint)(dent.Hash ^ darc.MasterKey));
else if (6 == dent.Flags)
DecryptData (data, (uint)dent.Hash);
return new ZLibStream (new MemoryStream (data), CompressionMode.Decompress); return new ZLibStream (new MemoryStream (data), CompressionMode.Decompress);
} }
// 1 == dent.Flags // 1 == dent.Flags
@ -284,10 +279,10 @@ namespace GameRes.Formats.NonColor
protected IBinaryStream m_input; protected IBinaryStream m_input;
private List<Entry> m_dir; private List<Entry> m_dir;
private int m_count; private int m_count;
private long m_max_offset; private ArcView m_file;
public long IndexPosition { get; set; } public long IndexPosition { get; set; }
public long MaxOffset { get { return m_max_offset; } } public long MaxOffset { get { return m_file.MaxOffset; } }
public bool ExtendByteSign { get; protected set; } public bool ExtendByteSign { get; protected set; }
protected NcIndexReaderBase (ArcView file, int count) protected NcIndexReaderBase (ArcView file, int count)
@ -295,10 +290,20 @@ namespace GameRes.Formats.NonColor
m_input = file.CreateStream(); m_input = file.CreateStream();
m_dir = new List<Entry> (count); m_dir = new List<Entry> (count);
m_count = count; m_count = count;
m_max_offset = file.MaxOffset; m_file = file;
IndexPosition = 4; IndexPosition = 4;
} }
public ArcFile Read (DatOpener format, Scheme scheme)
{
var file_map = format.ReadFilenameMap (scheme);
var dir = Read (file_map);
if (null == dir)
return null;
var master_key = scheme.IgnoreScriptKey ? 0ul : scheme.Hash;
return new ArcDatArchive (m_file, format, dir, master_key);
}
public List<Entry> Read (IDictionary<ulong, NameRecord> file_map) public List<Entry> Read (IDictionary<ulong, NameRecord> file_map)
{ {
int skipped = 0, last_reported = -1; int skipped = 0, last_reported = -1;

8
ArcFormats/NonColor/ArcMinato.cs
View File

@ -70,13 +70,7 @@ namespace GameRes.Formats.Minato
return null; return null;
using (var index = new MinatoIndexReader (file, count)) using (var index = new MinatoIndexReader (file, count))
{ return index.Read (this, scheme);
var file_map = ReadFilenameMap (scheme);
var dir = index.Read (file_map);
if (null == dir)
return null;
return new ArcDatArchive (file, this, dir, scheme.Hash);
}
} }
} }