Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jul 22, 2024
1 parent cdd84c7 commit d0e1b68
Show file tree
Hide file tree
Showing 9 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/mercury_engine_data_structures/dread_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ def all_files_ending_with(ext: str, exclusions: Optional[list[str]] = None) -> l

if exclusions is None:
exclusions = []

return [name for name in all_name_to_asset_id().keys()
if name.endswith(ext) and name not in exclusions]
4 changes: 2 additions & 2 deletions src/mercury_engine_data_structures/samus_returns_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ def all_files_ending_with(ext: str, exclusions: Optional[list[str]] = None) -> l

if exclusions is None:
exclusions = []

return [name for name in all_name_to_asset_id().keys()
if name.endswith(ext) and name not in exclusions]
if name.endswith(ext) and name not in exclusions]
1 change: 0 additions & 1 deletion tests/formats/test_bctex.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from mercury_engine_data_structures import dread_data, samus_returns_data
from mercury_engine_data_structures.formats.bctex import Bctex


sr_missing = [
"actors/characters/alpha/models/textures/alphab_a.bctex",
"actors/characters/alpha/models/textures/alphab_d.bctex",
Expand Down
1 change: 0 additions & 1 deletion tests/formats/test_bmsbk.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from mercury_engine_data_structures import samus_returns_data
from mercury_engine_data_structures.formats.bmsbk import Bmsbk


sr_missing = [
"maps/levels/c10_samus/s908_manicminerbotrun/s908_manicminerbotrun.bmsbk",
"maps/levels/c10_samus/s910_gym/s910_gym.bmsbk",
Expand Down
1 change: 0 additions & 1 deletion tests/formats/test_bmsld.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from mercury_engine_data_structures import samus_returns_data
from mercury_engine_data_structures.formats.bmsld import Bmsld


sr_missing = [
"maps/levels/c10_samus/s901_alpha/s901_alpha.bmsld",
"maps/levels/c10_samus/s902_gamma/s902_gamma.bmsld",
Expand Down
1 change: 0 additions & 1 deletion tests/formats/test_bmsnav.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from mercury_engine_data_structures import dread_data, samus_returns_data
from mercury_engine_data_structures.formats.bmsnav import Bmsnav


sr_missing = [
"maps/levels/c10_samus/s901_alpha/s901_alpha.bmsnav",
"maps/levels/c10_samus/s902_gamma/s902_gamma.bmsnav",
Expand Down
1 change: 0 additions & 1 deletion tests/formats/test_bmssd.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from mercury_engine_data_structures import dread_data, samus_returns_data
from mercury_engine_data_structures.formats.bmssd import Bmssd


sr_missing = [
"maps/levels/c10_samus/s901_alpha/s901_alpha.bmssd",
"maps/levels/c10_samus/s902_gamma/s902_gamma.bmssd",
Expand Down
1 change: 0 additions & 1 deletion tests/formats/test_pkg.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from mercury_engine_data_structures.formats.pkg import Pkg
from mercury_engine_data_structures.game_check import Game


_EMPTY_DREAD_PKG = (b'\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')

wrong_build_sr = [
Expand Down
5 changes: 2 additions & 3 deletions tests/test_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

import construct
import pytest
from construct.lib.containers import Container

from mercury_engine_data_structures.file_tree_editor import FileTreeEditor
from mercury_engine_data_structures.formats import BaseResource
Expand Down Expand Up @@ -35,7 +34,7 @@ def _parse_build_compare(module: typing.Type[BaseResource],
if print_data:
print(data)
encoded = construct_class.build(data, target_game=editor.target_game)

return raw, encoded, data

def parse_build_compare_editor(module: typing.Type[BaseResource],
Expand All @@ -47,7 +46,7 @@ def parse_build_compare_editor(module: typing.Type[BaseResource],
def parse_build_compare_editor_parsed(module: typing.Type[BaseResource],
editor: FileTreeEditor, file_name: str, print_data=False):
_, encoded, data = _parse_build_compare(module, editor, file_name, print_data)

construct_class = module.construct_class(editor.target_game)
data2 = construct_class.parse(encoded, target_game=editor.target_game)

Expand Down

0 comments on commit d0e1b68

Please sign in to comment.