Pokemon R/B: The Big Door Shuffle Update

worlds/pokemon_rb/__init__.py

@@ -195,11 +195,11 @@ def encode_name(name, t):
                 normals -= subtract_amounts[2]
                 while super_effectives + not_very_effectives + normals > 225 - immunities:
                     r = self.multiworld.random.randint(0, 2)
-                    if r == 0:
+                    if r == 0 and super_effectives:
                         super_effectives -= 1
-                    elif r == 1:
+                    elif r == 1 and not_very_effectives:
                         not_very_effectives -= 1
-                    else:
+                    elif normals:
                         normals -= 1
             chart = []
             for matchup_list, matchup_value in zip([immunities, normals, super_effectives, not_very_effectives],
@@ -249,14 +249,18 @@ def stage_fill_hook(cls, multiworld, progitempool, usefulitempool, filleritempoo
             itempool = progitempool + usefulitempool + filleritempool
             multiworld.random.shuffle(itempool)
             unplaced_items = []
-            for item in itempool:
+            for i, item in enumerate(itempool):
                 if item.player == loc.player and loc.can_fill(multiworld.state, item, False):
-                    if item in progitempool:
-                        progitempool.remove(item)
-                    elif item in usefulitempool:
-                        usefulitempool.remove(item)
-                    elif item in filleritempool:
-                        filleritempool.remove(item)
+                    if item.advancement:
+                        pool = progitempool
+                    elif item.useful:
+                        pool = usefulitempool
+                    else:
+                        pool = filleritempool
+                    for i, check_item in enumerate(pool):
+                        if item is check_item:
+                            pool.pop(i)
+                            break
                     if item.advancement:
                         state = sweep_from_pool(multiworld.state, progitempool + unplaced_items)
                     if (not item.advancement) or state.can_reach(loc, "Location", loc.player):
@@ -416,16 +420,16 @@ def number_of_zones(mon):
                     self.multiworld.victory_road_condition[self.player])
                     > 7) or (self.multiworld.door_shuffle[self.player] not in ("off", "simple")))):
                 intervene_move = "Cut"
-            elif ((not logic.can_learn_hm(test_state, "Flash", self.player)) and self.multiworld.dark_rock_tunnel_logic[self.player]
-                    and (((self.multiworld.accessibility[self.player] != "minimal" or
-                    (self.multiworld.trainersanity[self.player] or self.multiworld.extra_key_items[self.player])) or
-                    self.multiworld.door_shuffle[self.player]))):
+            elif ((not logic.can_learn_hm(test_state, "Flash", self.player))
+                   and self.multiworld.dark_rock_tunnel_logic[self.player]
+                   and (self.multiworld.accessibility[self.player] != "minimal"
+                        or self.multiworld.door_shuffle[self.player])):
                 intervene_move = "Flash"
             # If no Pokémon can learn Fly, then during door shuffle it would simply not treat the free fly maps
             # as reachable, and if on no door shuffle or simple, fly is simply never necessary.
             # We only intervene if a Pokémon is able to learn fly but none are reachable, as that would have been
             # considered in door shuffle.
-            elif ((not logic.can_learn_hm(test_state, "Fly", self.player)) and logic.can_learn_hm(test_state, "Fly", self.player)
+            elif ((not logic.can_learn_hm(test_state, "Fly", self.player))
                     and self.multiworld.door_shuffle[self.player] not in
                     ("off", "simple") and [self.fly_map, self.town_map_fly_map] != ["Pallet Town", "Pallet Town"]):
                 intervene_move = "Fly"
@@ -555,23 +559,6 @@ def number_of_zones(mon):
                         raise Exception("Failed to remove corresponding item while deleting unreachable Dexsanity location")
 
 
-        if self.multiworld.door_shuffle[self.player] == "decoupled":
-            swept_state = self.multiworld.state.copy()
-            swept_state.sweep_for_events(player=self.player)
-            locations = [location for location in
-                         self.multiworld.get_reachable_locations(swept_state, self.player) if location.item is
-                         None]
-            self.multiworld.random.shuffle(locations)
-            while len(locations) > 10:
-                location = locations.pop()
-                location.progress_type = LocationProgressType.EXCLUDED
-
-        if self.multiworld.key_items_only[self.player]:
-            locations = [location for location in self.multiworld.get_unfilled_locations(self.player) if
-                         location.progress_type == LocationProgressType.DEFAULT]
-            for location in locations:
-                location.progress_type = LocationProgressType.PRIORITY
-
     def create_regions(self):
         if (self.multiworld.old_man[self.player] == "vanilla" or
                 self.multiworld.door_shuffle[self.player] in ("full", "insanity")):

worlds/pokemon_rb/docs/en_Pokemon Red and Blue.md

@@ -41,6 +41,8 @@ and repeatable source of money.
 * You can disable and re-enable experience gains by talking to an aide in Oak's Lab.
 * You can reset static encounters (Poké Flute encounter, legendaries, and the trap Poké Ball battles in Power Plant)
 for any Pokémon you have defeated but not caught, by talking to an aide in Oak's Lab.
+* Dungeons normally hidden on the Town Map are now present, and the "Sea Cottage" has been removed. This is to allow
+Simple Door Shuffle to update the locations of all of the dungeons on the Town Map.
 
 ## What items and locations get shuffled?
 

worlds/pokemon_rb/level_scaling.py

@@ -10,7 +10,9 @@ def level_scaling(multiworld):
     while locations:
         sphere = set()
         for world in multiworld.get_game_worlds("Pokemon Red and Blue"):
-            if multiworld.level_scaling[world.player] != "by_spheres_and_distance":
+            if (multiworld.level_scaling[world.player] != "by_spheres_and_distance"
+                    and (multiworld.level_scaling[world.player] != "auto" or multiworld.door_shuffle[world.player]
+                         in ("off", "simple"))):
                 continue
             regions = {multiworld.get_region("Menu", world.player)}
             checked_regions = set()
@@ -45,18 +47,18 @@ def reachable():
                     return True
                 if (("Rock Tunnel 1F - Wild Pokemon" in location.name
                         and any([multiworld.get_entrance(e, location.player).connected_region.can_reach(state)
-                                 for e in ['Rock Tunnel 1F-NE to Route 10-N',
-                                           'Rock Tunnel 1F-NE to Rock Tunnel B1F-E',
-                                           'Rock Tunnel 1F-NW to Rock Tunnel B1F-E',
-                                           'Rock Tunnel 1F-NW to Rock Tunnel B1F-W',
-                                           'Rock Tunnel 1F-S to Route 10-S',
-                                           'Rock Tunnel 1F-S to Rock Tunnel B1F-W']])) or
+                                 for e in ['Rock Tunnel 1F-NE 1 to Route 10-N',
+                                           'Rock Tunnel 1F-NE 2 to Rock Tunnel B1F-E 1',
+                                           'Rock Tunnel 1F-NW 1 to Rock Tunnel B1F-E 2',
+                                           'Rock Tunnel 1F-NW 2 to Rock Tunnel B1F-W 1',
+                                           'Rock Tunnel 1F-S 1 to Route 10-S',
+                                           'Rock Tunnel 1F-S 2 to Rock Tunnel B1F-W 2']])) or
                         ("Rock Tunnel B1F - Wild Pokemon" in location.name and
                          any([multiworld.get_entrance(e, location.player).connected_region.can_reach(state)
-                             for e in ['Rock Tunnel B1F-E to Rock Tunnel 1F-NE',
-                                       'Rock Tunnel B1F-E to Rock Tunnel 1F-NW',
-                                       'Rock Tunnel B1F-W to Rock Tunnel 1F-NW',
-                                       'Rock Tunnel B1F-W to Rock Tunnel 1F-S']]))):
+                             for e in ['Rock Tunnel B1F-E 1 to Rock Tunnel 1F-NE 2',
+                                       'Rock Tunnel B1F-E 2 to Rock Tunnel 1F-NW 1',
+                                       'Rock Tunnel B1F-W 1 to Rock Tunnel 1F-NW 2',
+                                       'Rock Tunnel B1F-W 2 to Rock Tunnel 1F-S 2']]))):
                     # Even if checks in Rock Tunnel are out of logic due to lack of Flash, it is very easy to
                     # wander in the dark and encounter wild Pokémon, even unintentionally while attempting to
                     # leave the way you entered. We'll count the wild Pokémon as reachable as soon as the Rock
@@ -135,4 +137,3 @@ def reachable():
                     sphere_objects[object].level = level_list_copy.pop(0)
     for world in multiworld.get_game_worlds("Pokemon Red and Blue"):
         world.finished_level_scaling.set()
-

worlds/pokemon_rb/options.py

@@ -228,7 +228,7 @@ class SplitCardKey(Choice):
 
 class AllElevatorsLocked(Toggle):
     """Adds requirements to the Celadon Department Store elevator and Silph Co elevators to have the Lift Key.
-    No logical implications normally, but may have a significant impact on Insanity Door Shuffle."""
+    No logical implications normally, but may have a significant impact on some Door Shuffle options."""
     display_name = "All Elevators Locked"
     default = 1
 
@@ -317,42 +317,42 @@ class TownMapFlyLocation(Toggle):
 class DoorShuffle(Choice):
     """Simple: entrances are randomized together in groups: Pokemarts, Gyms, single exit dungeons, dual exit dungeons,
     single exit misc interiors, dual exit misc interiors are all shuffled separately. Safari Zone is not shuffled.
-    Full: Any outdoor entrance may lead to any interior.
-    Insanity: All rooms in the game are shuffled."""
+    On Simple only, the Town Map will be updated to show the new locations for each dungeon.
+    Interiors: Any outdoor entrance may lead to any interior, but intra-interior doors are not shuffled. Previously
+    named Full.
+    Full: Exterior to interior entrances are shuffled, and interior to interior doors are shuffled, separately.
+    Insanity: All doors in the game are shuffled.
+    Decoupled: Doors may be decoupled from each other, so that leaving through an exit may not return you to the
+    door you entered from."""
     display_name = "Door Shuffle"
     option_off = 0
     option_simple = 1
-    option_full = 2
-    option_insanity = 3
-    # Disabled for now, has issues with elevators that need to be resolved
-    # option_decoupled = 4
-    default = 0
-
-    # remove assertions that blow up checks for decoupled
-    def __eq__(self, other):
-        if isinstance(other, self.__class__):
-            return other.value == self.value
-        elif isinstance(other, str):
-            return other == self.current_key
-        elif isinstance(other, int):
-            return other == self.value
-        elif isinstance(other, bool):
-            return other == bool(self.value)
-        else:
-            raise TypeError(f"Can't compare {self.__class__.__name__} with {other.__class__.__name__}")
-
-
-class WarpTileShuffle(Toggle):
-    """Shuffle the warp tiles in Silph Co and Sabrina's Gym among themselves, separately.
-    On Insanity, turning this off means they are mixed into the general door shuffle instead of only being shuffled
-    among themselves."""
+    option_interiors = 2
+    option_full = 3
+    option_insanity = 4
+    option_decoupled = 5
+    default = 0
+
+
+class WarpTileShuffle(Choice):
+    """Vanilla: The warp tiles in Silph Co and Sabrina's Gym are not changed.
+    Shuffle: The warp tile destinations are shuffled among themselves.
+    Mixed: The warp tiles are mixed into the pool of available doors for Full, Insanity, and Decoupled. Same as Shuffle
+    for any other door shuffle option."""
     display_name = "Warp Tile Shuffle"
     default = 0
+    option_vanilla = 0
+    option_shuffle = 1
+    option_mixed = 2
+    alias_true = 1
+    alias_on = 1
+    alias_off = 0
+    alias_false = 0
 
 
 class RandomizeRockTunnel(Toggle):
-    """Randomize the layout of Rock Tunnel.
-    If Insanity Door Shuffle is on, this will cause only the main entrances to Rock Tunnel to be shuffled."""
+    """Randomize the layout of Rock Tunnel. If Full, Insanity, or Decoupled Door Shuffle is on, this will cause only the
+    main entrances to Rock Tunnel to be shuffled."""
     display_name = "Randomize Rock Tunnel"
     default = 0
 
@@ -401,15 +401,17 @@ class Stonesanity(Toggle):
 class LevelScaling(Choice):
     """Off: Encounters use vanilla game levels.
     By Spheres: Levels are scaled by access sphere. Areas reachable in later spheres will have higher levels.
-    Spheres and Distance: Levels are scaled by access spheres as well as distance from Pallet Town, measured by number
-    of internal region connections. This is a much more severe curving of levels and may lead to much less variation in
-    levels found in a particular map. However, it may make the higher door shuffle settings significantly more bearable,
-    as these options more often result in a smaller number of larger access spheres."""
+    By Spheres and Distance: Levels are scaled by access spheres as well as distance from Pallet Town, measured by
+    number  of internal region connections. This is a much more severe curving of levels and may lead to much less
+    variation in levels found in a particular map. However, it may make the higher door shuffle settings significantly
+    more bearable, as these options more often result in a smaller number of larger access spheres.
+    Auto: Scales by Spheres if Door Shuffle is off or on Simple, otherwise scales by Spheres and Distance"""
     display_name = "Level Scaling"
     option_off = 0
     option_by_spheres = 1
     option_by_spheres_and_distance = 2
-    default = 1
+    option_auto = 3
+    default = 3
 
 
 class ExpModifier(NamedRange):