Merge pull request #211 from steven11sjf/fix/missing-210-resources

added dread v2.1.0 resources to json

tests/conftest.py

@@ -24,18 +24,28 @@ def samus_returns_path():
 
 
 @pytest.fixture(scope="session")
-def dread_path():
+def dread_path_100():
     return Path(get_env_or_skip("DREAD_1_0_0_PATH"))
 
 
+@pytest.fixture(scope="session")
+def dread_path_210():
+    return Path(get_env_or_skip("DREAD_2_1_0_PATH"))
+
+
 @pytest.fixture(scope="session")
 def samus_returns_tree(samus_returns_path):
     return FileTreeEditor(samus_returns_path, Game.SAMUS_RETURNS)
 
 
 @pytest.fixture(scope="session")
-def dread_file_tree(dread_path):
-    return FileTreeEditor(dread_path, Game.DREAD)
+def dread_tree_100(dread_path_100):
+    return FileTreeEditor(dread_path_100, Game.DREAD)
+
+
+@pytest.fixture(scope="session")
+def dread_tree_210(dread_path_210):
+    return FileTreeEditor(dread_path_210, Game.DREAD)
 
 
 def pytest_addoption(parser):

tests/formats/test_bapd.py

@@ -4,7 +4,17 @@
 from mercury_engine_data_structures import dread_data
 from mercury_engine_data_structures.formats.bapd import Bapd
 
+exclusive_210 = [
+    "system/snd/presets/gui/timealarm_01.bapd",
+    "system/snd/presets/hud/hud_maxfill2.bapd",
+]
 
-@pytest.mark.parametrize("bapd_path", dread_data.all_files_ending_with(".bapd"))
-def test_bapd(dread_file_tree, bapd_path):
-    parse_build_compare_editor(Bapd, dread_file_tree, bapd_path)
+
+@pytest.mark.parametrize("bapd_path", dread_data.all_files_ending_with(".bapd", exclusive_210))
+def test_bapd_100(dread_tree_100, bapd_path):
+    parse_build_compare_editor(Bapd, dread_tree_100, bapd_path)
+
+
+@pytest.mark.parametrize("bapd_path", exclusive_210)
+def test_bapd_210(dread_tree_210, bapd_path):
+    parse_build_compare_editor(Bapd, dread_tree_210, bapd_path)

tests/formats/test_bcskla.py

@@ -1204,8 +1204,8 @@
 
 
 @pytest.mark.parametrize("bcskla_path", dread_data.all_files_ending_with(".bcskla"))
-def test_bcskla_dread(dread_file_tree, bcskla_path):
-    parse_build_compare_editor(Bcskla, dread_file_tree, bcskla_path)
+def test_bcskla_dread(dread_tree_100, bcskla_path):
+    parse_build_compare_editor(Bcskla, dread_tree_100, bcskla_path)
 
 
 @pytest.mark.parametrize("bcskla_path", samus_returns_data.all_files_ending_with(".bcskla", sr_missing))

tests/formats/test_bgsnds.py

@@ -3,5 +3,9 @@
 from mercury_engine_data_structures.formats.bgsnds import Bgsnds
 
 
-def test_bgsnds(dread_file_tree):
-    parse_build_compare_editor(Bgsnds, dread_file_tree, "system/snd/guisoundevents.bgsnds")
+def test_bgsnds_100(dread_tree_100):
+    parse_build_compare_editor(Bgsnds, dread_tree_100, "system/snd/guisoundevents.bgsnds")
+
+
+def test_bgsnds_210(dread_tree_210):
+    parse_build_compare_editor(Bgsnds, dread_tree_210, "system/snd/guisoundevents.bgsnds")

tests/formats/test_blsnd.py

@@ -11,5 +11,5 @@ def test_blsnd(samus_returns_tree, blsnd_path):
 
 
 @pytest.mark.parametrize("blsnd_path", dread_data.all_files_ending_with(".blsnd"))
-def test_blsnd_dread(dread_file_tree, blsnd_path):
-    parse_build_compare_editor(Blsnd, dread_file_tree, blsnd_path)
+def test_blsnd_dread(dread_tree_100, blsnd_path):
+    parse_build_compare_editor(Blsnd, dread_tree_100, blsnd_path)

tests/formats/test_blut.py

@@ -6,5 +6,5 @@
 
 
 @pytest.mark.parametrize("blut_path", dread_data.all_files_ending_with(".blut"))
-def test_all_blut(dread_file_tree, blut_path):
-    parse_build_compare_editor(Blut, dread_file_tree, blut_path)
+def test_all_blut(dread_tree_100, blut_path):
+    parse_build_compare_editor(Blut, dread_tree_100, blut_path)

tests/formats/test_bmbls.py

@@ -6,5 +6,5 @@
 
 
 @pytest.mark.parametrize("bmbls_path", dread_data.all_files_ending_with(".bmbls"))
-def test_compare_dread(dread_file_tree, bmbls_path):
-    parse_build_compare_editor(Bmbls, dread_file_tree, bmbls_path)
+def test_compare_dread(dread_tree_100, bmbls_path):
+    parse_build_compare_editor(Bmbls, dread_tree_100, bmbls_path)

tests/formats/test_bmdefs.py

@@ -3,8 +3,8 @@
 from mercury_engine_data_structures.formats.bmdefs import Bmdefs
 
 
-def test_bmdefs_dread(dread_file_tree):
-    parse_build_compare_editor(Bmdefs, dread_file_tree, "system/snd/scenariomusicdefs.bmdefs")
+def test_bmdefs_dread(dread_tree_100):
+    parse_build_compare_editor(Bmdefs, dread_tree_100, "system/snd/scenariomusicdefs.bmdefs")
 
 
 def test_bmdefs_sr(samus_returns_tree):

tests/formats/test_bmmap.py

@@ -4,7 +4,42 @@
 from mercury_engine_data_structures import dread_data
 from mercury_engine_data_structures.formats.bmmap import Bmmap
 
+bossrush_assets = [
+    "maps/levels/c10_samus/s201_bossrush_scorpius/s201_bossrush_scorpius",
+    "maps/levels/c10_samus/s202_bossrush_kraid/s202_bossrush_kraid",
+    "maps/levels/c10_samus/s203_bossrush_cu_artaria/s203_bossrush_cu_artaria",
+    "maps/levels/c10_samus/s204_bossrush_drogyga/s204_bossrush_drogyga",
+    "maps/levels/c10_samus/s205_bossrush_strong_rcs/s205_bossrush_strong_rcs",
+    "maps/levels/c10_samus/s206_bossrush_escue/s206_bossrush_escue",
+    "maps/levels/c10_samus/s207_bossrush_cooldownx/s207_bossrush_cooldownx",
+    "maps/levels/c10_samus/s208_bossrush_strong_rcs_x2/s208_bossrush_strong_rcs_x2",
+    "maps/levels/c10_samus/s209_bossrush_golzuna/s209_bossrush_golzuna",
+    "maps/levels/c10_samus/s210_bossrush_elite_cwx/s210_bossrush_elite_cwx",
+    "maps/levels/c10_samus/s211_bossrush_cu_ferenia/s211_bossrush_cu_ferenia",
+    "maps/levels/c10_samus/s212_bossrush_commander/s212_bossrush_commander",
+]
 
-@pytest.mark.parametrize("bmmap_path", dread_data.all_files_ending_with(".bmmap"))
-def test_dread_bmmap(dread_file_tree, bmmap_path):
-    parse_build_compare_editor(Bmmap, dread_file_tree, bmmap_path)
+bossrush_assets = [
+    "maps/levels/c10_samus/s201_bossrush_scorpius/s201_bossrush_scorpius.bmmap",
+    "maps/levels/c10_samus/s202_bossrush_kraid/s202_bossrush_kraid.bmmap",
+    "maps/levels/c10_samus/s203_bossrush_cu_artaria/s203_bossrush_cu_artaria.bmmap",
+    "maps/levels/c10_samus/s204_bossrush_drogyga/s204_bossrush_drogyga.bmmap",
+    "maps/levels/c10_samus/s205_bossrush_strong_rcs/s205_bossrush_strong_rcs.bmmap",
+    "maps/levels/c10_samus/s206_bossrush_escue/s206_bossrush_escue.bmmap",
+    "maps/levels/c10_samus/s207_bossrush_cooldownx/s207_bossrush_cooldownx.bmmap",
+    "maps/levels/c10_samus/s208_bossrush_strong_rcs_x2/s208_bossrush_strong_rcs_x2.bmmap",
+    "maps/levels/c10_samus/s209_bossrush_golzuna/s209_bossrush_golzuna.bmmap",
+    "maps/levels/c10_samus/s210_bossrush_elite_cwx/s210_bossrush_elite_cwx.bmmap",
+    "maps/levels/c10_samus/s211_bossrush_cu_ferenia/s211_bossrush_cu_ferenia.bmmap",
+    "maps/levels/c10_samus/s212_bossrush_commander/s212_bossrush_commander.bmmap",
+]
+
+
+@pytest.mark.parametrize("bmmap_path", dread_data.all_files_ending_with(".bmmap", bossrush_assets))
+def test_dread_bmmap_100(dread_tree_100, bmmap_path):
+    parse_build_compare_editor(Bmmap, dread_tree_100, bmmap_path)
+
+
+@pytest.mark.parametrize("bmmap_path", bossrush_assets)
+def test_dread_bmmap_210(dread_tree_210, bmmap_path):
+    parse_build_compare_editor(Bmmap, dread_tree_210, bmmap_path)

tests/formats/test_bmmdef.py

@@ -3,5 +3,5 @@
 from mercury_engine_data_structures.formats.bmmdef import Bmmdef
 
 
-def test_compare_bmmdef_dread(dread_file_tree):
-    parse_build_compare_editor(Bmmdef, dread_file_tree, "system/minimap/minimap.bmmdef")
+def test_compare_bmmdef_dread(dread_tree_100):
+    parse_build_compare_editor(Bmmdef, dread_tree_100, "system/minimap/minimap.bmmdef")

tests/formats/test_bmsad.py

@@ -351,20 +351,20 @@
 
 
 @pytest.mark.parametrize("bmsad_path", dread_data.all_files_ending_with(".bmsad"))
-def test_compare_dread_all(dread_file_tree, bmsad_path):
+def test_compare_dread_all(dread_tree_100, bmsad_path):
     if bmsad_path in dread_must_reencode:
-        parse_build_compare_editor_parsed(Bmsad, dread_file_tree, bmsad_path)
+        parse_build_compare_editor_parsed(Bmsad, dread_tree_100, bmsad_path)
     else:
-        parse_build_compare_editor(Bmsad, dread_file_tree, bmsad_path)
+        parse_build_compare_editor(Bmsad, dread_tree_100, bmsad_path)
 
 
 @pytest.mark.parametrize("bmsad_path", samus_returns_data.all_files_ending_with(".bmsad", sr_missing))
 def test_compare_sr_all(samus_returns_tree, bmsad_path):
     parse_build_compare_editor(Bmsad, samus_returns_tree, bmsad_path)
 
 
-def test_api_dread_actordef(dread_file_tree: FileTreeEditor):
-    bmsad = dread_file_tree.get_parsed_asset(
+def test_api_dread_actordef(dread_tree_100):
+    bmsad = dread_tree_100.get_parsed_asset(
         "actors/logic/breakablehint/charclasses/breakablehint.bmsad", type_hint=Bmsad
     )
 
@@ -399,8 +399,8 @@ def test_api_dread_actordef(dread_file_tree: FileTreeEditor):
     bmsad.build()
 
 
-def test_api_dread_charclass(dread_file_tree: FileTreeEditor):
-    bmsad = dread_file_tree.get_parsed_asset("actors/props/doorheat/charclasses/doorheat.bmsad", type_hint=Bmsad)
+def test_api_dread_charclass(dread_tree_100):
+    bmsad = dread_tree_100.get_parsed_asset("actors/props/doorheat/charclasses/doorheat.bmsad", type_hint=Bmsad)
 
     fakename = "foo"
 

tests/formats/test_bmsas.py

@@ -6,5 +6,5 @@
 
 
 @pytest.mark.parametrize("bmsas_path", dread_data.all_files_ending_with(".bmsas"))
-def test_bmsas(dread_file_tree, bmsas_path):
-    parse_build_compare_editor(Bmsas, dread_file_tree, bmsas_path)
+def test_bmsas(dread_tree_100, bmsas_path):
+    parse_build_compare_editor(Bmsas, dread_tree_100, bmsas_path)

tests/formats/test_bmsat.py

@@ -6,5 +6,5 @@
 
 
 @pytest.mark.parametrize("bmsat_path", dread_data.all_files_ending_with(".bmsat"))
-def test_bmsat(dread_file_tree, bmsat_path):
-    parse_build_compare_editor(Bmsat, dread_file_tree, bmsat_path)
+def test_bmsat(dread_tree_100, bmsat_path):
+    parse_build_compare_editor(Bmsat, dread_tree_100, bmsat_path)

tests/formats/test_bmscu.py

@@ -6,5 +6,5 @@
 
 
 @pytest.mark.parametrize("bmscu_path", dread_data.all_files_ending_with(".bmscu"))
-def test_compare_dread(dread_file_tree, bmscu_path):
-    parse_build_compare_editor(Bmscu, dread_file_tree, bmscu_path)
+def test_compare_dread(dread_tree_100, bmscu_path):
+    parse_build_compare_editor(Bmscu, dread_tree_100, bmscu_path)

tests/formats/test_bmsnav.py

@@ -4,6 +4,21 @@
 from mercury_engine_data_structures import dread_data, samus_returns_data
 from mercury_engine_data_structures.formats.bmsnav import Bmsnav
 
+bossrush_assets = [
+    "maps/levels/c10_samus/s201_bossrush_scorpius/s201_bossrush_scorpius.bmsnav",
+    "maps/levels/c10_samus/s202_bossrush_kraid/s202_bossrush_kraid.bmsnav",
+    "maps/levels/c10_samus/s203_bossrush_cu_artaria/s203_bossrush_cu_artaria.bmsnav",
+    "maps/levels/c10_samus/s204_bossrush_drogyga/s204_bossrush_drogyga.bmsnav",
+    "maps/levels/c10_samus/s205_bossrush_strong_rcs/s205_bossrush_strong_rcs.bmsnav",
+    "maps/levels/c10_samus/s206_bossrush_escue/s206_bossrush_escue.bmsnav",
+    "maps/levels/c10_samus/s207_bossrush_cooldownx/s207_bossrush_cooldownx.bmsnav",
+    "maps/levels/c10_samus/s208_bossrush_strong_rcs_x2/s208_bossrush_strong_rcs_x2.bmsnav",
+    "maps/levels/c10_samus/s209_bossrush_golzuna/s209_bossrush_golzuna.bmsnav",
+    "maps/levels/c10_samus/s210_bossrush_elite_cwx/s210_bossrush_elite_cwx.bmsnav",
+    "maps/levels/c10_samus/s211_bossrush_cu_ferenia/s211_bossrush_cu_ferenia.bmsnav",
+    "maps/levels/c10_samus/s212_bossrush_commander/s212_bossrush_commander.bmsnav",
+]
+
 sr_missing = [
     "maps/levels/c10_samus/s901_alpha/s901_alpha.bmsnav",
     "maps/levels/c10_samus/s902_gamma/s902_gamma.bmsnav",
@@ -21,9 +36,14 @@
 ]
 
 
-@pytest.mark.parametrize("bmsnav_path", dread_data.all_files_ending_with(".bmsnav"))
-def test_dread_bmsnav(dread_file_tree, bmsnav_path):
-    parse_build_compare_editor(Bmsnav, dread_file_tree, bmsnav_path)
+@pytest.mark.parametrize("bmsnav_path", dread_data.all_files_ending_with(".bmsnav", bossrush_assets))
+def test_dread_bmsnav_100(dread_tree_100, bmsnav_path):
+    parse_build_compare_editor(Bmsnav, dread_tree_100, bmsnav_path)
+
+
+@pytest.mark.parametrize("bmsnav_path", bossrush_assets)
+def test_dread_bmsnav_210(dread_tree_210, bmsnav_path):
+    parse_build_compare_editor(Bmsnav, dread_tree_210, bmsnav_path)
 
 
 @pytest.mark.parametrize("bmsnav_path", samus_returns_data.all_files_ending_with(".bmsnav", sr_missing))

tests/formats/test_bmssd.py

@@ -4,6 +4,21 @@
 from mercury_engine_data_structures import dread_data, samus_returns_data
 from mercury_engine_data_structures.formats.bmssd import Bmssd
 
+bossrush_assets = [
+    "maps/levels/c10_samus/s201_bossrush_scorpius/s201_bossrush_scorpius.bmssd",
+    "maps/levels/c10_samus/s202_bossrush_kraid/s202_bossrush_kraid.bmssd",
+    "maps/levels/c10_samus/s203_bossrush_cu_artaria/s203_bossrush_cu_artaria.bmssd",
+    "maps/levels/c10_samus/s204_bossrush_drogyga/s204_bossrush_drogyga.bmssd",
+    "maps/levels/c10_samus/s205_bossrush_strong_rcs/s205_bossrush_strong_rcs.bmssd",
+    "maps/levels/c10_samus/s206_bossrush_escue/s206_bossrush_escue.bmssd",
+    "maps/levels/c10_samus/s207_bossrush_cooldownx/s207_bossrush_cooldownx.bmssd",
+    "maps/levels/c10_samus/s208_bossrush_strong_rcs_x2/s208_bossrush_strong_rcs_x2.bmssd",
+    "maps/levels/c10_samus/s209_bossrush_golzuna/s209_bossrush_golzuna.bmssd",
+    "maps/levels/c10_samus/s210_bossrush_elite_cwx/s210_bossrush_elite_cwx.bmssd",
+    "maps/levels/c10_samus/s211_bossrush_cu_ferenia/s211_bossrush_cu_ferenia.bmssd",
+    "maps/levels/c10_samus/s212_bossrush_commander/s212_bossrush_commander.bmssd",
+]
+
 sr_missing = [
     "maps/levels/c10_samus/s901_alpha/s901_alpha.bmssd",
     "maps/levels/c10_samus/s902_gamma/s902_gamma.bmssd",
@@ -21,9 +36,14 @@
 ]
 
 
-@pytest.mark.parametrize("bmssd_path", dread_data.all_files_ending_with(".bmssd"))
-def test_compare_dread(dread_file_tree, bmssd_path):
-    parse_build_compare_editor(Bmssd, dread_file_tree, bmssd_path)
+@pytest.mark.parametrize("bmssd_path", dread_data.all_files_ending_with(".bmssd", bossrush_assets))
+def test_compare_dread_100(dread_tree_100, bmssd_path):
+    parse_build_compare_editor(Bmssd, dread_tree_100, bmssd_path)
+
+
+@pytest.mark.parametrize("bmssd_path", bossrush_assets)
+def test_compare_dread_210(dread_tree_210, bmssd_path):
+    parse_build_compare_editor(Bmssd, dread_tree_210, bmssd_path)
 
 
 @pytest.mark.parametrize("bmssd_path", samus_returns_data.all_files_ending_with(".bmssd", sr_missing))

tests/formats/test_bmtre.py

@@ -6,5 +6,5 @@
 
 
 @pytest.mark.parametrize("bmtre_path", dread_data.all_files_ending_with(".bmtre"))
-def test_bmtre(dread_file_tree, bmtre_path):
-    parse_build_compare_editor(Bmtre, dread_file_tree, bmtre_path)
+def test_bmtre(dread_tree_100, bmtre_path):
+    parse_build_compare_editor(Bmtre, dread_tree_100, bmtre_path)

tests/formats/test_bnvib.py

@@ -6,5 +6,5 @@
 
 
 @pytest.mark.parametrize("bnvib_path", dread_data.all_files_ending_with(".bnvib"))
-def test_bnvib(dread_file_tree, bnvib_path):
-    parse_build_compare_editor(Bnvib, dread_file_tree, bnvib_path)
+def test_bnvib(dread_tree_100, bnvib_path):
+    parse_build_compare_editor(Bnvib, dread_tree_100, bnvib_path)

tests/formats/test_bpsi.py

@@ -6,10 +6,15 @@
 
 
 @pytest.mark.parametrize("bpsi_path", dread_data.all_files_ending_with(".bpsi"))
-def test_bpsi_dread(dread_file_tree, bpsi_path):
-    parse_build_compare_editor(Bpsi, dread_file_tree, bpsi_path)
+def test_bpsi_dread_100(dread_tree_100, bpsi_path):
+    parse_build_compare_editor(Bpsi, dread_tree_100, bpsi_path)
+
+
+@pytest.mark.parametrize("bpsi_path", dread_data.all_files_ending_with(".bpsi"))
+def test_bpsi_dread_210(dread_tree_210, bpsi_path):
+    parse_build_compare_editor(Bpsi, dread_tree_210, bpsi_path)
 
 
 @pytest.mark.parametrize("bpsi_path", samus_returns_data.all_files_ending_with(".bpsi"))
-def test_bpsi_sr(dread_file_tree, bpsi_path):
-    parse_build_compare_editor(Bpsi, dread_file_tree, bpsi_path)
+def test_bpsi_sr(samus_returns_tree, bpsi_path):
+    parse_build_compare_editor(Bpsi, samus_returns_tree, bpsi_path)

tests/formats/test_bptdat.py

@@ -6,10 +6,10 @@
 
 
 @pytest.mark.parametrize("bptdat_path", dread_data.all_files_ending_with(".bptdat"))
-def test_bptdat(dread_file_tree, bptdat_path):
-    parse_build_compare_editor(Bptdat, dread_file_tree, bptdat_path)
+def test_bptdat(dread_tree_100, bptdat_path):
+    parse_build_compare_editor(Bptdat, dread_tree_100, bptdat_path)
 
 
 @pytest.mark.parametrize("bptdef_path", dread_data.all_files_ending_with(".bptdef"))
-def test_bptdef(dread_file_tree, bptdef_path):
-    parse_build_compare_editor(Bptdef, dread_file_tree, bptdef_path)
+def test_bptdef(dread_tree_100, bptdef_path):
+    parse_build_compare_editor(Bptdef, dread_tree_100, bptdef_path)

tests/formats/test_brem.py

@@ -0,0 +1,30 @@
+import pytest
+from tests.test_lib import parse_build_compare_editor
+
+from mercury_engine_data_structures import dread_data
+from mercury_engine_data_structures.formats.brem import Brem
+
+bossrush_assets = [
+    "maps/levels/c10_samus/s201_bossrush_scorpius/s201_bossrush_scorpius.brem",
+    "maps/levels/c10_samus/s202_bossrush_kraid/s202_bossrush_kraid.brem",
+    "maps/levels/c10_samus/s203_bossrush_cu_artaria/s203_bossrush_cu_artaria.brem",
+    "maps/levels/c10_samus/s204_bossrush_drogyga/s204_bossrush_drogyga.brem",
+    "maps/levels/c10_samus/s205_bossrush_strong_rcs/s205_bossrush_strong_rcs.brem",
+    "maps/levels/c10_samus/s206_bossrush_escue/s206_bossrush_escue.brem",
+    "maps/levels/c10_samus/s207_bossrush_cooldownx/s207_bossrush_cooldownx.brem",
+    "maps/levels/c10_samus/s208_bossrush_strong_rcs_x2/s208_bossrush_strong_rcs_x2.brem",
+    "maps/levels/c10_samus/s209_bossrush_golzuna/s209_bossrush_golzuna.brem",
+    "maps/levels/c10_samus/s210_bossrush_elite_cwx/s210_bossrush_elite_cwx.brem",
+    "maps/levels/c10_samus/s211_bossrush_cu_ferenia/s211_bossrush_cu_ferenia.brem",
+    "maps/levels/c10_samus/s212_bossrush_commander/s212_bossrush_commander.brem",
+]
+
+
+@pytest.mark.parametrize("brem_path", dread_data.all_files_ending_with(".brem", bossrush_assets))
+def test_dread_brem_100(dread_tree_100, brem_path):
+    parse_build_compare_editor(Brem, dread_tree_100, brem_path)
+
+
+@pytest.mark.parametrize("brem_path", bossrush_assets)
+def test_dread_brem_210(dread_tree_210, brem_path):
+    parse_build_compare_editor(Brem, dread_tree_210, brem_path)