Fixed broken locations in Timespinner (ArchipelagoMW#213)

* Fixed mixed up locations for Aelana's chest and pedestal.
Can provide screenshots for proof.

* Fixed mixed up locations for Upper Lake Desolation double jump cave floor and platform.
Can provide screenshots for proof.

* Fixed up mixed locations for:
Aelana's chest and pedestal
Upper desolation double jump cave platform and floor
upper sealedcave after sirends chest 1 and chest 2

* Updated data version from 6 to 7

worlds/timespinner/Locations.py

@@ -28,8 +28,8 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L
         LocationData('Lower lake desolation', 'Tank chest',  1337009, lambda state: state._timespinner_has_timestop(world, player)),
         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', 'Upper desolation double jump cave platform',  1337012, lambda state: state._timespinner_has_doublejump(world, player)),
+        LocationData('Upper lake desolation', 'Upper desolation double jump cave floor',  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)),
@@ -72,8 +72,8 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L
         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('Sealed Caves (Sirens)', 'Upper sealed cave after sirens chest 1',  1337056),
+        LocationData('Sealed Caves (Sirens)', 'Upper sealed cave after sirens chest 2',  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 (hangar)', 'Military soldiers bridge',  1337060),
@@ -180,8 +180,8 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L
         LocationData('Royal towers (upper)', 'Before Aelana',  1337152),
         LocationData('Royal towers (upper)', 'Killed Aelana',  EventId),
         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)', 'Aelana\'s chest',  1337155),
+        LocationData('Royal towers (upper)', 'Aelana\'s chest',  1337154),
+        LocationData('Royal towers (upper)', 'Aelana\'s pedestal',  1337155),
 
         #AncientPyramidLocations
         LocationData('Ancient Pyramid (left)', 'Why not it\'s right there',  1337246),

worlds/timespinner/__init__.py

@@ -18,7 +18,7 @@ class TimespinnerWorld(World):
     game = "Timespinner"
     topology_present = True
     remote_items = False
-    data_version = 6
+    data_version = 7
 
     item_name_to_id = {name: data.code for name, data in item_table.items()}
     location_name_to_id = {location.name: location.code for location in get_locations(None, None)}