From b3ae4b86e49582355e4f2819eff5fe3be54f7428 Mon Sep 17 00:00:00 2001 From: alwaysintreble Date: Sun, 28 Nov 2021 15:33:51 -0600 Subject: [PATCH] TS: Rename various locations for clarity (#139) * Rename various locations for clarity --- worlds/timespinner/Locations.py | 160 ++++++++++++++++---------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/worlds/timespinner/Locations.py b/worlds/timespinner/Locations.py index b1895b4c..5cc107da 100644 --- a/worlds/timespinner/Locations.py +++ b/worlds/timespinner/Locations.py @@ -23,17 +23,17 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L LocationData('Lower lake desolation', 'Chicken chest', 1337007, lambda state: state._timespinner_has_timestop(world, player)), LocationData('Lower lake desolation', 'Not so secret room', 1337008, lambda state: state._timespinner_can_break_walls(world, player)), LocationData('Lower lake desolation', 'Tank chest', 1337009, lambda state: state._timespinner_has_timestop(world, player)), - LocationData('Upper lake desolation', 'Oxygen recovery room', 1337010), - LocationData('Upper lake desolation', 'Lake secret', 1337011, lambda state: state._timespinner_can_break_walls(world, player)), - LocationData('Upper lake desolation', 'Double jump cave floor', 1337012, lambda state: state._timespinner_has_doublejump(world, player)), - LocationData('Upper lake desolation', 'Double jump cave platform', 1337013), + LocationData('Upper lake desolation', 'Upper desolation Oxygen recovery room', 1337010), + LocationData('Upper lake desolation', 'Upper desolation secret', 1337011, lambda state: state._timespinner_can_break_walls(world, player)), + LocationData('Upper lake desolation', 'Upper desolation double jump cave floor', 1337012, lambda state: state._timespinner_has_doublejump(world, player)), + LocationData('Upper lake desolation', 'Upper desolation double jump cave platform', 1337013), LocationData('Upper lake desolation', 'Fire-Locked sparrow chest', 1337014), LocationData('Upper lake desolation', 'Crash site pedestal', 1337015), LocationData('Upper lake desolation', 'Crash site chest 1', 1337016, lambda state: state.has_all(['Killed Maw', 'Gas Mask'], player)), LocationData('Upper lake desolation', 'Crash site chest 2', 1337017, lambda state: state.has_all(['Killed Maw', 'Gas Mask'], player)), LocationData('Upper lake desolation', 'Kitty Boss', 1337018), - LocationData('Library', 'Basement', 1337019), - LocationData('Library', 'Consolation', 1337020), + LocationData('Library', 'Library Basement', 1337019), + LocationData('Library', 'Library warp gate', 1337020), LocationData('Library', 'Librarian', 1337021), LocationData('Library', 'Reading nook chest', 1337022), LocationData('Library', 'Storage room chest 1', 1337023, lambda state: state._timespinner_has_keycard_D(world, player)), @@ -46,43 +46,43 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L LocationData('Library top', 'Backer room chest 1', 1337030), LocationData('Varndagroth tower left', 'Elevator Key not required', 1337031), LocationData('Varndagroth tower left', 'Ye olde Timespinner', 1337032), - LocationData('Varndagroth tower left', 'C Keycard chest', 1337033, lambda state: state._timespinner_has_keycard_C(world, player)), + LocationData('Varndagroth tower left', 'Varndagroth left bottom floor', 1337033, lambda state: state._timespinner_has_keycard_C(world, player)), LocationData('Varndagroth tower left', 'Left air vents secret', 1337034, lambda state: state._timespinner_can_break_walls(world, player)), LocationData('Varndagroth tower left', 'Left elevator chest', 1337035, lambda state: state.has('Elevator Keycard', player)), - LocationData('Varndagroth tower right (upper)', 'Spider heck room', 1337036), - LocationData('Varndagroth tower right (elevator)', 'Right elevator chest', 1337037), + LocationData('Varndagroth tower right (upper)', 'Varndagroth bridge', 1337036), + LocationData('Varndagroth tower right (elevator)', 'Right Varndagroth elevator chest', 1337037), LocationData('Varndagroth tower right (upper)', 'Elevator card chest', 1337038, lambda state: state.has('Elevator Keycard', player) or state._timespinner_has_doublejump(world, player)), - LocationData('Varndagroth tower right (upper)', 'Air vents left', 1337039, lambda state: state.has('Elevator Keycard', player) or state._timespinner_has_doublejump(world, player)), - LocationData('Varndagroth tower right (upper)', 'Air Vents right', 1337040, lambda state: state.has('Elevator Keycard', player) or state._timespinner_has_doublejump(world, player)), - LocationData('Varndagroth tower right (lower)', 'Right side bottom floor', 1337041), + LocationData('Varndagroth tower right (upper)', 'Air vents right', 1337039, lambda state: state.has('Elevator Keycard', player) or state._timespinner_has_doublejump(world, player)), + LocationData('Varndagroth tower right (upper)', 'Air Vents left', 1337040, lambda state: state.has('Elevator Keycard', player) or state._timespinner_has_doublejump(world, player)), + LocationData('Varndagroth tower right (lower)', 'Varndagroth right bottom floor', 1337041), LocationData('Varndagroth tower right (elevator)', 'Varndagroth', 1337042, lambda state: state._timespinner_has_keycard_C(world, player)), LocationData('Varndagroth tower right (elevator)', 'Varndagroth Spider hell', 1337043, lambda state: state._timespinner_has_keycard_A(world, player)), LocationData('Skeleton Shaft', 'Skeleton', 1337044), - LocationData('Sealed Caves (Xarion)', 'Shroom jump room', 1337045, lambda state: state._timespinner_has_timestop(world, player)), - LocationData('Sealed Caves (Xarion)', 'Double shroom room', 1337046), - LocationData('Sealed Caves (Xarion)', 'Mini jackpot room', 1337047, lambda state: state._timespinner_has_forwarddash_doublejump(world, player)), - LocationData('Sealed Caves (Xarion)', 'Below mini jackpot room', 1337048), + LocationData('Sealed Caves (Xarion)', 'Sealed cave shroom jump room', 1337045, lambda state: state._timespinner_has_timestop(world, player)), + LocationData('Sealed Caves (Xarion)', 'Sealed cave double shroom room', 1337046), + LocationData('Sealed Caves (Xarion)', 'Sealed cave Mini jackpot room', 1337047, lambda state: state._timespinner_has_forwarddash_doublejump(world, player)), + LocationData('Sealed Caves (Xarion)', 'Below sealed cave mini jackpot room', 1337048), LocationData('Sealed Caves (Xarion)', 'Sealed cave secret room', 1337049, lambda state: state._timespinner_can_break_walls(world, player)), - LocationData('Sealed Caves (Xarion)', 'Below Sealed cave secret', 1337050), + LocationData('Sealed Caves (Xarion)', 'Sealed cave bottom left', 1337050), LocationData('Sealed Caves (Xarion)', 'Last chance before Xarion', 1337051, lambda state: state._timespinner_has_doublejump(world, player)), LocationData('Sealed Caves (Xarion)', 'Xarion', 1337052), - LocationData('Sealed Caves (Sirens)', 'Solo siren chest', 1337053, lambda state: state.has('Water Mask', player)), - LocationData('Sealed Caves (Sirens)', 'Big siren room right', 1337054, lambda state: state.has('Water Mask', player)), - LocationData('Sealed Caves (Sirens)', 'Big siren Room left', 1337055, lambda state: state.has('Water Mask', player)), - LocationData('Sealed Caves (Sirens)', 'Room after sirens chest 2', 1337056), - LocationData('Sealed Caves (Sirens)', 'Room after sirens chest 1', 1337057), - LocationData('Militairy Fortress', 'Militairy Bomber chest', 1337058, lambda state: state.has('Timespinner Wheel', player) and state._timespinner_has_doublejump_of_npc(world, player)), - LocationData('Militairy Fortress', 'Close combat room', 1337059), - LocationData('Militairy Fortress', 'Bridge full of soldiers', 1337060), - LocationData('Militairy Fortress', 'Giantess Room', 1337061), - LocationData('Militairy Fortress', 'Bridge with Giantess', 1337062), - LocationData('Militairy Fortress', 'Military B door chest 2', 1337063, lambda state: state._timespinner_has_doublejump(world, player) and state._timespinner_has_keycard_B(world, player)), - LocationData('Militairy Fortress', 'Military B door chest 1', 1337064, lambda state: state._timespinner_has_doublejump(world, player) and state._timespinner_has_keycard_B(world, player)), - LocationData('Militairy Fortress', 'Military pedestal', 1337065, lambda state: state._timespinner_has_doublejump(world, player) and (state._timespinner_has_doublejump_of_npc(world, player) or state._timespinner_has_forwarddash_doublejump(world, player))), - LocationData('The lab', 'Coffee Break chest', 1337066), + LocationData('Sealed Caves (Sirens)', 'Upper sealed cave water hook', 1337053, lambda state: state.has('Water Mask', player)), + LocationData('Sealed Caves (Sirens)', 'Upper sealed cave siren room right', 1337054, lambda state: state.has('Water Mask', player)), + LocationData('Sealed Caves (Sirens)', 'Upper sealed cave siren room left', 1337055, lambda state: state.has('Water Mask', player)), + LocationData('Sealed Caves (Sirens)', 'Upper sealed cave after sirens chest 2', 1337056), + LocationData('Sealed Caves (Sirens)', 'Upper sealed cave after sirens chest 1', 1337057), + LocationData('Military Fortress', 'Military bomber chest', 1337058, lambda state: state.has('Timespinner Wheel', player) and state._timespinner_has_doublejump_of_npc(world, player)), + LocationData('Military Fortress', 'Close combat room', 1337059), + LocationData('Military Fortress', 'Military soldiers bridge', 1337060), + LocationData('Military Fortress', 'Military giantess room', 1337061), + LocationData('Military Fortress', 'Military giantess bridge', 1337062), + LocationData('Military Fortress', 'Military B door chest 2', 1337063, lambda state: state._timespinner_has_doublejump(world, player) and state._timespinner_has_keycard_B(world, player)), + LocationData('Military Fortress', 'Military B door chest 1', 1337064, lambda state: state._timespinner_has_doublejump(world, player) and state._timespinner_has_keycard_B(world, player)), + LocationData('Military Fortress', 'Military pedestal', 1337065, lambda state: state._timespinner_has_doublejump(world, player) and (state._timespinner_has_doublejump_of_npc(world, player) or state._timespinner_has_forwarddash_doublejump(world, player))), + LocationData('The lab', 'Coffee break', 1337066), LocationData('The lab', 'Lower trash right', 1337067, lambda state: state._timespinner_has_doublejump(world, player)), LocationData('The lab', 'Lower trash left', 1337068, lambda state: state._timespinner_has_upwarddash(world, player)), - LocationData('The lab', 'Single turret room', 1337069, lambda state: state._timespinner_has_doublejump(world, player)), + LocationData('The lab', 'Below lab entrance', 1337069, lambda state: state._timespinner_has_doublejump(world, player)), LocationData('The lab (power off)', 'Trash jump room', 1337070), LocationData('The lab (power off)', 'Dynamo Works', 1337071), LocationData('The lab (upper)', 'Blob mom', 1337072), @@ -90,13 +90,13 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L LocationData('The lab (upper)', 'Download and chest room', 1337074), LocationData('The lab (upper)', 'Lab secret', 1337075, lambda state: state._timespinner_can_break_walls(world, player)), LocationData('The lab (power off)', 'Lab Spider hell', 1337076, lambda state: state._timespinner_has_keycard_A(world, player)), - LocationData('Emperors tower', 'Bottom', 1337077), - LocationData('Emperors tower', 'After Courtyard Floor Secret', 1337078, lambda state: state._timespinner_has_upwarddash(world, player) and state._timespinner_can_break_walls(world, player)), - LocationData('Emperors tower', 'After Courtyard Chest', 1337079, lambda state: state._timespinner_has_upwarddash(world, player)), - LocationData('Emperors tower', 'Galactic Sage Room', 1337080), - LocationData('Emperors tower', 'Bottom of Right Tower', 1337081), + LocationData('Emperors tower', 'Dad\'s bottom', 1337077), + LocationData('Emperors tower', 'Dad\'s courtyard floor secret', 1337078, lambda state: state._timespinner_has_upwarddash(world, player) and state._timespinner_can_break_walls(world, player)), + LocationData('Emperors tower', 'Dad\'s courtyard chest', 1337079, lambda state: state._timespinner_has_upwarddash(world, player)), + LocationData('Emperors tower', 'Galactic sage room', 1337080), + LocationData('Emperors tower', 'Bottom of Dad\'s right tower', 1337081), LocationData('Emperors tower', 'Wayyyy up there', 1337082), - LocationData('Emperors tower', 'Left tower balcony', 1337083), + LocationData('Emperors tower', 'Dad\'s left tower balcony', 1337083), LocationData('Emperors tower', 'Dad\'s Chambers chest', 1337084), LocationData('Emperors tower', 'Dad\'s Chambers pedestal', 1337085), @@ -106,19 +106,19 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L LocationData('Refugee Camp', 'Refugee camp storage chest 2', 1337088), LocationData('Refugee Camp', 'Refugee camp storage chest 1', 1337089), LocationData('Forest', 'Refugee camp roof', 1337090), - LocationData('Forest', 'Bat jump chest', 1337091, lambda state: state._timespinner_has_doublejump_of_npc(world, player) or state._timespinner_has_forwarddash_doublejump(world, player) or state._timespinner_has_fastjump_on_npc(world, player)), - LocationData('Forest', 'Green platform secret', 1337092, lambda state: state._timespinner_can_break_walls(world, player)), - LocationData('Forest', 'Rats guarded chest', 1337093), + LocationData('Forest', 'Forest bat jump ledge', 1337091, lambda state: state._timespinner_has_doublejump_of_npc(world, player) or state._timespinner_has_forwarddash_doublejump(world, player) or state._timespinner_has_fastjump_on_npc(world, player)), + LocationData('Forest', 'Forest green platform secret', 1337092, lambda state: state._timespinner_can_break_walls(world, player)), + LocationData('Forest', 'Forest rats guarded chest', 1337093), LocationData('Forest', 'Waterfall chest 1', 1337094, lambda state: state.has('Water Mask', player)), LocationData('Forest', 'Waterfall chest 2', 1337095, lambda state: state.has('Water Mask', player)), - LocationData('Forest', 'Batcave', 1337096), - LocationData('Forest', 'Bridge Chest', 1337097), - LocationData('Left Side forest Caves', 'Solitary bat room', 1337098), - LocationData('Upper Lake Serene', 'Rat nest', 1337099), - LocationData('Upper Lake Serene', 'Double jump cave platform (past)', 1337100, lambda state: state._timespinner_has_doublejump(world, player)), - LocationData('Upper Lake Serene', 'Double jump cave floor (past)', 1337101), - LocationData('Upper Lake Serene', 'West lake serene cave secret', 1337102, lambda state: state._timespinner_can_break_walls(world, player)), - LocationData('Upper Lake Serene', 'Chest behind vines', 1337103), + LocationData('Forest', 'Forest batcave', 1337096), + LocationData('Forest', 'In the moat', 1337097), + LocationData('Left Side forest Caves', 'Before Serene single bat cave', 1337098), + LocationData('Upper Lake Serene', 'Upper Serene rat nest', 1337099), + LocationData('Upper Lake Serene', 'Upper Serene double jump cave platform', 1337100, lambda state: state._timespinner_has_doublejump(world, player)), + LocationData('Upper Lake Serene', 'Upper Serene double jump cave floor', 1337101), + LocationData('Upper Lake Serene', 'Upper Serene cave secret', 1337102, lambda state: state._timespinner_can_break_walls(world, player)), + LocationData('Upper Lake Serene', 'Serene behind the vines', 1337103), LocationData('Upper Lake Serene', 'Pyramid keys room', 1337104), LocationData('Lower Lake Serene', 'Deep dive', 1337105), LocationData('Lower Lake Serene', 'Under the eels', 1337106), @@ -127,53 +127,53 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L LocationData('Lower Lake Serene', 'T chest', 1337109), LocationData('Lower Lake Serene', 'Past the eels', 1337110), LocationData('Lower Lake Serene', 'Underwater pedestal', 1337111), - LocationData('Caves of Banishment (upper)', 'Mushroom double jump', 1337112, lambda state: state._timespinner_has_doublejump(world, player)), - LocationData('Caves of Banishment (upper)', 'Caves of banishment secret room', 1337113), - LocationData('Caves of Banishment (upper)', 'Below caves of banishment secret', 1337114), - LocationData('Caves of Banishment (upper)', 'Single shroom room', 1337115), - LocationData('Caves of Banishment (upper)', 'Jackpot room chest 1', 1337116, lambda state: state._timespinner_has_forwarddash_doublejump(world, player)), - LocationData('Caves of Banishment (upper)', 'Jackpot room chest 2', 1337117, lambda state: state._timespinner_has_forwarddash_doublejump(world, player)), - LocationData('Caves of Banishment (upper)', 'Jackpot room chest 3', 1337118, lambda state: state._timespinner_has_forwarddash_doublejump(world, player)), - LocationData('Caves of Banishment (upper)', 'Jackpot room chest 4', 1337119, lambda state: state._timespinner_has_forwarddash_doublejump(world, player)), + LocationData('Caves of Banishment (upper)', 'Banishment shroom jump room', 1337112, lambda state: state._timespinner_has_doublejump(world, player)), + LocationData('Caves of Banishment (upper)', 'Banishment secret room', 1337113), + LocationData('Caves of Banishment (upper)', 'Banishment bottom left', 1337114), + LocationData('Caves of Banishment (upper)', 'Banishment single shroom room', 1337115), + LocationData('Caves of Banishment (upper)', 'Banishment jackpot room chest 1', 1337116, lambda state: state._timespinner_has_forwarddash_doublejump(world, player)), + LocationData('Caves of Banishment (upper)', 'Banishment jackpot room chest 2', 1337117, lambda state: state._timespinner_has_forwarddash_doublejump(world, player)), + LocationData('Caves of Banishment (upper)', 'Banishment jackpot room chest 3', 1337118, lambda state: state._timespinner_has_forwarddash_doublejump(world, player)), + LocationData('Caves of Banishment (upper)', 'Banishment jackpot room chest 4', 1337119, lambda state: state._timespinner_has_forwarddash_doublejump(world, player)), LocationData('Caves of Banishment (upper)', 'Banishment pedestal', 1337120), LocationData('Caves of Banishment (Maw)', 'Last chance before Maw', 1337121, lambda state: state._timespinner_has_doublejump(world, player)), LocationData('Caves of Banishment (Maw)', 'Killed Maw', EventId, lambda state: state.has('Gas Mask', player)), LocationData('Caves of Banishment (Maw)', 'Mineshaft', 1337122, lambda state: state.has('Gas Mask', player)), LocationData('Caves of Banishment (Sirens)', 'Wyvern room', 1337123), - LocationData('Caves of Banishment (Sirens)', 'Above water sirens', 1337124), - LocationData('Caves of Banishment (Sirens)', 'Underwater sirens left', 1337125, lambda state: state.has('Water Mask', player)), - LocationData('Caves of Banishment (Sirens)', 'Underwater sirens right', 1337126, lambda state: state.has('Water Mask', player)), - LocationData('Caves of Banishment (Sirens)', 'Water hook', 1337127, lambda state: state.has('Water Mask', player)), - LocationData('Castle Ramparts', 'Castle Bomber chest', 1337128, lambda state: state._timespinner_has_multiple_small_jumps_of_npc(world, player)), - LocationData('Castle Ramparts', 'Freeze the engineer', 1337129, lambda state: state.has('Talaria Attachment', player) or state._timespinner_has_timestop(world, player)), - LocationData('Castle Ramparts', 'Giantess guarded room', 1337130), - LocationData('Castle Ramparts', 'Knight and archer guarded room', 1337131), - LocationData('Castle Ramparts', 'Castle pedestal', 1337132), - LocationData('Castle Keep', 'Basement secret pedestal', 1337133, lambda state: state._timespinner_can_break_walls(world, player)), - LocationData('Castle Keep', 'Break the wall', 1337134), + LocationData('Caves of Banishment (Sirens)', 'Upper banishment above sirens', 1337124), + LocationData('Caves of Banishment (Sirens)', 'Under banishment sirens left', 1337125, lambda state: state.has('Water Mask', player)), + LocationData('Caves of Banishment (Sirens)', 'Under banishment sirens right', 1337126, lambda state: state.has('Water Mask', player)), + LocationData('Caves of Banishment (Sirens)', 'Banishment water hook', 1337127, lambda state: state.has('Water Mask', player)), + LocationData('Castle Ramparts', 'Castle bomber chest', 1337128, lambda state: state._timespinner_has_multiple_small_jumps_of_npc(world, player)), + LocationData('Castle Ramparts', 'Ramparts Freeze the engineer', 1337129, lambda state: state.has('Talaria Attachment', player) or state._timespinner_has_timestop(world, player)), + LocationData('Castle Ramparts', 'Ramparts Giantess guarded room', 1337130), + LocationData('Castle Ramparts', 'Ramparts Knight and archer guarded room', 1337131), + LocationData('Castle Ramparts', 'Ramparts pedestal', 1337132), + LocationData('Castle Keep', 'Castle basement secret pedestal', 1337133, lambda state: state._timespinner_can_break_walls(world, player)), + LocationData('Castle Keep', 'Clean the castle basement', 1337134), LocationData('Royal towers (lower)', 'Yas queen room', 1337135, lambda state: state._timespinner_has_pink(world, player)), - LocationData('Castle Keep', 'Basement hammer', 1337136), + LocationData('Castle Keep', 'Castle basement giantess', 1337136), LocationData('Castle Keep', 'Omelette chest', 1337137), LocationData('Castle Keep', 'Just an egg', 1337138), - LocationData('Castle Keep', 'Out of the way', 1337139), + LocationData('Castle Keep', 'Under the twins', 1337139), LocationData('Castle Keep', 'Killed Twins', EventId, lambda state: state._timespinner_has_timestop(world, player)), LocationData('Castle Keep', 'Twins', 1337140, lambda state: state._timespinner_has_timestop(world, player)), - LocationData('Castle Keep', 'Royal guard tiny room', 1337141, lambda state: state._timespinner_has_doublejump(world, player) or state._timespinner_has_fastjump_on_npc(world,player)), + LocationData('Castle Keep', 'Royal guard tiny room', 1337141, lambda state: state._timespinner_has_doublejump(world, player) or state._timespinner_has_fastjump_on_npc(world,player)), LocationData('Royal towers (lower)', 'Royal tower floor secret', 1337142, lambda state: state._timespinner_has_doublejump(world, player) and state._timespinner_can_break_walls(world, player)), - LocationData('Royal towers', 'Above the gap', 1337143), - LocationData('Royal towers', 'Under the ice mage', 1337144), - LocationData('Royal towers (upper)', 'Next to easy struggle juggle room', 1337145), - LocationData('Royal towers (upper)', 'Easy struggle juggle', 1337146, lambda state: state._timespinner_has_doublejump_of_npc(world, player)), - LocationData('Royal towers (upper)', 'Hard struggle juggle', 1337147, lambda state: state._timespinner_has_doublejump_of_npc(world, player)), + LocationData('Royal towers', 'Royal towers pre-climb gap', 1337143), + LocationData('Royal towers', 'Royal towers long balcony', 1337144), + LocationData('Royal towers (upper)', 'Next to bottom royal tower struggle juggle', 1337145), + LocationData('Royal towers (upper)', 'Bottom royal tower struggle juggle', 1337146, lambda state: state._timespinner_has_doublejump_of_npc(world, player)), + LocationData('Royal towers (upper)', 'Top royal tower struggle juggle', 1337147, lambda state: state._timespinner_has_doublejump_of_npc(world, player)), LocationData('Royal towers (upper)', 'No struggle required', 1337148, lambda state: state._timespinner_has_doublejump_of_npc(world, player)), LocationData('Royal towers', 'Right tower freebie', 1337149), - LocationData('Royal towers (upper)', 'Above the ice mage', 1337150), - LocationData('Royal towers (upper)', 'Royal guard big room', 1337151), + LocationData('Royal towers (upper)', 'Royal towers left small balcony', 1337150), + LocationData('Royal towers (upper)', 'Royal tower left royal guard', 1337151), LocationData('Royal towers (upper)', 'Before Aelana', 1337152), LocationData('Royal towers (upper)', 'Killed Aelana', EventId), - LocationData('Royal towers (upper)', 'Statue room', 1337153, lambda state: state._timespinner_has_upwarddash(world, player)), + LocationData('Royal towers (upper)', 'Aelana\'s attic', 1337153, lambda state: state._timespinner_has_upwarddash(world, player)), LocationData('Royal towers (upper)', 'Aelana\'s pedestal', 1337154), - LocationData('Royal towers (upper)', 'After Aelana', 1337155), + LocationData('Royal towers (upper)', 'Aelana\'s chest', 1337155), # 1337157 - 1337170 Downloads