Timespinner: Align Lantern Logic #5562
Open
+17
−17
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
waiting-on: peer-review
Jarno458
added
the
is: bug/fix
ScipioWright
added
the
waiting-on: world-maintainer
|
#5561 |
Raspberryfloof
suggested changes
Oct 17, 2025
worlds/timespinner/Locations.py
Outdated
| LocationData('Royal towers', 'Royal Towers: Pre-Climb Lantern 1', 1337609, logic.can_break_lanterns), | ||
| LocationData('Royal towers', 'Royal Towers: Pre-Climb Lantern 2', 1337610, logic.can_break_lanterns), | ||
| LocationData('Royal towers', 'Royal Towers: Bottom Struggle Lantern', 1337611, logic.can_break_lanterns), | ||
| LocationData('Royal towers', 'Royal Towers: Bottom Struggle Lantern', 1337611, lambda state: logic.can_creak_lanterns(state) and logic.has_doublejump_of_npc(state)), |
There was a problem hiding this comment.
There's a typo here: can_creak_lanterns should be can_break_lanterns.
| LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret Lantern 1', 1337389, lambda state: logic.can_break_lanterns(state) and logic.can_break_walls(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))), | ||
| LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret Lantern 2', 1337390, lambda state: logic.can_break_lanterns(state) and logic.can_break_walls(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))), | ||
| LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret Lantern 3', 1337391, lambda state: logic.can_break_lanterns(state) and logic.can_break_walls(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))), | ||
| LocationData('Ancient Pyramid (left)', 'Ancient Pyramid: Regret Lantern 4', 1337392, lambda state: logic.can_break_lanterns(state) and logic.can_break_walls(state) and (not flooded.flood_pyramid_shaft or state.has('Water Mask', player))), |
There was a problem hiding this comment.
Pit Secret Lanterns and Pit Secret's Secret Lanterns should also require logic.can_break_walls(state). Looks like you missed those?
There was a problem hiding this comment.
Fixed. Looks like that save wasn't pushed with the rest of my commit.
worlds/timespinner/Locations.py
Outdated
| LocationData('Main Lab', 'Lab: Lower Trash Lantern 1', 1337292, lambda state: logic.can_break_lanterns(state) and (logic.has_doublejump_of_npc(state) if options.lock_key_amadeus else logic.has_upwarddash(state))), | ||
| LocationData('Main Lab', 'Lab: Lower Trash Lantern 2', 1337293, lambda state: logic.can_break_lanterns(state) and (logic.has_doublejump_of_npc(state) if options.lock_key_amadeus else logic.has_upwarddash(state))), | ||
| LocationData('Main Lab', 'Lab: Trash Jump Lantern 1', 1337282, lambda state: logic.can_break_lanterns(state) and logic.has_doublejump(state)), | ||
| LocationData('Main Lab', 'Lab: Trash Jump Lantern 2', 1337283, lambda state: logic.can_break_lanterns(state) and logic.has_doublejump(state)), |
There was a problem hiding this comment.
Does Trash Jump Lantern 2 require has_doublejump or has_doublejump_of_npc?
There was a problem hiding this comment.
Fixed- got thrown off as these were both too strict before, but the former is before the falling debris and the latter after it.
|
Feedback addressed. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this fixing or adding?
Fixes logic for certain lanterns that were inconsistent with the base rando's logic.
Namely:
How was this tested?
Reviewing the locations in question and their placement within the levels using the debug room warp tool and cross checking their logic against other items in the same room, both in the logic here and in the base rando.
If this makes graphical changes, please attach screenshots.
No graphical changes.