Merge 'Fix Plentiful item pool with no adult trade items selected' (O…

…oTRandomizer#2198)
fenhl · Apr 3, 2024 · 2bdaa46 · 2bdaa46
2 parents 61b88a3 + 1fc2b20
commit 2bdaa46
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/ItemPool.py b/ItemPool.py
@@ -463,7 +463,7 @@ def get_pool_core(world: World) -> tuple[list[str], dict[str, Item]]:
             # Make the duplicate item consistent with that.
             if 'Pocket Egg' in world.settings.adult_trade_start and 'Pocket Cucco' in world.settings.adult_trade_start:
                 pending_junk_pool.remove('Pocket Cucco')
-        else:
+        elif world.settings.adult_trade_start:
             # With adult trade shuffle off, add a random extra adult trade item
             item = random.choice(world.settings.adult_trade_start)
             pending_junk_pool.append(item)

diff --git a/README.md b/README.md
@@ -124,6 +124,7 @@ issue. You should always Hard Reset to avoid this issue entirely.
 * Fix missing visual frost effect for ice traps in most chests.
 * Fix the items on the right side of the mask shop being available without paying for all borrowed masks first.
 * The Stone of Agony can now be foolish in Glitched Logic and No Logic, as it already was with the `Hidden Grottos without Stone of Agony` trick enabled.
+* Fix seeds with Plentiful item pool and no adult trade items selected failing to generate.
 
 #### Other Changes
 * Clarified the error message shown when an unshuffled trade quest item is used as a starting item.

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