added item info percent, controls the percent of checks to be collected for earned item info mode, few checks cleanup

Author: FabulaFey

worlds/crystal_project/__init__.py

@@ -835,6 +835,7 @@ def fill_slot_data(self) -> Dict[str, Any]:
             "includeSummonAbilities": self.options.include_summon_abilities.value,
             "includeScholarAbilities": self.options.include_scholar_abilities.value,
             "itemInfoMode": self.options.item_info_mode.value,
+            "earnedItemInfoPercent": self.options.earned_item_info_percent.value,
             "randomizeMusic": bool(self.options.randomize_music.value),
             "useMods": self.options.use_mods.value,
             "modInfo": mod_info,

worlds/crystal_project/locations.py

@@ -1512,8 +1512,8 @@ def get_boss_locations(player: int, options: CrystalProjectOptions | None) -> Li
         LocationData(THE_DEPTHS_AP_REGION, THE_DEPTHS_DISPLAY_NAME + " Boss - The Peacekeeper", 2579 + boss_index_offset, lambda state: logic.is_area_in_level_range(state, PEACEKEEPER_FIGHT_LEVEL), tags=[END_GAME_BOSS_LOCATION_GROUP]), #Monster ID: 169
         LocationData(THE_DEPTHS_AP_REGION, THE_DEPTHS_DISPLAY_NAME + " Boss - With STEM WARD in hand, offer 4 Deity Eyes to battle Gabriel", 2580 + boss_index_offset, lambda state: state.has(DEITY_EYE, player, 4) and state.has(STEM_WARD, player) and logic.is_area_in_level_range(state, GABRIEL_FIGHT_LEVEL), tags=[END_GAME_BOSS_LOCATION_GROUP, FETCH_QUEST_LOCATION_GROUP]), #Monster ID: 241
         LocationData(CASTLE_SEQUOIA_AP_REGION, CASTLE_SEQUOIA_DISPLAY_NAME + " Boss - Parasite X", 1457 + boss_index_offset, lambda state: logic.is_area_in_level_range(state, PARASITE_X_FIGHT_LEVEL)), #Monster ID: 198 (Castle Sequoia (Skums) Z58_TrapdoorGuard)
-        LocationData(CASTLE_SEQUOIA_AP_REGION, CASTLE_SEQUOIA_DISPLAY_NAME + " Boss - Neo Warden", 1477 + boss_index_offset, lambda state: logic.is_area_in_level_range(state, NEO_WARDEN_FIGHT_LEVEL)), #Monster ID: 200 (Castle Sequoia (Bounce) Z58_F2TrapdoorGuard)
-        LocationData(CASTLE_SEQUOIA_AP_REGION, CASTLE_SEQUOIA_DISPLAY_NAME + " Boss - Akamanto", 1503 + boss_index_offset, lambda state: logic.is_area_in_level_range(state, AKAMANTO_FIGHT_LEVEL)), #Monster ID: 201 (Castle Sequoia (Ice) Z58_F3TrapdoorGuard)
+        LocationData(CASTLE_SEQUOIA_SHROOM_AP_REGION, CASTLE_SEQUOIA_DISPLAY_NAME + " Boss - Neo Warden", 1477 + boss_index_offset, lambda state: logic.is_area_in_level_range(state, NEO_WARDEN_FIGHT_LEVEL)), #Monster ID: 200 (Castle Sequoia (Bounce) Z58_F2TrapdoorGuard)
+        LocationData(CASTLE_SEQUOIA_ICE_AP_REGION, CASTLE_SEQUOIA_DISPLAY_NAME + " Boss - Akamanto", 1503 + boss_index_offset, lambda state: logic.is_area_in_level_range(state, AKAMANTO_FIGHT_LEVEL)), #Monster ID: 201 (Castle Sequoia (Ice) Z58_F3TrapdoorGuard)
         LocationData(THE_OLD_WORLD_AP_REGION, THE_OLD_WORLD_DISPLAY_NAME + " Boss - Periculum", 3650 + boss_index_offset, tags=[END_GAME_BOSS_LOCATION_GROUP]), #Monster ID: 268 (min level 70)
         ]
     return location_table

worlds/crystal_project/options.py

@@ -479,7 +479,7 @@ class ItemInfoMode(Choice):
     """
     For Full, all treasure and store icons on the map will display if they are progression, useful, or filler items.
 
-    For Earned, all treasure and store icons on the map will display as mimics until you complete 50% of your checks.
+    For Earned, all treasure and store icons on the map will display as mimics until you complete 50% (configurable below) of your checks.
 
     For Obscured, all treasure and store icons on the map will display as mimics permanently.
     If you find skipping treasures is distasteful but part of your brain always wants to be efficient, this option is for you!
@@ -491,6 +491,15 @@ class ItemInfoMode(Choice):
     option_obscured = 2
     default = 0
 
+class EarnedItemInfoPercent(Range):
+    """
+    This is the likelihood that a trap will replace a filler check. A value of 0 means no traps.
+    """
+    display_name = "Percent of checks that must be collected to earn info on treasure and store icons."
+    range_start = 1
+    range_end = 99
+    default = 50
+
 class RandomizeMusic(Toggle):
     """
     When enabled, music will be randomized upon connecting to the AP World. (This toggles the base game's Randomize Music function.)
@@ -563,6 +572,7 @@ class CrystalProjectOptions(PerGameCommonOptions):
     include_scholar_abilities: IncludeScholarAbilities
     trap_likelihood: TrapLikelihood
     item_info_mode: ItemInfoMode
+    earned_item_info_percent: EarnedItemInfoPercent
     randomize_music: RandomizeMusic
     use_mods: UseMods
 
@@ -571,5 +581,5 @@ class CrystalProjectOptions(PerGameCommonOptions):
     "Location Options": [IncludedRegions, JobRando, StartingJobQuantity, DisableSparks, KillBossesMode, Shopsanity, Regionsanity, RegionsanityStarterRegionMinLevel, RegionsanityStarterRegionMaxLevel, HomePointHustle],
     "Progression Options": [ProgressiveMountMode, StartingLevel, LevelGating, LevelComparedToEnemies, ProgressiveLevelSize, MaxLevel, StartingPassivePoints, MaximumPassivePoints, PassivePointBoostSize, KeyMode, ObscureRoutes, HopToIt, PrioritizeCrystals, AutoSpendLP, AutoEquipPassives, EasyLeveling],
     "Item Pool Options": [ProgressiveEquipmentMode, StartWithTreasureFinder, StartWithMaps, FillFullMap, IncludeSummonAbilities, IncludeScholarAbilities],
-    "Bonus Fun": [ItemInfoMode, RandomizeMusic, UseMods]
+    "Bonus Fun": [ItemInfoMode, EarnedItemInfoPercent, RandomizeMusic, UseMods]
 }

worlds/crystal_project/regions.py

@@ -612,7 +612,7 @@ def init_areas(world: "CrystalProjectWorld", locations: List[LocationData], opti
     fancy_add_exits(world, ATOP_LABYRINTH_CUBE_AP_REGION, [LABYRINTH_ENTRANCE_PUSHBLOCK_AP_REGION, GOLD_BEDAZZLING_LABYRINTH_AP_REGION, TOWER_OF_ZOT_CAMP_AP_REGION, RUINS_CRUMBLING_ON_SHORE_AP_REGION, SALMON_BAY_WEST_CRAG_AP_REGION])
     fancy_add_exits(world, LABYRINTH_ENTRANCE_PUSHBLOCK_AP_REGION, [TOWER_OF_ZOT_CAMP_AP_REGION, ATOP_LABYRINTH_CUBE_AP_REGION, GOLD_BEDAZZLING_LABYRINTH_AP_REGION, ANCIENT_LABYRINTH_AP_REGION],
                     {ATOP_LABYRINTH_CUBE_AP_REGION: lambda state: logic.has_vertical_movement(state) and logic.has_golden_quintar(state),
-                     GOLD_BEDAZZLING_LABYRINTH_AP_REGION: lambda state: logic.has_glide(state) or (logic.has_horizontal_movement(state) and logic.has_vertical_movement(state)),
+                     GOLD_BEDAZZLING_LABYRINTH_AP_REGION: lambda state: logic.has_glide(state) and logic.has_vertical_movement(state),
                      ANCIENT_LABYRINTH_AP_REGION: lambda state: (state.has(POKO_POKO_DESERT_PASS, player) or logic.is_regionsanity_disabled()) and (logic.has_a_caster(state)) and (state.has(ANCIENT_TABLET_A, player) or logic.obscure_routes_on()),})
     fancy_add_exits(world, GOLD_BEDAZZLING_LABYRINTH_AP_REGION, [RUINS_CRUMBLING_ON_SHORE_AP_REGION])
     fancy_add_exits(world, POKO_POKO_LAKE_DELENDE_PASS_AP_REGION, [POKO_POKO_EAST_PLATEAU_AP_REGION, TOWER_OF_ZOT_CAMP_AP_REGION, POKO_POKO_SPAWNING_MEADOWS_PASS_AP_REGION, LAKE_DELENDE_AP_REGION, SALMON_BAY_WEST_CRAG_AP_REGION, SALMON_RIVER_MOUTH_AP_REGION],