Merge 'Fix Item.unshuffled_dungeon_item for TCGSmallKeyRing' (#2320)

OoTRandomizer · Nov 18, 2024 · 6d8029f · 6d8029f
2 parents 5ff79d6 + 50fc677
commit 6d8029f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Item.py b/Item.py
@@ -138,7 +138,7 @@ def unshuffled_dungeon_item(self) -> bool:
             return False
         return ((self.type in ('SmallKey', 'SmallKeyRing') and self.world.settings.shuffle_smallkeys in ('remove', 'vanilla', 'dungeon')) or
                 (self.type in ('HideoutSmallKey', 'HideoutSmallKeyRing') and self.world.settings.shuffle_hideoutkeys == 'vanilla') or
-                (self.type in ('TCGSmallKey', 'HideoutSmallKeyRing') and self.world.settings.shuffle_tcgkeys in ('remove', 'vanilla')) or
+                (self.type in ('TCGSmallKey', 'TCGSmallKeyRing') and self.world.settings.shuffle_tcgkeys in ('remove', 'vanilla')) or
                 (self.type == 'BossKey' and self.world.settings.shuffle_bosskeys in ('remove', 'vanilla', 'dungeon')) or
                 (self.type == 'GanonBossKey' and self.world.settings.shuffle_ganon_bosskey in ('remove', 'vanilla', 'dungeon')) or
                 ((self.map or self.compass) and (self.world.settings.shuffle_mapcompass in ('remove', 'startwith', 'vanilla', 'dungeon'))) or

diff --git a/version.py b/version.py
@@ -1,4 +1,4 @@
-__version__ = '8.2.24'
+__version__ = '8.2.25'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0