diff --git a/randomizer.py b/randomizer.py index 87ef49e..a2bd4bb 100644 --- a/randomizer.py +++ b/randomizer.py @@ -6415,6 +6415,9 @@ def make_four_keys(): keydict = get_keydict() for meo in MapEventObject.every: index = meo.index + # Door Key (6), VIP Card (153) + if index in [6, 153]: + continue signature = '{0:0>2X}-A-03'.format(index) script = meo.get_script_by_signature(signature) if script is not None: @@ -6874,9 +6877,14 @@ class VanillaObject(TableObject): def get_keydict(): - tower = {'sky', 'wind', 'cloud', 'light', 'trial', 'truth', 'narcysus'} + frue = bool(re.search(r'FRUE|KUREJI|SPEKKIO', get_global_label())) + narcysus_name = 'sacral' if frue else 'narcysus' + gratze_name = 'jail' if frue else 'basement' + dankirk_name = 'angel' if frue else 'dankirk' + + tower = {'sky', 'wind', 'cloud', 'light', 'trial', 'truth', narcysus_name} shrine = {'sword', 'heart', 'ghost'} - dungeon = {'lake', 'ruby', 'dankirk', 'basement', 'ancient'} + dungeon = {'lake', 'ruby', 'ancient', dankirk_name, gratze_name} mountain = {'magma', 'flower', 'tree'} keys = lange(0x1af, 0x1c0) + [0x1c2]