morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Muse Dash: Make item_name_to_id and location_name_to_id ordering deterministic (#2086)

Browse Source 
* Fix up non-deterministic order of item_name_to_id and location_name_to_id.

* Remove debug line.

* Change to use a Chainmap instead and simplify logic a bit.

* Add the forgotten music sheet item.
This commit is contained in:
Justus Lind
2023-08-11 19:02:35 +10:00
committed by GitHub
parent d0c6eaf239
commit 3643b1de2c
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
worlds/musedash/MuseDashCollection.py
View File

@@ -1,5 +1,6 @@
from .Items import SongData, AlbumData
from typing import Dict, List, Optional
from collections import ChainMap
def load_text_file(name: str) -> str:
@@ -10,6 +11,7 @@ def load_text_file(name: str) -> str:
class MuseDashCollections:
"""Contains all the data of Muse Dash, loaded from MuseDashData.txt."""
MUSIC_SHEET_NAME: str = "Music Sheet"
MUSIC_SHEET_CODE: int
FREE_ALBUMS = [
@@ -45,11 +47,15 @@ class MuseDashCollections:
"Error SFX Trap": 9,
}
item_names_to_id = ChainMap({}, sfx_trap_items, vfx_trap_items)
location_names_to_id = ChainMap(song_locations, album_locations)
def __init__(self, start_item_id: int, items_per_location: int):
self.MUSIC_SHEET_CODE = start_item_id
self.item_names_to_id[self.MUSIC_SHEET_NAME] = self.MUSIC_SHEET_CODE
self.vfx_trap_items = {k: (v + start_item_id) for (k, v) in self.vfx_trap_items.items()}
self.sfx_trap_items = {k: (v + start_item_id) for (k, v) in self.sfx_trap_items.items()}
self.vfx_trap_items.update({k: (v + start_item_id) for (k, v) in self.vfx_trap_items.items()})
self.sfx_trap_items.update({k: (v + start_item_id) for (k, v) in self.sfx_trap_items.items()})
item_id_index = start_item_id + 50
location_id_index = start_item_id
@@ -85,6 +91,9 @@ class MuseDashCollections:
diff_of_easy, diff_of_hard, diff_of_master)
item_id_index += 1
self.item_names_to_id.update({name: data.code for name, data in self.song_items.items()})
self.item_names_to_id.update({name: data.code for name, data in self.album_items.items()})
for name in self.album_items.keys():
for i in range(0, items_per_location):
new_name = f"{name}-{i}"