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.

… 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.

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

worlds/timespinner/Options.py

+        if self.PyramidStart != PyramidStart.default and \
+            self.pyramid_start == PyramidStart.default:
+            self.pyramid_start.value = self.PyramidStart.value
+            self.has_replaced_options.value = Toggle.option_true


I'm not sold on the idea of supporting the old casing for the new settings, but decided to put them in for posterity.

I'll let Jarno decide on this, but I'm pretty sure I heard them say in the past that there's no need to add new options to the backwards compat stuff

Yeah don't put new options in backward compatibility, if people want to use the new options they might notice the casing difference and be more eager to update

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

ScipioWright · 2025-01-27T14:16:15Z

worlds/timespinner/Options.py

+        if self.PyramidStart != PyramidStart.default and \
+            self.pyramid_start == PyramidStart.default:
+            self.pyramid_start.value = self.PyramidStart.value
+            self.has_replaced_options.value = Toggle.option_true


I'll let Jarno decide on this, but I'm pretty sure I heard them say in the past that there's no need to add new options to the backwards compat stuff

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 <[email protected]>

…unt for a Risky Warps case

Jarno458 · 2025-01-28T21:01:35Z

worlds/timespinner/Options.py

+        if self.PyramidStart != PyramidStart.default and \
+            self.pyramid_start == PyramidStart.default:
+            self.pyramid_start.value = self.PyramidStart.value
+            self.has_replaced_options.value = Toggle.option_true


Yeah don't put new options in backward compatibility, if people want to use the new options they might notice the casing difference and be more eager to update

…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:

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/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

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 <[email protected]>

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

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

sgrunt commented Jan 27, 2025

sgrunt Jan 27, 2025

sgrunt Jan 27, 2025

ScipioWright Jan 27, 2025

Jarno458 Jan 28, 2025

sgrunt Jan 28, 2025

sgrunt Jan 27, 2025

sgrunt Jan 27, 2025

sgrunt Jan 27, 2025

sgrunt Jan 27, 2025

ScipioWright left a comment

ScipioWright Jan 27, 2025

sgrunt Jan 27, 2025 •

edited

Loading

sgrunt Jan 27, 2025

sgrunt Jan 27, 2025

Jarno458 Jan 28, 2025

sgrunt Jan 28, 2025


		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

Are you sure you want to change the base?

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

Conversation

sgrunt commented Jan 27, 2025

What is this fixing or adding?

How was this tested?

If this makes graphical changes, please attach screenshots.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ScipioWright left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sgrunt Jan 27, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sgrunt Jan 27, 2025 •

edited

Loading