added HopToIt player option for adding higher difficulty jumping challenges

Author: dragonsbutalsorabbits

worlds/crystal_project/__init__.py

@@ -137,6 +137,7 @@ def generate_early(self):
                     self.options.max_level.value = slot_data["maxLevel"]
                     self.options.key_mode.value = slot_data["keyMode"]
                     self.options.obscure_routes.value = slot_data["obscureRoutes"]
+                    self.options.hop_to_it.value = slot_data["hopToIt"]
                     self.options.include_summon_abilities.value = slot_data["includeSummonAbilities"]
                     self.options.include_scholar_abilities.value = slot_data["includeScholarAbilities"]
                     self.options.use_mods.value = slot_data["useMods"]
@@ -743,6 +744,7 @@ def fill_slot_data(self) -> Dict[str, Any]:
             "maxLevel": self.options.max_level.value,
             "keyMode": self.options.key_mode.value,
             "obscureRoutes": bool(self.options.obscure_routes.value),
+            "hopToIt": self.options.hop_to_it.value,
             "autoSpendLP": bool(self.options.auto_spend_lp.value),
             "autoEquipPassives": bool(self.options.auto_equip_passives.value),
             "easyLeveling": bool(self.options.easy_leveling.value),

worlds/crystal_project/locations.py

@@ -1231,7 +1231,7 @@ def get_treasure_and_npc_locations(player: int, options: CrystalProjectOptions |
         #Jidamba Eaclaneya
         #Treasure chests
         #Four Tricky Block Branches
-        LocationData(EACLANEYA_TRICKY_BLOCK_BRANCHES_AP_REGION, JIDAMBA_EACLANEYA_DISPLAY_NAME + " Chest - Climb the lamp in the south room", 2799 + treasure_index_offset, lambda state: logic.has_horizontal_movement(state) and logic.has_vertical_movement(state)), #Celestial Crown chest
+        LocationData(EACLANEYA_TRICKY_BLOCK_BRANCHES_AP_REGION, JIDAMBA_EACLANEYA_DISPLAY_NAME + " Chest - Climb the lamp in the south room", 2799 + treasure_index_offset, lambda state: ((logic.has_horizontal_movement(state) and options.hop_to_it.value >= options.hop_to_it.option_fancy_footwork) or logic.has_glide(state)) and logic.has_vertical_movement(state)), #Celestial Crown chest
         LocationData(EACLANEYA_TRICKY_BLOCK_BRANCHES_AP_REGION, JIDAMBA_EACLANEYA_DISPLAY_NAME + " Chest - At the end of spike hallway", 2755 + treasure_index_offset, lambda state: logic.has_glide(state)), #Flame Sword chest
         LocationData(EACLANEYA_TRICKY_BLOCK_BRANCHES_AP_REGION, JIDAMBA_EACLANEYA_DISPLAY_NAME + " Chest - Monster cubby", 2920 + treasure_index_offset), #Jidamba Eaclaneya map chest
         #Land of Timer Fishes

worlds/crystal_project/options.py

@@ -329,6 +329,20 @@ class ObscureRoutes(Toggle):
     """
     display_name = "Obscure Routes"
 
+class HopToIt(Choice):
+    """
+    No Tricks: No fancy hops expected.
+    Fancy Footwork: Some above-average jumping skill expected, e.g. jumping past the pushblocks in Eaclaneya with no mounts or Auto-Jump-level jumping precision.
+    One Hop Beyond: More jumping tricks expected, like ibek jumping up from underneath a ledge.
+    Pray: You didn't *want* the Golden Quintar for the Sequoia, did you?
+    """
+    display_name = "Hop To It"
+    option_no_tricks = 0
+    option_fancy_footwork = 1
+    option_one_hop_beyond = 2
+    option_pray = 3
+    default = 0
+
 class PrioritizeCrystals(DefaultOnToggle):
     """
     When enabled, crystals will be prioritized when placing progression items.
@@ -493,6 +507,7 @@ class CrystalProjectOptions(PerGameCommonOptions):
     max_level: MaxLevel
     key_mode: KeyMode
     obscure_routes: ObscureRoutes
+    hop_to_it: HopToIt
     prioritize_crystals: PrioritizeCrystals
     auto_spend_lp: AutoSpendLP
     auto_equip_passives: AutoEquipPassives
@@ -511,7 +526,7 @@ class CrystalProjectOptions(PerGameCommonOptions):
 crystal_project_option_groups: Dict[str, List[Any]] = {
     "Goal Options": [Goal, ClamshellGoalQuantity, ExtraClamshellsInPool, AstleyJobQuantity],
     "Location Options": [IncludedRegions, JobRando, StartingJobQuantity, DisableSparks, KillBossesMode, Shopsanity, Regionsanity, RegionsanityStarterRegionMinLevel, RegionsanityStarterRegionMaxLevel, HomePointHustle],
-    "Progression Options": [ProgressiveMountMode, StartingLevel, LevelGating, LevelComparedToEnemies, ProgressiveLevelSize, MaxLevel, KeyMode, ObscureRoutes, PrioritizeCrystals, AutoSpendLP, AutoEquipPassives, EasyLeveling],
+    "Progression Options": [ProgressiveMountMode, StartingLevel, LevelGating, LevelComparedToEnemies, ProgressiveLevelSize, MaxLevel, KeyMode, ObscureRoutes, HopToIt, PrioritizeCrystals, AutoSpendLP, AutoEquipPassives, EasyLeveling],
     "Item Pool Options": [ProgressiveEquipmentMode, StartWithTreasureFinder, StartWithMaps, FillFullMap, IncludeSummonAbilities, IncludeScholarAbilities],
     "Bonus Fun": [ItemInfoMode, RandomizeMusic, UseMods]
 }

worlds/crystal_project/regions.py

@@ -9,6 +9,7 @@
 from .constants.display_regions import *
 from .constants.home_points import *
 from .constants.level_requirements import *
+from .constants.mounts import *
 from .constants.teleport_stones import *
 from .constants.region_passes import *
 
@@ -552,7 +553,7 @@ def init_areas(world: "CrystalProjectWorld", locations: List[LocationData], opti
     fancy_add_exits(world, TOWER_OF_ZOT_AP_REGION, [POKO_POKO_DESERT_AP_REGION, POKO_POKO_EAST_PLATEAU_AP_REGION, RUINS_CRUMBLING_ON_SHORE_AP_REGION, ANCIENT_LABYRINTH_AP_REGION, SALMON_BAY_AP_REGION, SALMON_RIVER_MOUTH_AP_REGION],
                     {POKO_POKO_EAST_PLATEAU_AP_REGION: lambda state: logic.has_glide(state),
                      ANCIENT_LABYRINTH_AP_REGION: lambda state: (state.has(POKO_POKO_DESERT_PASS, player) or options.regionsanity.value == options.regionsanity.option_disabled) and (state.has(ANCIENT_TABLET_A, player) or logic.obscure_routes_on(state)) and logic.has_vertical_movement(state) and logic.has_glide(state),
-                     SALMON_BAY_AP_REGION: lambda state: logic.has_vertical_movement(state),
+                     SALMON_BAY_AP_REGION: lambda state: logic.has_vertical_movement(state) and options.hop_to_it.value >= options.hop_to_it.option_one_hop_beyond,
                      SALMON_RIVER_MOUTH_AP_REGION: lambda state: logic.has_vertical_movement(state) and logic.has_glide(state)})
     fancy_add_exits(world, POKO_POKO_LAKE_DELENDE_PASS_AP_REGION, [POKO_POKO_EAST_PLATEAU_AP_REGION, POKO_POKO_SPAWNING_MEADOWS_PASS_AP_REGION, LAKE_DELENDE_AP_REGION, SALMON_RIVER_MOUTH_AP_REGION],
                     {POKO_POKO_SPAWNING_MEADOWS_PASS_AP_REGION: lambda state: logic.has_glide(state),
@@ -917,7 +918,7 @@ def init_areas(world: "CrystalProjectWorld", locations: List[LocationData], opti
     fancy_add_exits(world, EACLANEYA_ENTRANCE_AP_REGION, [EACLANEYA_TRICKY_BLOCK_BRANCHES_AP_REGION],
                     {EACLANEYA_TRICKY_BLOCK_BRANCHES_AP_REGION: lambda state: state.has(JIDAMBA_EACLANEYA_PASS, player) or options.regionsanity.value == options.regionsanity.option_disabled})
     fancy_add_exits(world, EACLANEYA_TRICKY_BLOCK_BRANCHES_AP_REGION, [LAND_OF_TIMER_FISHES_AP_REGION],
-                    {LAND_OF_TIMER_FISHES_AP_REGION: lambda state: logic.has_glide(state) and (state.has(JIDAMBA_EACLANEYA_PASS, player) or options.regionsanity.value == options.regionsanity.option_disabled)})
+                    {LAND_OF_TIMER_FISHES_AP_REGION: lambda state: logic.has_glide(state) and (state.has(JIDAMBA_EACLANEYA_PASS, player) or options.regionsanity.value == options.regionsanity.option_disabled) and (state.has(PROGRESSIVE_QUINTAR_WOODWIND, player, 1) or state.has(PROGRESSIVE_MOUNT, player, 2) or options.hop_to_it.value >= options.hop_to_it.option_fancy_footwork)})
     fancy_add_exits(world, LAND_OF_TIMER_FISHES_AP_REGION, [SALMON_ROOM_AP_REGION],
                     {SALMON_ROOM_AP_REGION: lambda state: state.has(JIDAMBA_EACLANEYA_PASS, player) or options.regionsanity.value == options.regionsanity.option_disabled})
     fancy_add_exits(world, SALMON_ROOM_AP_REGION, [THE_DEEP_SEA_AP_REGION],