Merge pull request #153 from randovania/bugfix/tweaks-pal

Fix Tweaks for Echoes PAL
randovania · Oct 11, 2024 · e5ebda2 · e5ebda2
2 parents f64137d + ec750fd
commit e5ebda2
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/retro-script-object-templates b/retro-script-object-templates
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -31,6 +31,11 @@ def prime2_iso() -> Path:
  return Path(get_env_or_skip("PRIME2_ISO"))
 
 
+@pytest.fixture(scope="module")
+def prime2_pal_iso() -> Path:
+ return Path(get_env_or_skip("PRIME2_PAL_ISO"))
+
+
 @pytest.fixture(scope="module")
 def prime3_iso() -> Path:
  return Path(get_env_or_skip("PRIME3_ISO"))
@@ -46,6 +51,11 @@ def prime2_iso_provider(prime2_iso: Path) -> IsoFileProvider:
  return IsoFileProvider(prime2_iso)
 
 
+@pytest.fixture(scope="module")
+def prime2_pal_iso_provider(prime2_pal_iso: Path) -> IsoFileProvider:
+ return IsoFileProvider(prime2_pal_iso)
+
+
 @pytest.fixture(scope="module")
 def prime3_iso_provider(prime3_iso: Path) -> IsoFileProvider:
  return IsoFileProvider(prime3_iso)

diff --git a/tests/formats/test_ntwk.py b/tests/formats/test_ntwk.py
@@ -9,11 +9,23 @@
  from retro_data_structures.asset_manager import IsoFileProvider
 
 
-def test_prime2(prime2_iso_provider: IsoFileProvider) -> None:
- with prime2_iso_provider.open_binary("Standard.ntwk") as f:
+def perform_test(iso_provider: IsoFileProvider) -> None:
+ with iso_provider.open_binary("Standard.ntwk") as f:
  raw = f.read()
 
  decoded = Ntwk.parse(raw, Game.ECHOES)
+
+ for instance in decoded.instances:
+ instance.set_properties(instance.get_properties())
+
  encoded = decoded.build()
 
  assert raw == encoded
+
+
+def test_prime2_ntsc(prime2_iso_provider: IsoFileProvider) -> None:
+ perform_test(prime2_iso_provider)
+
+
+def test_prime2_pal(prime2_pal_iso_provider: IsoFileProvider) -> None:
+ perform_test(prime2_pal_iso_provider)