Merge pull request #53 from Emerassi/shopsanity

Shopsanity

Author: FabulaFey

worlds/crystal_project/Items.py

@@ -0,0 +1,21 @@
+BLACK_SQUIRREL = "Item - Black Squirrel"
+DOG_BONE = "Item - Dog Bone"
+CLAMSHELL = "Item - Clamshell"
+DIGESTED_HEAD = "Item - Digested Head"
+LOST_PENGUIN = "Item - Lost Penguin"
+ELEVATOR_PART = "Item - Elevator Part"
+UNDERSEA_CRAB = "Item - Undersea Crab"
+WEST_LOOKOUT_TOKEN = "Item - West Lookout Token"
+CENTRAL_LOOKOUT_TOKEN = "Item - Central Lookout Token"
+NORTH_LOOKOUT_TOKEN = "Item - North Lookout Token"
+BABEL_QUINTAR = "Item - Babel Quintar"
+#"Item - Quintar Shedding"
+CRAG_DEMON_HORN = "Item - Crag Demon Horn"
+VERMILLION_BOOK = "Item - Vermillion Book"
+VIRIDIAN_BOOK = "Item - Viridian Book"
+CERULEAN_BOOK = "Item - Cerulean Book"
+ANCIENT_TABLET_A = "Item - Ancient Tablet A"
+ANCIENT_TABLET_B = "Item - Ancient Tablet B"
+ANCIENT_TABLET_C = "Item - Ancient Tablet C"
+TREASURE_FINDER = "Item - Treasure Finder"
+PROGRESSIVE_LEVEL_CAP = "Item - Progressive Level Cap"

worlds/crystal_project/KeyItems.py

@@ -90,6 +90,7 @@ class KillBossesMode(Toggle):
     """
     display_name = "Kill Bosses Mode"
 
+    When enabled, all shop inventories will be replaced with checks. Be prepared, adventurer.
 
 class IncludedRegions(Choice):
     """

worlds/crystal_project/Constants.py worlds/crystal_project/Keys.pyworlds/crystal_project/Constants.py renamed to worlds/crystal_project/Keys.py

@@ -3,7 +3,8 @@
 from .Options import CrystalProjectOptions
 from .Locations import LocationData
 from .rules import CrystalProjectLogic
-from .Constants import *
+from .Keys import *
+from .KeyItems import *
 
 class CrystalProjectLocation(Location):
     game: str = "CrystalProject"
@@ -61,6 +62,7 @@ def init_areas(world: MultiWorld, locations: List[LocationData], options: Crysta
         create_region(world, player, locations_per_region, "Greenshire Reprise", excluded),
         create_region(world, player, locations_per_region, "Salmon Pass", excluded),
         create_region(world, player, locations_per_region, "Salmon River", excluded),
+        create_region(world, player, locations_per_region, "Shoudu Waterfront", excluded), #moved Shoudu Waterfront from Expert to Advanced
         create_region(world, player, locations_per_region, "Poko Poko Desert", excluded),
         create_region(world, player, locations_per_region, "Sara Sara Bazaar", excluded),
         create_region(world, player, locations_per_region, "Sara Sara Beach", excluded),
@@ -76,7 +78,6 @@ def init_areas(world: MultiWorld, locations: List[LocationData], options: Crysta
 
     expert_regions = [
         create_region(world, player, locations_per_region, "The Open Sea", excluded),
-        create_region(world, player, locations_per_region, "Shoudu Waterfront", excluded),
         create_region(world, player, locations_per_region, "Shoudu Province", excluded),
         create_region(world, player, locations_per_region, "The Undercity", excluded),
         create_region(world, player, locations_per_region, "Ganymede Shrine", excluded),
@@ -211,7 +212,7 @@ def init_areas(world: MultiWorld, locations: List[LocationData], options: Crysta
         {"Ancient Reservoir": lambda state: logic.has_key(state, PYRAMID_KEY) and logic.is_area_in_level_range(state, 3),
         "Lake Delende": lambda state: logic.has_vertical_movement and logic.is_area_in_level_range(state, 3),
         "Salmon Bay": logic.has_horizontal_movement and logic.has_vertical_movement,
-        "Ancient Labyrinth": lambda state: logic.has_vertical_movement and logic.has_glide and logic.is_area_in_level_range(state, 5)})
+        "Ancient Labyrinth": lambda state: state.has(ANCIENT_TABLET_A, player) and logic.has_vertical_movement and logic.has_glide and logic.is_area_in_level_range(state, 5)})
     multiworld.get_region("Sara Sara Bazaar", player).add_exits(["Poko Poko Desert", "Sara Sara Beach", "Shoudu Province", "The Open Sea", "Continental Tram"],
         {"Poko Poko Desert": lambda state: logic.is_area_in_level_range(state, 2),
         "Sara Sara Beach": lambda state: logic.has_horizontal_movement and logic.is_area_in_level_range(state, 3),

worlds/crystal_project/Locations.py

@@ -346,13 +346,23 @@ def get_item_pool(self, excluded_items: Set[str]) -> List[Item]:
 
         for name, data in item_table.items():
             if name not in excluded_items:
+                #Check region and add the region amounts; then check Shopsanity and add the shop amounts
                 amount:int = data.beginnerAmount
+                if self.options.shopsanity == self.options.shopsanity.option_true:
+                    amount = amount + data.beginnerShops
                 if self.options.includedRegions == self.options.includedRegions.option_advanced:
                     amount = amount + data.advancedAmount
+                    if self.options.shopsanity == self.options.shopsanity.option_true:
+                        amount = amount + data.advancedShops
                 elif self.options.includedRegions == self.options.includedRegions.option_expert:
                     amount = amount + data.advancedAmount + data.expertAmount
+                    if self.options.shopsanity == self.options.shopsanity.option_true:
+                        amount = amount + data.expertShops
                 elif self.options.includedRegions == self.options.includedRegions.option_all:
                     amount = amount + data.advancedAmount + data.expertAmount + data.endGameAmount
+                    #atm there are no end-game specific shopsanity items
+                    if self.options.shopsanity == self.options.shopsanity.option_true:
+                        amount = amount + data.endGameShops
                 for _ in range(amount):
                     item = self.set_classifications(name)
                     pool.append(item)

worlds/crystal_project/Options.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING, Optional
 if TYPE_CHECKING:
     from . import CrystalProjectWorld
-from .Constants import *
+from .Keys import *
 
 class CrystalProjectLogic:
     player: int