Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-10-23 07:38:16 +08:00
Code Issues Projects Releases Wiki Activity

(SFA): replaced AosEntry with PackedEntry.

Browse Source
This commit is contained in:
morkt 2017-09-22 13:22:21 +04:00
parent 09793a08d8
commit d4132c2cac
2 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ArcFormats/Lilim/ArcAOS.cs
View File

@ -28,15 +28,9 @@ using System.Collections.Generic;
using System.ComponentModel.Composition; using System.ComponentModel.Composition;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using GameRes.Utility;
namespace GameRes.Formats.Lilim namespace GameRes.Formats.Lilim
{ {
internal class AosEntry : Entry
{
public bool IsCompressed;
}
[Export(typeof(ArchiveFormat))] [Export(typeof(ArchiveFormat))]
public class AosOpener : ArchiveFormat public class AosOpener : ArchiveFormat
{ {
@ -56,9 +50,7 @@ namespace GameRes.Formats.Lilim
uint first_offset = file.View.ReadUInt32 (0x10); uint first_offset = file.View.ReadUInt32 (0x10);
if (first_offset >= file.MaxOffset || 0 != (first_offset & 0x1F)) if (first_offset >= file.MaxOffset || 0 != (first_offset & 0x1F))
return null; return null;
var name_buf = new byte[0x10]; var name_buf = file.View.ReadBytes (first_offset, 0x10);
if (0x10 != file.View.Read (first_offset, name_buf, 0, 0x10))
return null;
if (!name_buf.SequenceEqual (IndexLink) && !name_buf.SequenceEqual (IndexEnd)) if (!name_buf.SequenceEqual (IndexLink) && !name_buf.SequenceEqual (IndexEnd))
return null; return null;
@ -81,15 +73,14 @@ namespace GameRes.Formats.Lilim
if (-1 == name_length) if (-1 == name_length)
name_length = name_buf.Length; name_length = name_buf.Length;
var name = Encodings.cp932.GetString (name_buf, 0, name_length); var name = Encodings.cp932.GetString (name_buf, 0, name_length);
var entry = FormatCatalog.Instance.Create<AosEntry> (name); var entry = FormatCatalog.Instance.Create<PackedEntry> (name);
entry.Offset = file.View.ReadUInt32 (current_offset+0x10); entry.Offset = file.View.ReadUInt32 (current_offset+0x10);
entry.Size = file.View.ReadUInt32 (current_offset+0x14); entry.Size = file.View.ReadUInt32 (current_offset+0x14);
current_offset += 0x20; current_offset += 0x20;
entry.Offset += current_offset; entry.Offset += current_offset;
if (!entry.CheckPlacement (file.MaxOffset)) if (!entry.CheckPlacement (file.MaxOffset))
return null; return null;
if (name.HasExtension (".scr")) entry.IsPacked = name.HasExtension (".scr");
entry.IsCompressed = true;
dir.Add (entry); dir.Add (entry);
} }
} }
@ -98,14 +89,13 @@ namespace GameRes.Formats.Lilim
public override Stream OpenEntry (ArcFile arc, Entry entry) public override Stream OpenEntry (ArcFile arc, Entry entry)
{ {
var aent = entry as AosEntry; var aent = entry as PackedEntry;
if (null == aent || !aent.IsCompressed) if (null == aent || !aent.IsPacked)
return base.OpenEntry (arc, entry); return base.OpenEntry (arc, entry);
uint unpacked_size = arc.File.View.ReadUInt32 (entry.Offset); aent.UnpackedSize = arc.File.View.ReadUInt32 (entry.Offset);
var packed = new byte[entry.Size-4]; var packed = arc.File.View.ReadBytes (entry.Offset+4, entry.Size-4);
arc.File.View.Read (entry.Offset+4, packed, 0, (uint)packed.Length); var unpacked = new byte[aent.UnpackedSize];
var unpacked = new byte[unpacked_size];
var decoder = new HuffmanDecoder (packed, unpacked); var decoder = new HuffmanDecoder (packed, unpacked);
decoder.Unpack(); decoder.Unpack();
@ -148,16 +138,16 @@ namespace GameRes.Formats.Lilim
var name = file.View.ReadString (index_offset, 0x20); var name = file.View.ReadString (index_offset, 0x20);
if (0 == name.Length) if (0 == name.Length)
return null; return null;
var entry = FormatCatalog.Instance.Create<AosEntry> (name); var entry = FormatCatalog.Instance.Create<PackedEntry> (name);
entry.Offset = base_offset + file.View.ReadUInt32 (index_offset+0x20); entry.Offset = base_offset + file.View.ReadUInt32 (index_offset+0x20);
entry.Size = file.View.ReadUInt32 (index_offset+0x24); entry.Size = file.View.ReadUInt32 (index_offset+0x24);
if (!entry.CheckPlacement (file.MaxOffset)) if (!entry.CheckPlacement (file.MaxOffset))
return null; return null;
if (name.HasExtension (".scr")) if (name.HasExtension (".scr"))
entry.IsCompressed = true; entry.IsPacked = true;
else if (name.HasExtension (".cmp")) else if (name.HasExtension (".cmp"))
{ {
entry.IsCompressed = true; entry.IsPacked = true;
entry.Name = Path.ChangeExtension (entry.Name, ".abm"); entry.Name = Path.ChangeExtension (entry.Name, ".abm");
entry.Type = "image"; entry.Type = "image";
} }

13
ArcFormats/Lilim/ArcFGA.cs
View File

@ -23,10 +23,8 @@
// IN THE SOFTWARE. // IN THE SOFTWARE.
// //
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.Composition; using System.ComponentModel.Composition;
using System.IO;
using GameRes.Utility; using GameRes.Utility;
namespace GameRes.Formats.Lilim namespace GameRes.Formats.Lilim
@ -45,10 +43,10 @@ namespace GameRes.Formats.Lilim
if (!file.Name.HasExtension (".fga")) if (!file.Name.HasExtension (".fga"))
return null; return null;
uint index_offset = 0; uint index_offset = 0;
var index_buffer = new byte[0x318]; var index_buffer = file.View.ReadBytes (index_offset, 0x318);
var dir = new List<Entry> (0x20); if (0x318 != index_buffer.Length)
if (0x318 != file.View.Read (index_offset, index_buffer, 0, 0x318))
return null; return null;
var dir = new List<Entry> (0x20);
int pos = 0; int pos = 0;
while (pos < index_buffer.Length) while (pos < index_buffer.Length)
{ {
@ -67,13 +65,12 @@ namespace GameRes.Formats.Lilim
else else
{ {
var name = Binary.GetCString (index_buffer, pos, 0xC); var name = Binary.GetCString (index_buffer, pos, 0xC);
var entry = FormatCatalog.Instance.Create<AosEntry> (name); var entry = FormatCatalog.Instance.Create<PackedEntry> (name);
entry.Offset = index_buffer.ToUInt32 (pos+0xC); entry.Offset = index_buffer.ToUInt32 (pos+0xC);
entry.Size = index_buffer.ToUInt32 (pos+0x10); entry.Size = index_buffer.ToUInt32 (pos+0x10);
if (!entry.CheckPlacement (file.MaxOffset)) if (!entry.CheckPlacement (file.MaxOffset))
return null; return null;
if (name.HasExtension (".scr")) entry.IsPacked = name.HasExtension (".scr");
entry.IsCompressed = true;
dir.Add (entry); dir.Add (entry);
pos += 0x18; pos += 0x18;
} }