Skip to content
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.

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

update bmsad #62

Merged
merged 12 commits into from
Aug 23, 2023
Merged

update bmsad #62

merged 12 commits into from
Aug 23, 2023

Conversation

duncathan
Copy link
Contributor

more accurate for dread; more complete for SR. SR bmsad embeds bmsas and i am miserable about it

this is a super breaking change for ODR and OSRR

@dyceron
Copy link
Contributor

dyceron commented Aug 18, 2023

I gather that the one Dread test still fails?

@duncathan
Copy link
Contributor Author

yeah that bmsad is like actually corrupt I'm pretty sure? I haven't checked in a while but I remember it being really broken

Copy link
Contributor

@dyceron dyceron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we can update the Readme finally 😛

@codecov
Copy link

codecov bot commented Aug 18, 2023

Codecov Report

Patch coverage: 88.96% and project coverage change: +2.15% 🎉

Comparison is base (edd33d0) 69.10% compared to head (b91126b) 71.25%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main      #62      +/-   ##
==========================================
+ Coverage   69.10%   71.25%   +2.15%     
==========================================
  Files          54       54              
  Lines        2544     2811     +267     
==========================================
+ Hits         1758     2003     +245     
- Misses        786      808      +22     
Files Changed Coverage Δ
...ry_engine_data_structures/formats/base_resource.py 91.42% <85.71%> (-1.91%) ⬇️
...rc/mercury_engine_data_structures/formats/bmsad.py 89.69% <88.58%> (-8.31%) ⬇️
...rc/mercury_engine_data_structures/formats/bmsas.py 93.02% <89.65%> (-6.98%) ⬇️
...mercury_engine_data_structures/file_tree_editor.py 48.36% <100.00%> (+0.42%) ⬆️
...c/mercury_engine_data_structures/formats/bmsnav.py 100.00% <100.00%> (ø)
...ry_engine_data_structures/formats/property_enum.py 81.01% <100.00%> (+14.34%) ⬆️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

src/mercury_engine_data_structures/formats/bmsad.py Outdated Show resolved Hide resolved


Argument = Struct(
ArgListDread = DictAdapter(make_vector(Struct(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make a _arg_list function that creates the ArgListXX, since it only differs by the ArgTypes

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, the value differs as well. SR has an explicit type field which dread lacks

src/mercury_engine_data_structures/formats/bmsas.py Outdated Show resolved Hide resolved
src/mercury_engine_data_structures/formats/bmsad.py Outdated Show resolved Hide resolved
steven11sjf and others added 8 commits August 19, 2023 03:13
- mostly just a simpler format of Dread's navmesh
- geo_connections have 3 bytes added to the start of each entry
- there's an unknown struct that seems to be there for metroids,
  probably similar to how emmy actions are in dread
more accurate for dread; complete for SR. SR bmsad embeds bmsas
@@ -111,6 +111,7 @@ def _emitbuild(self, code: construct.CodeGen):

PropertyEnum = CRCAdapter(HashSet.PROPERTY)
PropertyEnumUnsafe = CRCAdapter(HashSet.PROPERTY, True)
PropertyEnumDoubleUnsafe = CRCAdapter(HashSet.PROPERTY, True, False)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfection.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I'm proud of this one ngl

@henriquegemignani henriquegemignani merged commit 916942e into main Aug 23, 2023
7 checks passed
@henriquegemignani henriquegemignani deleted the feature/bmsad branch August 23, 2023 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants