Add open-dread-rando-exlaunch and remove binary files

pyproject.toml

@@ -22,7 +22,8 @@ requires-python = ">=3.10"
 dependencies = [
     "mercury-engine-data-structures>=0.33",
     "jsonschema>=4.0.0",
-    "json-delta>=2.0.2"
+    "json-delta>=2.0.2",
+    "open-dread-rando-exlaunch>=1.1.0"
 ]
 dynamic = ["version"]
 

src/open_dread_rando/dread_patcher.py

@@ -4,6 +4,7 @@
 import typing
 from pathlib import Path
 
+import open_dread_rando_exlaunch
 from construct import ListContainer
 from mercury_engine_data_structures.file_tree_editor import OutputFormat
 
@@ -16,7 +17,7 @@
 from open_dread_rando.logger import LOG
 from open_dread_rando.misc_patches import elevator, lua_util
 from open_dread_rando.misc_patches.actor_patcher import apply_actor_patches
-from open_dread_rando.misc_patches.exefs import include_depackager, patch_exefs
+from open_dread_rando.misc_patches.exefs import patch_exefs
 from open_dread_rando.misc_patches.model_patcher import generate_custom_models
 from open_dread_rando.misc_patches.sprite_patches import patch_sprites
 from open_dread_rando.misc_patches.text_patches import apply_text_patches, patch_credits, patch_hints, patch_text
@@ -307,7 +308,7 @@
     patch_exefs(exefs_patches, configuration)
 
     if output_format == OutputFormat.ROMFS:
-        include_depackager(out_exefs)
+        open_dread_rando_exlaunch.include_depackager(out_exefs)
 
     LOG.info("Saving modified lua scripts")
     lua_editor.save_modifications(editor)

src/open_dread_rando/misc_patches/exefs.py

@@ -10,9 +10,3 @@ def patch_exefs(exefs_patches: Path, configuration: dict):
     provided_patches = files_path().joinpath("exefs_patches")
     shutil.copytree(provided_patches, exefs_patches, dirs_exist_ok=True)
 
-
-def include_depackager(exefs_path: Path):
-    exefs_path.mkdir(parents=True, exist_ok=True)
-
-    dread_depackager = files_path().joinpath("dread_depackager")
-    shutil.copytree(dread_depackager, exefs_path, dirs_exist_ok=True)

tests/test_full_patch.py

@@ -18,11 +18,15 @@ def test_export(dread_path, tmp_path, test_files_dir, configuration_path):
     )
     assert len(list(output_path.rglob("*.lc"))) == 33
 
-    ips = sorted(
+    exefs_path = output_path.joinpath("DreadRandovania", "exefs")
+
+    exefs_files = sorted(
         f.relative_to(output_path).as_posix()
-        for f in output_path.joinpath("DreadRandovania", "exefs").glob("*.ips")
+        for f in exefs_path.iterdir() if f.name != ".gitignore"
     )
-    assert ips == [
+    assert exefs_files == [
         "DreadRandovania/exefs/49161D9CCBC15DF944D0B6278A3C446C006B0BE8.ips",
         "DreadRandovania/exefs/646761F643AFEBB379EDD5E6A5151AF2CEF93DC1.ips",
+        "DreadRandovania/exefs/main.npdm",
+        "DreadRandovania/exefs/subsdk9",
     ]