Skip to content

Fixed corruption ScriptObject templates #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fixed corruption ScriptObject templates #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions parse_pwe_templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,7 +1114,7 @@ def to_json(self) -> json_util.JsonObject:
create_all_file(core_path.joinpath("__init__.py"), base_import, modules)
return

if game_id in ["Prime", "Echoes"]:
if game_id in ["Prime", "Echoes", "Corruption"]:
format_specifier = "L"
known_size = 12
else:
Expand Down Expand Up @@ -1542,12 +1542,12 @@ def get_prop_details(prop: dict) -> PropDetails:
null_byte = repr(b"\x00")
if game_id == "Prime":
# No property size for Prime 1
parse_code = f'b"".join(iter(lambda: data.read(1), {null_byte})).decode("utf-8")'
parse_code = f'b"".join(iter(lambda: data.read(1), {null_byte})).decode("iso-8859-1")'
else:
parse_code = 'data.read(property_size)[:-1].decode("utf-8")'
parse_code = 'data.read(property_size)[:-1].decode("iso-8859-1")'
build_code.extend(
[
'data.write({obj}.encode("utf-8"))',
'data.write({obj}.encode("iso-8859-1"))',
f"data.write({null_byte})",
]
)
Expand Down
2 changes: 1 addition & 1 deletion retro-script-object-templates
Open in desktop
Submodule retro-script-object-templates updated from f9760f to d24ac3
1 change: 1 addition & 0 deletions tests/formats/test_mrea.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ def _all_instances(mrea: Mrea):
decoded = Mrea.parse(resource.data, target_game=prime3_asset_manager.target_game)
for instance in _all_instances(decoded):
assert isinstance(instance, ScriptInstance)
instance.type.from_bytes(instance.raw_properties)

encoded = decoded.build()

Expand Down