Timespinner: support new flags and settings from the randomizer #4559

sgrunt · 2025-01-27T02:38:00Z

What is this fixing or adding?

Several flags and settings have been added to recent releases of the Timespinner randomiser; this pull requests updates the apworld to support those flags and settings. There is a companion pull request for the randomiser itself, Jarno458/TsRandomizer#164, to properly support a couple of the new flags and settings here.

How was this tested?

Rolled several seeds locally to check logic. Ran webhost to verify updates to the tracker. Played through a webhosted seed to verify general functionality (and tracker updates).

If this makes graphical changes, please attach screenshots.

Since the above screenshot was posted, I've adjusted the colours of the laser access items (lower left corner) to look better and more closely match what the upstream item tracker shows. Here's how they currently appear:

… in upstream settings

sgrunt · 2025-01-27T02:40:29Z

WebHostLib/static/styles/timespinnerTracker.css

+}
+#inventory-table img.acquired.crimson{ /*DB143B*/
+    filter: hue-rotate(348deg) saturate(8.3) brightness(0.47);
+}


These three colours are the same as those used by the randomiser's item tracker for the three Laser Access items.

worlds/timespinner/Options.py

sgrunt · 2025-01-27T02:42:43Z

worlds/timespinner/PreCalculatedWeights.py


-        if options.inverted:
+        if options.inverted or (options.pyramid_start and not options.back_to_the_future):


Strictly speaking this doesn't match the in-randomiser logic (which will allow both past and present for pyramid start mode based on my understanding), but generation tends to fail out if I don't restrict this case to present gates.

worlds/timespinner/Regions.py

sgrunt · 2025-01-27T02:44:59Z

worlds/timespinner/Regions.py

@@ -125,7 +125,7 @@ def create_regions_and_locations(world: MultiWorld, player: int, options: Timesp
    connect(world, player, 'Sealed Caves (Xarion)', 'Skeleton Shaft')
    connect(world, player, 'Sealed Caves (Xarion)', 'Space time continuum', logic.has_teleport)
    connect(world, player, 'Refugee Camp', 'Forest')
-    connect(world, player, 'Refugee Camp', 'Library', lambda state: options.inverted and options.back_to_the_future and state.has_all({'Timespinner Wheel', 'Timespinner Spindle'}, player))
+    connect(world, player, 'Refugee Camp', 'Library', lambda state: (options.pyramid_start or options.inverted) and options.back_to_the_future and state.has_all({'Timespinner Wheel', 'Timespinner Spindle'}, player))


In-rando logic checks for "not present start", encompassing both pyramid start and inverted.

sgrunt · 2025-01-27T02:45:10Z

worlds/timespinner/Regions.py

@@ -162,9 +162,12 @@ def create_regions_and_locations(world: MultiWorld, player: int, options: Timesp
    connect(world, player, 'Royal towers (upper)', 'Royal towers')
    #connect(world, player, 'Ancient Pyramid (entrance)', 'The lab (upper)', lambda state: not is_option_enabled(world, player, "EnterSandman"))
    connect(world, player, 'Ancient Pyramid (entrance)', 'Ancient Pyramid (left)', logic.has_doublejump)
+    connect(world, player, 'Ancient Pyramid (entrance)', 'Space time continuum', logic.has_teleport)


These are here to support pyramid start.

sgrunt · 2025-01-27T02:45:49Z

worlds/timespinner/__init__.py

@@ -376,7 +388,8 @@ def assign_starter_item(self, excluded_items: Set[str], location: str, item_list
        self.place_locked_item(excluded_items, location, item_name)

    def place_first_progression_item(self, excluded_items: Set[str]) -> None:
-        if self.options.quick_seed or self.options.inverted or self.precalculated_weights.flood_lake_desolation:
+        if (self.options.quick_seed or self.options.inverted or self.precalculated_weights.flood_lake_desolation) \
+        and not self.options.pyramid_start:


Enabling the early progression placement here to allow pyramid start seeds to generate faster (there are all of three checks open initially).

ScipioWright

Only did code review, I do not know the game so I cannot comment on the logic

worlds/timespinner/Locations.py

worlds/timespinner/Options.py

sgrunt · 2025-01-27T15:37:18Z

worlds/timespinner/Locations.py

-            LocationData('The lab (power off)', 'Lab: Middle terminal (Amadeus Laboratory Map)',  1337166, lambda state: state.has('Tablet', player)),
-            LocationData('The lab (power off)', 'Lab: Sentry platform terminal (Origins)',  1337167, lambda state: state.has('Tablet', player)),
+            LocationData('The lab (power off)', 'Lab: Middle terminal (Amadeus Laboratory Map)',  1337166, lambda state: state.has('Tablet', player) and (not options.lock_key_amadeus or state.has('Lab Access Research', player))),
+            LocationData('The lab (power off)', 'Lab: Sentry platform terminal (Origins)',  1337167, lambda state: state.has('Tablet', player) and (not options.lock_key_amadeus or state.has('Lab Access Research', player))),


This matches the upstream logic, but I think this is incorrect - the room this is in is gated behind Lab Access Genza, not Lab Access Research. Check upstream and update the other PR too if needed.

I've changed this here, but I need to verify that the problem is what I think it is and also fix in the main rando if so.

Rando PR has been updated with the fix.

Per PR suggestion. Co-authored-by: Scipio Wright <scipiowright@gmail.com>

…unt for a Risky Warps case

worlds/timespinner/Options.py

…dditions

sgrunt · 2025-01-28T22:59:43Z

WebHostLib/templates/tracker__Timespinner.html

+                {% endif %}
+                {% if 'GateKeep' in options %}
+                <div class="C3">
+                    <span class="{{ 'acquired' if 'Drawbridge Key' in acquired_items }}" title="Lab Access Experiment">&#10070;</span>


There didn't seem to be a suitable icon for the sprite I used for the Drawbridge Key available from the source of the rest of the icons, so I'm emulating it with a ❖ character instead. The collected version looks like this:

…ir own category

…asement is accessible at the lower Rising Tides flooding level

worlds/timespinner/__init__.py

Jarno458 · 2025-02-22T16:05:36Z

I did test this, seem to generate fine, so i am happy with it minus the comment i added above

…ramid start starter progression items

sgrunt · 2025-02-22T17:06:45Z

worlds/timespinner/Regions.py

-    connect(world, player, 'Space time continuum', 'Ancient Pyramid (left)', lambda state: logic.can_teleport_to(state, "Time", "GateLeftPyramid"))
+    connect(world, player, 'Space time continuum', 'Military Fortress (hangar)', lambda state: logic.can_teleport_to(state, "Present", "GateLabEntrance"))
+    connect(world, player, 'Space time continuum', 'The lab (upper)', lambda state: logic.can_teleport_to(state, "Present", "GateDadsTower"))
+    connect(world, player, 'Space time continuum', 'Ancient Pyramid (entrance)', lambda state: logic.can_teleport_to(state, "Time", "GateGyre") or logic.can_teleport_to(state, "Time", "GateLeftPyramid") or (not options.unchained_keys and options.enter_sandman))


Stumbled across the GateLeftPyramid issue while reviewing some additional pyramid start generations after my latest change - as per client logic GateLeftPyramid goes to the entrance and not the area that requires double jump to get to.

It's an existing bug, but not fixing it will make it very likely that we run into issues when the pyramid start starter item gates to GateLeftPyramid.

Jarno458

Tested, LGTM

…hind the lasers

Exempt-Medic

One small comment.
I saw that both Locations.py and Regions.py are now checking options inside of rules. Rules are an incredibly hot code path, so these checks can make generations take longer. I personally don't think it's a vital/required change for this PR, especially since it's not like it's being done on every single rule, but it's definitely something to keep in mind and for @Jarno458 to consider

WebHostLib/tracker.py

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

…ipelagoMW#4559) * Timespinner: Add "no hell spiders" enemy rando option that is present in upstream settings * Timespinner: Prism Break support tweaks (including tracker support) * Timespinner: Add support for upstream Lock Key Amadeus flag * Timespinner: Add support for upstream Risky Warps flag * Timespinner: Add support for upstream Pyramid Start flag * Timespinner: fix error in lab connectivity logic * Timespinner: use has_all to simplify one check Per PR suggestion. Co-authored-by: Scipio Wright <scipiowright@gmail.com> * Timespinner: fix apparent logic error inherited from in-rando logic * Timespinner: adjust "Origins" location logic slightly further to account for a Risky Warps case * Timespinner: remove the backward compat options for the recent flag additions * Timespinner: add newly added Gate Keep option from rando * Timespinner: adjust the laser access colours in the tracker * Timespinner: fix an item description in the tracker * Timespinner: based on testing feedback, put Laser Access items in their own category * Timespinner: add support for new upstream flag Royal Roadblock * Timespinner: also ensure the new flag gets put in slot data * Timespinner: fix bug in universal tracker support indicating castle basement is accessible at the lower Rising Tides flooding level * Timespinner: exclude Talaria Attachment and Timespinner Wheel from pyramid start starter progression items * Timespinner: fix region logic for the left pyramid warp * Timespinner: fix main Gyre access logic when Risky Warps warps you behind the lasers * Timespinner: apply suggested spacing fix Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --------- Co-authored-by: sgrunt <sgrunt1987@gmail.com> Co-authored-by: Scipio Wright <scipiowright@gmail.com>

sgrunt added 5 commits January 26, 2025 16:57

Timespinner: Add "no hell spiders" enemy rando option that is present…

c349606

… in upstream settings

Timespinner: Prism Break support tweaks (including tracker support)

5f327b1

Timespinner: Add support for upstream Lock Key Amadeus flag

e546a28

Timespinner: Add support for upstream Risky Warps flag

0799321

Timespinner: Add support for upstream Pyramid Start flag

f1f1e9f

github-actions bot added affects: webhost Issues/PRs that touch webhost and may need additional validation. waiting-on: peer-review Issue/PR has not been reviewed by enough people yet. labels Jan 27, 2025

sgrunt mentioned this pull request Jan 27, 2025

Updates to support new flags/settings in Archipelago Jarno458/TsRandomizer#164

Merged

sgrunt commented Jan 27, 2025

View reviewed changes

worlds/timespinner/Options.py Outdated Show resolved Hide resolved

sgrunt commented Jan 27, 2025

View reviewed changes

worlds/timespinner/Regions.py Outdated Show resolved Hide resolved

sgrunt commented Jan 27, 2025

View reviewed changes

Timespinner: fix error in lab connectivity logic

0ec28c8

ScipioWright added waiting-on: world-maintainer Issue/PR is waiting for feedback or approval by the maintainer of a world. is: enhancement Issues requesting new features or pull requests implementing new features. labels Jan 27, 2025

ScipioWright requested a review from Jarno458 January 27, 2025 14:12

ScipioWright approved these changes Jan 27, 2025

View reviewed changes

worlds/timespinner/Locations.py Outdated Show resolved Hide resolved

worlds/timespinner/Options.py Outdated Show resolved Hide resolved

sgrunt commented Jan 27, 2025

View reviewed changes

sgrunt and others added 3 commits January 27, 2025 08:37

Timespinner: use has_all to simplify one check

6717be6

Per PR suggestion. Co-authored-by: Scipio Wright <scipiowright@gmail.com>

Timespinner: fix apparent logic error inherited from in-rando logic

21f6c6e

Timespinner: adjust "Origins" location logic slightly further to acco…

1333275

…unt for a Risky Warps case

Jarno458 suggested changes Jan 28, 2025

View reviewed changes

worlds/timespinner/Options.py Outdated Show resolved Hide resolved

sgrunt added 2 commits January 28, 2025 15:14

Timespinner: remove the backward compat options for the recent flag a…

1d08ab1

…dditions

Timespinner: add newly added Gate Keep option from rando

7565ae4

sgrunt commented Jan 28, 2025

View reviewed changes

Timespinner: adjust the laser access colours in the tracker

2894621

sgrunt requested a review from Jarno458 January 30, 2025 14:13

sgrunt added 5 commits February 1, 2025 13:06

Timespinner: fix an item description in the tracker

f85cd57

Timespinner: based on testing feedback, put Laser Access items in the…

1680af3

…ir own category

Timespinner: add support for new upstream flag Royal Roadblock

0509a99

Timespinner: also ensure the new flag gets put in slot data

fbdccb3

Timespinner: fix bug in universal tracker support indicating castle b…

f1506b2

…asement is accessible at the lower Rising Tides flooding level

Jarno458 suggested changes Feb 22, 2025

View reviewed changes

worlds/timespinner/__init__.py Show resolved Hide resolved

Jarno458 added waiting-on: author Issue/PR is waiting for feedback or changes from its author. and removed waiting-on: world-maintainer Issue/PR is waiting for feedback or approval by the maintainer of a world. labels Feb 22, 2025

Timespinner: exclude Talaria Attachment and Timespinner Wheel from py…

cf9efc5

…ramid start starter progression items

sgrunt requested a review from Jarno458 February 22, 2025 16:20

Timespinner: fix region logic for the left pyramid warp

40cfbbc

sgrunt commented Feb 22, 2025

View reviewed changes

Jarno458 approved these changes Feb 22, 2025

View reviewed changes

Timespinner: fix main Gyre access logic when Risky Warps warps you be…

49b9e82

…hind the lasers

Exempt-Medic reviewed Mar 8, 2025

View reviewed changes

WebHostLib/tracker.py Outdated Show resolved Hide resolved

Timespinner: apply suggested spacing fix

e8f8890

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

Exempt-Medic approved these changes Mar 8, 2025

View reviewed changes

Merge branch 'main' into ts-new-flags

1447774

Exempt-Medic merged commit 5662da6 into ArchipelagoMW:main Mar 8, 2025
16 checks passed

sgrunt mentioned this pull request Mar 8, 2025

Timespinner: move options checks out of rules #4708

Closed


		if options.inverted:
		if options.inverted or (options.pyramid_start and not options.back_to_the_future):

Timespinner: support new flags and settings from the randomizer #4559

Timespinner: support new flags and settings from the randomizer #4559

Uh oh!

Conversation

sgrunt commented Jan 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What is this fixing or adding?

How was this tested?

If this makes graphical changes, please attach screenshots.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ScipioWright left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

sgrunt Jan 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Jarno458 commented Feb 22, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Jarno458 left a comment

Choose a reason for hiding this comment

Uh oh!

Exempt-Medic left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sgrunt commented Jan 27, 2025 •

edited

Loading

sgrunt Jan 27, 2025 •

edited

Loading

Exempt-Medic left a comment •

edited

Loading