diff --git a/packages/solaris/solaris/parse/parsers/aurum_endgame_options_config.py b/packages/solaris/solaris/parse/parsers/aurum_endgame_options_config.py index baaae51..cea1cfd 100644 --- a/packages/solaris/solaris/parse/parsers/aurum_endgame_options_config.py +++ b/packages/solaris/solaris/parse/parsers/aurum_endgame_options_config.py @@ -6,6 +6,7 @@ class AurumEndgameOptionsConfigInfo(TypedDict): attritube: str + branchid: int desc: str group: int id: int @@ -14,6 +15,7 @@ class AurumEndgameOptionsConfigInfo(TypedDict): rarity: int related: int root: int + treeid: int type: int value: int @@ -46,6 +48,7 @@ def parse(self, data: bytes) -> AurumEndgameOptionsConfigConfig: for _ in range(num): item: AurumEndgameOptionsConfigInfo = { 'attritube': reader.ReadUTFBytesWithLength(), + 'branchid': reader.ReadSignedInt(), 'desc': reader.ReadUTFBytesWithLength(), 'group': reader.ReadSignedInt(), 'id': reader.ReadSignedInt(), @@ -54,6 +57,7 @@ def parse(self, data: bytes) -> AurumEndgameOptionsConfigConfig: 'rarity': reader.ReadSignedInt(), 'related': reader.ReadSignedInt(), 'root': reader.ReadSignedInt(), + 'treeid': reader.ReadSignedInt(), 'type': reader.ReadSignedInt(), 'value': reader.ReadSignedInt(), } diff --git a/packages/solaris/solaris/parse/parsers/hide_moves.py b/packages/solaris/solaris/parse/parsers/hide_moves.py index 936807d..255d91a 100644 --- a/packages/solaris/solaris/parse/parsers/hide_moves.py +++ b/packages/solaris/solaris/parse/parsers/hide_moves.py @@ -12,6 +12,7 @@ class _HideMoveItem(TypedDict): class _Root(TypedDict): + _text: str item: list[_HideMoveItem] @@ -30,12 +31,17 @@ def parsed_config_filename(cls) -> str: def parse(self, data: bytes) -> HideMovesConfig: reader = BytesReader(data) - result: HideMovesConfig = {'root': {'item': []}} + result: HideMovesConfig = {'root': {'_text': '', 'item': []}} - if not (reader.read_bool() and reader.read_bool()): + if not reader.ReadBoolean(): return result - count = reader.read_i32() + result['root']['_text'] = reader.ReadUTFBytesWithLength() + + if not reader.ReadBoolean(): + return result + + count = reader.ReadSignedInt() for _ in range(count): item: _HideMoveItem = {