diff --git a/ItemPool.py b/ItemPool.py index 8db1c53c..2826ef83 100644 --- a/ItemPool.py +++ b/ItemPool.py @@ -341,7 +341,7 @@ def shuffle_shops(world, items, player: int): shop.clear_inventory() for i, item in enumerate(items): - if item.name.startswith(("Bombs", "Arrows", "Rupees")): + if item.name.startswith(("Bombs", "Arrows", "Rupee", "Nothing")): items[i] = ItemFactory(new_items.pop(), player) if not new_items: break @@ -485,7 +485,7 @@ def set_up_shops(world, player: int): if world.retro[player]: rss = world.get_region('Red Shield Shop', player).shop - rss.add_inventory(2, 'Single Arrow', 80) + rss.push_inventory(2, 'Single Arrow', 80) rss.locked = True if world.keyshuffle[player] == "universal" or world.retro[player]: diff --git a/playerSettings.yaml b/playerSettings.yaml index 446070c8..c9fb594d 100644 --- a/playerSettings.yaml +++ b/playerSettings.yaml @@ -23,7 +23,8 @@ glitches_required: # Determine the logic required to complete the seed none: 1 # No glitches required minor_glitches: 0 # Puts fake flipper, waterwalk, super bunny shenanigans, and etc into logic overworld_glitches: 0 # Assumes the player has knowledge of both overworld major glitches (boots clips, mirror clips) and minor glitches (fake flipper, super bunny shenanigans, water walk and etc.) - no_logic: 0 # Items are places completely at random and with no regard for logic. Your fire rod could be on Trinexx + no_logic: 0 # Your own items are placed with no regard to any logic; such as your Fire Rod can be on your Trinexx. + # Other players items are placed into your world under OWG logic meta_ignore: # Nullify options specified in the meta.yaml file. Adding an option here guarantees it will not occur in your seed, even if the .yaml file specifies it mode: - inverted # Never play inverted seeds