1 files changed, 54 insertions, 1 deletions

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 
-from Options import PerGameCommonOptions, Toggle, Choice, DefaultOnToggle, Range, OptionSet
+from Options import PerGameCommonOptions, Toggle, Choice, DefaultOnToggle, Range, OptionSet, FreeText
 
 
 class ShuffleDoors(DefaultOnToggle):
@@ -44,6 +44,17 @@ class ShuffleLetters(Choice):
     option_item_cyan = 4
 
 
+class RestrictLetterPlacements(Toggle):
+    """
+    If enabled, letter items will be shuffled among letter locations in your local world. Shuffle Letters must be set to
+    Progressive or Item Cyan for this to be useful.
+
+    WARNING: This option may slow down generation. Additionally, it is only reliable with Shuffle Letters set to Item
+    Cyan. When set to Progressive, Shuffle Doors and Shuffle Symbols must be turned off.
+    """
+    display_name = "Restrict Letter Placements"
+
+
 class ShuffleSymbols(Toggle):
     """
     If enabled, 19 items will be added to the pool, representing the different symbols that can appear on a panel.
@@ -91,6 +102,27 @@ class CyanDoorBehavior(Choice):
     option_item = 2
 
 
+class ShuffleFastTravel(Toggle):
+    """If enabled, the list of maps you can fast travel to is randomized, except for The Entry, which is always
+    accessible."""
+    display_name = "Shuffle Fast Travel"
+
+
+class FastTravelAccess(Choice):
+    """
+    Controls how the fast travel buttons on the pause menu work.
+
+    - **Vanilla**: You can only fast travel to maps once you have been to them and stepped foot in the general area that
+      the warp would place you. This option means that fast travel has no impact on logic.
+    - **Unlocked**: All five fast travel maps will be available from the start.
+    - **Items**: Only The Entry is available from the start. The other fast travel buttons are locked behind items.
+    """
+    display_name = "Fast Travel Access"
+    option_vanilla = 0
+    option_unlocked = 1
+    option_items = 2
+
+
 class EnableIcarus(Toggle):
     """
     Controls whether Icarus is randomized. If disabled, which is the default, no locations or items will be created for
@@ -146,6 +178,15 @@ class DaedalusRoofAccess(Toggle):
     display_name = "Allow Daedalus Roof Access"
 
 
+class CustomMintEnding(FreeText):
+    """
+    If not blank, this will add a new panel that must be solved before collecting Mint Ending (EXIT in the Control
+    Center). The panel will only require typing the text provided for this option, which means the choice of letters
+    here has an impact on logic.
+    """
+    display_name = "Custom Mint Ending"
+
+
 class StrictPurpleEnding(DefaultOnToggle):
     """
     If enabled, the player will be required to have all purple (level 1) letters in order to get Purple Ending.
@@ -224,23 +265,35 @@ class TrapPercentage(Range):
     default = 0
 
 
+class ShuffleMusic(Toggle):
+    """
+    If enabled, every map will be assigned a random music track.
+    """
+    display_name = "Shuffle Music"
+
+
 @dataclass
 class Lingo2Options(PerGameCommonOptions):
     shuffle_doors: ShuffleDoors
     shuffle_control_center_colors: ShuffleControlCenterColors
     shuffle_gallery_paintings: ShuffleGalleryPaintings
     shuffle_letters: ShuffleLetters
+    restrict_letter_placements: RestrictLetterPlacements
     shuffle_symbols: ShuffleSymbols
     shuffle_worldports: ShuffleWorldports
     keyholder_sanity: KeyholderSanity
     cyan_door_behavior: CyanDoorBehavior
+    shuffle_fast_travel: ShuffleFastTravel
+    fast_travel_access: FastTravelAccess
     enable_icarus: EnableIcarus
     enable_gift_maps: EnableGiftMaps
     daedalus_only: DaedalusOnly
     daedalus_roof_access: DaedalusRoofAccess
+    custom_mint_ending: CustomMintEnding
     strict_purple_ending: StrictPurpleEnding
     strict_cyan_ending: StrictCyanEnding
     victory_condition: VictoryCondition
     endings_requirement: EndingsRequirement
     masteries_requirement: MasteriesRequirement
     trap_percentage: TrapPercentage
+    shuffle_music: ShuffleMusic