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

Merge branch 'main' into breaking_changes

Browse Source
This commit is contained in:
Fabian Dill
2021-01-30 23:40:25 +01:00
parent 28c12054dd c988ec24b6
commit 2553b1d2ee
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
worlds/alttp/Items.py
View File

@@ -186,7 +186,7 @@ item_table = {'Bow': (True, None, 0x0B, 'You have\nchosen the\narcher class.', '
'Open Floodgate': (True, 'Event', None, None, None, None, None, None, None, None),
}
lookup_id_to_name = {data[3]: name for name, data in item_table.items()}
lookup_id_to_name = {data[2]: name for name, data in item_table.items()}
hint_blacklist = {"Triforce"}
@@ -228,8 +228,8 @@ for basename, substring in _simple_groups:
del (_simple_groups)
progression_items = {name for name, data in item_table.items() if type(data[3]) == int and data[0]}
item_name_groups['Everything'] = {name for name, data in item_table.items() if type(data[3]) == int}
progression_items = {name for name, data in item_table.items() if type(data[2]) == int and data[0]}
item_name_groups['Everything'] = {name for name, data in item_table.items() if type(data[2]) == int}
item_name_groups['Progression Items'] = progression_items
item_name_groups['Non Progression Items'] = item_name_groups['Everything'] - progression_items