diff --git a/Item.py b/Item.py index 0d2c539d6..e1b4841d5 100644 --- a/Item.py +++ b/Item.py @@ -182,7 +182,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.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/README.md b/README.md index 014f1e01a..906b6593b 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,7 @@ Differences between `dev-fenhl` and [`Dev-R`](https://github.com/Roman971/OoT-Ra * The GUI tweaks made by [`Dev-R`](https://github.com/Roman971/OoT-Randomizer) are further adjusted to balance consistency with [main `Dev`](https://github.com/OoTRandomizer/OoT-Randomizer) and ease of use. * The Lens of Truth can be in a foolish area if Treasure Chest Game keys are shuffled and all relevant “lensless” tricks are enabled. * Bug fixes: + * An inconsistency with how hints refer to key rings for the Thieves' Hideout and the treasure box shop is fixed ([#2320](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2320)) * The randomizer no longer generates unbeatable seeds due to counting copies of dungeon rewards or ocarina notes separately ([#2319](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2319)) * Blue warps setting time of day even on repeated use is now in logic ([#2304](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2304)) * The randomizer no longer silently ignores the `Decompress` program failing ([#2229](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2229)) diff --git a/version.py b/version.py index 9b18e80e3..8c2498728 100644 --- a/version.py +++ b/version.py @@ -1,7 +1,7 @@ __version__ = '8.2.19' # This is a supplemental version number for branches based off of main dev. -supplementary_version = 1 +supplementary_version = 2 # Pick a unique identifier byte for your fork if you are intending to have a long-lasting branch. # This will be 0x00 for main releases and 0x01 for main dev.