From aa5c3e72d88afee2313609b0e2f007923bd34d75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Tur=C3=A9n?= Date: Fri, 25 Apr 2025 19:37:01 +0200 Subject: [PATCH 1/4] extend SPR for io.BytesIO class require on export file function --- pygrf/spr.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pygrf/spr.py b/pygrf/spr.py index c8c38cc..430f0d3 100644 --- a/pygrf/spr.py +++ b/pygrf/spr.py @@ -1,4 +1,5 @@ """ spr file parsing """ +import io import struct from typing import Tuple, Sequence from itertools import chain @@ -194,10 +195,11 @@ def parse_pal(self, offset): return Image(width, height, pixels) -class SPR: +class SPR(io.BytesIO): """ a container for sprite images """ def __init__(self, data: bytes): + super().__init__(data) self.header = parse_header(data, b'SP') self.parser = _get_parser(data, self.header) From eabc8bf76ea977aafe251bdbb82cdc1f1a0d7d8d Mon Sep 17 00:00:00 2001 From: Seba Turen Date: Sat, 26 Apr 2025 22:24:11 +0200 Subject: [PATCH 2/4] added encrypt file suport --- pygrf/decrypt.py | 188 +++++++++++++++++++++++++++++++++++++++++++++++ pygrf/grf.py | 23 +++++- 2 files changed, 210 insertions(+), 1 deletion(-) create mode 100644 pygrf/decrypt.py diff --git a/pygrf/decrypt.py b/pygrf/decrypt.py new file mode 100644 index 0000000..644388c --- /dev/null +++ b/pygrf/decrypt.py @@ -0,0 +1,188 @@ +""" + Decryptor for the GRF files. + This is a re-implementation for GRFEditor project +""" + +class Decrypter: + + _ip_table = [ + 58, 50, 42, 34, 26, 18, 10, 2, 60, 52, 44, 36, 28, 20, 12, 4, + 62, 54, 46, 38, 30, 22, 14, 6, 64, 56, 48, 40, 32, 24, 16, 8, + 57, 49, 41, 33, 25, 17, 9, 1, 59, 51, 43, 35, 27, 19, 11, 3, + 61, 53, 45, 37, 29, 21, 13, 5, 63, 55, 47, 39, 31, 23, 15, 7 + ] + + _fp_table = [ + 40, 8, 48, 16, 56, 24, 64, 32, 39, 7, 47, 15, 55, 23, 63, 31, + 38, 6, 46, 14, 54, 22, 62, 30, 37, 5, 45, 13, 53, 21, 61, 29, + 36, 4, 44, 12, 52, 20, 60, 28, 35, 3, 43, 11, 51, 19, 59, 27, + 34, 2, 42, 10, 50, 18, 58, 26, 33, 1, 41, 9, 49, 17, 57, 25 + ] + + _tp_table = [ + 16, 7, 20, 21, 29, 12, 28, 17, 1, 15, 23, 26, 5, 18, 31, 10, + 2, 8, 24, 14, 32, 27, 3, 9, 19, 13, 30, 6, 22, 11, 4, 25 + ] + + _s_table = [ + [ + 0xef, 0x03, 0x41, 0xfd, 0xd8, 0x74, 0x1e, 0x47, 0x26, 0xef, 0xfb, 0x22, 0xb3, 0xd8, 0x84, 0x1e, + 0x39, 0xac, 0xa7, 0x60, 0x62, 0xc1, 0xcd, 0xba, 0x5c, 0x96, 0x90, 0x59, 0x05, 0x3b, 0x7a, 0x85, + 0x40, 0xfd, 0x1e, 0xc8, 0xe7, 0x8a, 0x8b, 0x21, 0xda, 0x43, 0x64, 0x9f, 0x2d, 0x14, 0xb1, 0x72, + 0xf5, 0x5b, 0xc8, 0xb6, 0x9c, 0x37, 0x76, 0xec, 0x39, 0xa0, 0xa3, 0x05, 0x52, 0x6e, 0x0f, 0xd9 + ], + [ + 0xa7, 0xdd, 0x0d, 0x78, 0x9e, 0x0b, 0xe3, 0x95, 0x60, 0x36, 0x36, 0x4f, 0xf9, 0x60, 0x5a, 0xa3, + 0x11, 0x24, 0xd2, 0x87, 0xc8, 0x52, 0x75, 0xec, 0xbb, 0xc1, 0x4c, 0xba, 0x24, 0xfe, 0x8f, 0x19, + 0xda, 0x13, 0x66, 0xaf, 0x49, 0xd0, 0x90, 0x06, 0x8c, 0x6a, 0xfb, 0x91, 0x37, 0x8d, 0x0d, 0x78, + 0xbf, 0x49, 0x11, 0xf4, 0x23, 0xe5, 0xce, 0x3b, 0x55, 0xbc, 0xa2, 0x57, 0xe8, 0x22, 0x74, 0xce + ], + [ + 0x2c, 0xea, 0xc1, 0xbf, 0x4a, 0x24, 0x1f, 0xc2, 0x79, 0x47, 0xa2, 0x7c, 0xb6, 0xd9, 0x68, 0x15, + 0x80, 0x56, 0x5d, 0x01, 0x33, 0xfd, 0xf4, 0xae, 0xde, 0x30, 0x07, 0x9b, 0xe5, 0x83, 0x9b, 0x68, + 0x49, 0xb4, 0x2e, 0x83, 0x1f, 0xc2, 0xb5, 0x7c, 0xa2, 0x19, 0xd8, 0xe5, 0x7c, 0x2f, 0x83, 0xda, + 0xf7, 0x6b, 0x90, 0xfe, 0xc4, 0x01, 0x5a, 0x97, 0x61, 0xa6, 0x3d, 0x40, 0x0b, 0x58, 0xe6, 0x3d + ], + [ + 0x4d, 0xd1, 0xb2, 0x0f, 0x28, 0xbd, 0xe4, 0x78, 0xf6, 0x4a, 0x0f, 0x93, 0x8b, 0x17, 0xd1, 0xa4, + 0x3a, 0xec, 0xc9, 0x35, 0x93, 0x56, 0x7e, 0xcb, 0x55, 0x20, 0xa0, 0xfe, 0x6c, 0x89, 0x17, 0x62, + 0x17, 0x62, 0x4b, 0xb1, 0xb4, 0xde, 0xd1, 0x87, 0xc9, 0x14, 0x3c, 0x4a, 0x7e, 0xa8, 0xe2, 0x7d, + 0xa0, 0x9f, 0xf6, 0x5c, 0x6a, 0x09, 0x8d, 0xf0, 0x0f, 0xe3, 0x53, 0x25, 0x95, 0x36, 0x28, 0xcb + ] + ] + + _mask = [ + 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 + ] + + @staticmethod + def _ip(src: bytearray): + """ First permutation """ + block = bytearray(8) + + for i in range(len(Decrypter._ip_table)): + j = Decrypter._ip_table[i] - 1 + if (src[(j >> 3) & 7] & Decrypter._mask[j & 7]) != 0: + block[(i >> 3) & 7] |= Decrypter._mask[i & 7] + + src[:8] = block + + @staticmethod + def _round_function(src: bytearray): + """ FS-box and TP table """ + block = bytearray(8) + + # 1:L Group permutation + block[0] = (src[7] << 5 | src[4] >> 3) & 0x3f + block[1] = (src[4] << 1 | src[5] >> 7) & 0x3f + block[2] = (src[4] << 5 | src[5] >> 3) & 0x3f + block[3] = (src[5] << 1 | src[6] >> 7) & 0x3f + block[4] = (src[5] << 5 | src[6] >> 3) & 0x3f + block[5] = (src[6] << 1 | src[7] >> 7) & 0x3f + block[6] = (src[6] << 5 | src[7] >> 3) & 0x3f + block[7] = (src[7] << 1 | src[4] >> 7) & 0x3f + + # 2: S-boxes + for i in range(len(Decrypter._s_table)): + block[i] = (Decrypter._s_table[i][block[i * 2]] & 0xf0) | (Decrypter._s_table[i][block[i * 2 + 1]] & 0x0f) + + # 3: Reset 4 last value + block[4] = 0 + block[5] = 0 + block[6] = 0 + block[7] = 0 + + # 4: TP permutation + for i in range(len(Decrypter._tp_table)): + j = Decrypter._tp_table[i] - 1 + if (block[(j >> 3)] & Decrypter._mask[j & 7]) != 0: + block[4 + (i >> 3)] |= Decrypter._mask[i & 7] + + # 5: XOR original block + src[0] ^= block[4] + src[1] ^= block[5] + src[2] ^= block[6] + src[3] ^= block[7] + + @staticmethod + def _fp(src): + """ Last permutation """ + block = bytearray(8) + + for i in range(len(Decrypter._fp_table)): + j = Decrypter._fp_table[i] - 1 + if (src[(j >> 3) & 7] & Decrypter._mask[j & 7]) != 0: + block[(i >> 3) & 7] |= Decrypter._mask[i & 7] + + src[0:8] = block[0:8] + + @staticmethod + def decrypt_file_data(data: bytearray, type: bool, cycle: int, offset: int, length: int) -> bytearray: + if length % 8 != 0: + ideal_size_compressed = ((length // 8) + 1) * 8 + data_fixed = bytearray(ideal_size_compressed) + + data_fixed[:length] = data[offset:offset + length] + Decrypter.decode_file_data(data_fixed, type, cycle) + data[offset:offset + length] = data_fixed[:length] + else: + Decrypter.decode_file_data(data, type, cycle, offset, length) + return data + + @staticmethod + def decode_file_data(data: bytearray, type: bool, cycle: int, offset: int = 0, length: int = -1): + cnt = 0 + + length = length if length >= 0 else len(data) + + if cycle < 3: + cycle = 3 + elif cycle < 5: + cycle += 1 + elif cycle < 7: + cycle += 9 + else: + cycle += 15 + + # loop data file + for lop in range(0, length // 8): + if lop < 20 or (not type and lop % cycle == 0): + Decrypter.des_decode_block(data, offset) + else: + if cnt == 7 and not type: + tmp = data[offset:offset + 8] + cnt = 0 + + # Sort bytes + data[offset] = tmp[3] + data[offset + 1] = tmp[4] + data[offset + 2] = tmp[6] + data[offset + 3] = tmp[0] + data[offset + 4] = tmp[1] + data[offset + 5] = tmp[2] + data[offset + 6] = tmp[5] + + a = tmp[7] + a = { + 0x00: 0x2b, 0x2b: 0x00, 0x01: 0x68, 0x68: 0x01, 0x48: 0x77, 0x77: 0x48, + 0x60: 0xff, 0xff: 0x60, 0x6c: 0x80, 0x80: 0x6c, 0xb9: 0xc0, 0xc0: 0xb9, + 0xeb: 0xfe, 0xfe: 0xeb + }.get(a, a) + + data[offset + 7] = a + + cnt += 1 + offset += 8 + + @staticmethod + def des_decode_block(src: bytearray, i: int): + block = bytearray(src[i:i+8]) + + Decrypter._ip(block) + Decrypter._round_function(block) + Decrypter._fp(block) + + src[i:i+8] = block + + + diff --git a/pygrf/grf.py b/pygrf/grf.py index 1701b55..6813ee4 100644 --- a/pygrf/grf.py +++ b/pygrf/grf.py @@ -8,6 +8,7 @@ import zlib from . import filetypes from .exceptions import GRFParseError +from .decrypt import Decrypter # the grf versions that are supported @@ -24,6 +25,7 @@ # file flags FILE_IS_FILE = 1 +FILE_ENCRYPT = 3 Header = collections.namedtuple('GRFHeader', ( @@ -240,11 +242,30 @@ def __init__(self, filename, header_data, stream): if self.header.real_size == 0: self.data = b'' else: - self.data = zlib.decompress(stream.read(self.header.archived_size)) + self.data = stream.read(self.header.archived_size) + if self.header.flag == FILE_ENCRYPT: + self.cycle = self.get_cycle(self.filename, self.header.compressed_size) + self.data = Decrypter.decrypt_file_data(bytearray(self.data), self.cycle == 0, self.cycle, 0, self.header.archived_size) + + self.data = zlib.decompress(self.data) super().__init__(self.data) def __eq__(self, other): return other.filename == self.filename and other.data == self.data + + @staticmethod + def get_cycle(filename: str, compress_size: int): + cycle = 0 + file_extension = filename.split('.')[-1] + + if file_extension and file_extension not in ['gnd', 'gat', 'act', 'str']: + cycle = 1 + k = 10 + while compress_size >= k: + cycle += 1 + k *= 10 + + return cycle class Index: From 942472c7699f037e69c8a3beba1fc7f62f82ae65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Tur=C3=A9n?= Date: Sun, 27 Apr 2025 21:29:22 +0200 Subject: [PATCH 3/4] add anchor data from ACT Frame --- pygrf/act.py | 12 +++++++++--- pygrf/grf.py | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pygrf/act.py b/pygrf/act.py index e0ff269..006dcc5 100644 --- a/pygrf/act.py +++ b/pygrf/act.py @@ -20,6 +20,7 @@ class Layer(NamedTuple): class Frame(NamedTuple): layers: Tuple[Layer] trigger: int = -1 + anchors: Tuple[Point] = () class Animation(NamedTuple): @@ -99,11 +100,16 @@ def parse_frame(stream): trigger, = struct.unpack('= 0x203: count, = struct.unpack(' Date: Tue, 29 Apr 2025 00:52:34 +0200 Subject: [PATCH 4/4] add suport for external palette --- pygrf/spr.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pygrf/spr.py b/pygrf/spr.py index 430f0d3..a75a759 100644 --- a/pygrf/spr.py +++ b/pygrf/spr.py @@ -98,6 +98,14 @@ def get_image(self, index) -> Image: return self.parse_pal(self.pal_offset(index)) index -= pal return self.parse_rgb(self.rgb_offset(index)) + + def set_palette(self, palette): + colors: Sequence[Color] = [] + for i in range(0, len(palette), 4): + r, g, b, _ = palette[i:i+4] + a = 0 if i == 0 else 255 + colors.append(Color(r, g, b, a)) + self.palette = colors class Spr100(SprParser): @@ -216,6 +224,9 @@ def __getitem__(self, index) -> Image: if index < 0 or index >= length: raise IndexError return self.parser.get_image(index) + + def set_palette(self, palette): + self.parser.set_palette(palette) @property def version(self) -> int: