Skip to content

Commit

Permalink
The Witness: Add Fast Travel Option (#3766)
Browse files Browse the repository at this point in the history 
* add unlockable warps

* Change Swamp Near Platform to Swamp Platform

* apply changes to variety as well
  • Loading branch information
@NewSoupVi
NewSoupVi authored Nov 29, 2024
1 parent 62e4285 commit 82260d7
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 8 deletions.
4 changes: 2 additions & 2 deletions worlds/witness/data/WitnessLogic.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -752,12 +752,12 @@ Swamp Entry Area (Swamp) - Swamp Sliding Bridge - TrueOneWay:
158300 - 0x00987 (Intro Back 7) - 0x00985 - Shapers
158301 - 0x181A9 (Intro Back 8) - 0x00987 - Shapers

Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Near Platform - 0x00609:
Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Platform - 0x00609:
158302 - 0x00609 (Sliding Bridge) - True - Shapers
159342 - 0x0105D (Sliding Bridge Left EP) - 0x00609 - True
159343 - 0x0A304 (Sliding Bridge Right EP) - 0x00609 - True

Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
Swamp Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
158313 - 0x00982 (Platform Row 1) - True - Shapers
158314 - 0x0097F (Platform Row 2) - 0x00982 - Shapers
158315 - 0x0098F (Platform Row 3) - 0x0097F - Shapers
Expand Down
4 changes: 2 additions & 2 deletions worlds/witness/data/WitnessLogicExpert.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -752,12 +752,12 @@ Swamp Entry Area (Swamp) - Swamp Sliding Bridge - TrueOneWay:
158300 - 0x00987 (Intro Back 7) - 0x00985 - Shapers & Rotated Shapers & Triangles & Black/White Squares
158301 - 0x181A9 (Intro Back 8) - 0x00987 - Rotated Shapers & Triangles & Black/White Squares

Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Near Platform - 0x00609:
Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Platform - 0x00609:
158302 - 0x00609 (Sliding Bridge) - True - Shapers & Black/White Squares
159342 - 0x0105D (Sliding Bridge Left EP) - 0x00609 - True
159343 - 0x0A304 (Sliding Bridge Right EP) - 0x00609 - True

Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
Swamp Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
158313 - 0x00982 (Platform Row 1) - True - Rotated Shapers
158314 - 0x0097F (Platform Row 2) - 0x00982 - Rotated Shapers
158315 - 0x0098F (Platform Row 3) - 0x0097F - Rotated Shapers
Expand Down
4 changes: 2 additions & 2 deletions worlds/witness/data/WitnessLogicVanilla.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -752,12 +752,12 @@ Swamp Entry Area (Swamp) - Swamp Sliding Bridge - TrueOneWay:
158300 - 0x00987 (Intro Back 7) - 0x00985 - Shapers
158301 - 0x181A9 (Intro Back 8) - 0x00987 - Shapers

Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Near Platform - 0x00609:
Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Platform - 0x00609:
158302 - 0x00609 (Sliding Bridge) - True - Shapers
159342 - 0x0105D (Sliding Bridge Left EP) - 0x00609 - True
159343 - 0x0A304 (Sliding Bridge Right EP) - 0x00609 - True

Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
Swamp Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
158313 - 0x00982 (Platform Row 1) - True - Shapers
158314 - 0x0097F (Platform Row 2) - 0x00982 - Shapers
158315 - 0x0098F (Platform Row 3) - 0x0097F - Shapers
Expand Down
4 changes: 2 additions & 2 deletions worlds/witness/data/WitnessLogicVariety.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -752,12 +752,12 @@ Swamp Entry Area (Swamp) - Swamp Sliding Bridge - TrueOneWay:
158300 - 0x00987 (Intro Back 7) - 0x00985 - Rotated Shapers & Triangles
158301 - 0x181A9 (Intro Back 8) - 0x00987 - Shapers & Triangles

Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Near Platform - 0x00609:
Swamp Sliding Bridge (Swamp) - Swamp Entry Area - 0x00609 - Swamp Platform - 0x00609:
158302 - 0x00609 (Sliding Bridge) - True - Shapers
159342 - 0x0105D (Sliding Bridge Left EP) - 0x00609 - True
159343 - 0x0A304 (Sliding Bridge Right EP) - 0x00609 - True

Swamp Near Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
Swamp Platform (Swamp) - Swamp Cyan Underwater - 0x04B7F - Swamp Near Boat - 0x38AE6 - Swamp Between Bridges Near - 0x184B7 - Swamp Sliding Bridge - TrueOneWay:
158313 - 0x00982 (Platform Row 1) - True - Shapers
158314 - 0x0097F (Platform Row 2) - 0x00982 - Shapers
158315 - 0x0098F (Platform Row 3) - 0x0097F - Shapers
Expand Down
14 changes: 14 additions & 0 deletions worlds/witness/options.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,16 @@ class ObeliskKeys(DefaultOnToggle):
display_name = "Obelisk Keys"


class UnlockableWarps(Toggle):
"""
Adds unlockable fast travel points to the game.
These warp points are represented by spheres in game. You walk up to one, you unlock it for warping.
The warp points are: Entry, Symmetry Island, Desert, Quarry, Keep, Shipwreck, Town, Jungle, Bunker, Treehouse, Mountaintop, Caves.
"""
display_name = "Unlockable Fast Travel Points"


class ShufflePostgame(Toggle):
"""
Adds locations into the pool that are guaranteed to become accessible after or at the same time as your goal.
Expand Down Expand Up @@ -424,6 +434,7 @@ class TheWitnessOptions(PerGameCommonOptions):
shuffle_discarded_panels: ShuffleDiscardedPanels
shuffle_vault_boxes: ShuffleVaultBoxes
obelisk_keys: ObeliskKeys
unlockable_warps: UnlockableWarps
shuffle_EPs: ShuffleEnvironmentalPuzzles # noqa: N815
EP_difficulty: EnvironmentalPuzzlesDifficulty
shuffle_postgame: ShufflePostgame
Expand Down Expand Up @@ -479,6 +490,9 @@ class TheWitnessOptions(PerGameCommonOptions):
ShuffleBoat,
ObeliskKeys,
]),
OptionGroup("Warps", [
UnlockableWarps,
]),
OptionGroup("Filler Items", [
PuzzleSkipAmount,
TrapPercentage,
Expand Down

0 comments on commit 82260d7

Please sign in to comment.