Skip to content

edit minimap tiles in DLR#133

Merged
biosp4rk merged 5 commits intoMetroidAdvRandomizerSystem:mainfrom
duncathan:feature/dlr-icons
Mar 14, 2025
Merged

edit minimap tiles in DLR#133
biosp4rk merged 5 commits intoMetroidAdvRandomizerSystem:mainfrom
duncathan:feature/dlr-icons

Conversation

@duncathan
Copy link
Copy Markdown
Contributor

Fixes #132
image

It's not perfect, since there are still some tiles missing in vanilla, but the vast majority of tiles do in fact exist so it's still a pretty major improvement.

It'd probably be best to wait until MetroidAdvRandomizerSystem/mars-fusion-asm#217 is available before this goes through

p.s. im sorry for the code quality have fun reviewing 🫶

@duncathan
Copy link
Copy Markdown
Contributor Author

went back and made my code somewhat less awful

@biosp4rk
Copy link
Copy Markdown
Collaborator

All of your code comments are lowercase, but this repo uses sentence casing

@biosp4rk
Copy link
Copy Markdown
Collaborator

Things I can take care of:

  • Adding new minimap tiles for ones that don't exist
  • Breaking the door lock function into smaller functions

@duncathan duncathan requested a review from biosp4rk March 10, 2025 19:01
@duncathan
Copy link
Copy Markdown
Contributor Author

updated with the requested changes as well as a fix for my alg trying to flip tiles with asymmetric contents such as nav stations

@biosp4rk
Copy link
Copy Markdown
Collaborator

mypy errors:

  Found 14 errors in 2 files (checked 40 source files)
  src/mars_patcher/constants/minimap_tiles.py:71: error: Incompatible types in assignment (expression has type "ColoredDoor", variable has type "Edge")  [assignment]
  src/mars_patcher/constants/minimap_tiles.py:75: error: Cannot determine type of "top"  [has-type]
  src/mars_patcher/constants/minimap_tiles.py:76: error: Cannot determine type of "left"  [has-type]
  src/mars_patcher/constants/minimap_tiles.py:77: error: Cannot determine type of "right"  [has-type]
  src/mars_patcher/constants/minimap_tiles.py:78: error: Cannot determine type of "bottom"  [has-type]
  src/mars_patcher/constants/minimap_tiles.py:116: error: Unpacking a string is disallowed  [misc]
  src/mars_patcher/constants/minimap_tiles.py:118: error: Cannot determine type of "tl"  [has-type]
  src/mars_patcher/constants/minimap_tiles.py:119: error: Cannot determine type of "tr"  [has-type]
  src/mars_patcher/constants/minimap_tiles.py:120: error: Cannot determine type of "bl"  [has-type]
  src/mars_patcher/constants/minimap_tiles.py:121: error: Cannot determine type of "br"  [has-type]
  src/mars_patcher/door_locks.py:104: error: Function is missing a return type annotation  [no-untyped-def]
  src/mars_patcher/door_locks.py:236: error: Argument 2 to "change_minimap_tiles" has incompatible type "defaultdict[int, defaultdict[tuple[int, int, int], MinimapLockChanges]]"; expected "dict[int, dict[tuple[int, int, int], MinimapLockChanges]]"  [arg-type]
  src/mars_patcher/door_locks.py:273: error: Function is missing a return type annotation  [no-untyped-def]

@biosp4rk biosp4rk merged commit 2114e7d into MetroidAdvRandomizerSystem:main Mar 14, 2025
9 checks passed
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.

DLR: change minimap tiles to match door colors

2 participants