Merge branch 'OverworldShuffleDev' into OverworldShuffle

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.6.1.5
+- Fixed error with non-prize shuffle
+
 ## 0.6.1.4
 - Fixes for Glitched Rain State (Bonk Shuffle included)
 - \~Merged in DR v1.5.0~

Fill.py

@@ -183,7 +183,7 @@ def fill_restrictive(world, base_state, locations, itempool, key_pool=None, sing
                 spot_to_fill = None
 
                 item_locations = filter_locations(item_to_place, locations, world, vanilla)
-                if is_dungeon_item(item_to_place, world):
+                if is_dungeon_item(item_to_place, world) and not (item_to_place.prize and world.prizeshuffle[item_to_place.player] == 'none'):
                     item_locations = [l for l in item_locations if valid_dungeon_placement(item_to_place, l, world)]
                 verify(item_to_place, item_locations, maximum_exploration_state, single_player_placement,
                        perform_access_check, key_pool, world)

OverworldShuffle.py

@@ -8,7 +8,7 @@ from OWEdges import OWTileRegions, OWEdgeGroups, OWEdgeGroupsTerrain, OWExitType
 from OverworldGlitchRules import create_owg_connections
 from Utils import bidict
 
-version_number = '0.6.1.4'
+version_number = '0.6.1.5'
 # branch indicator is intentionally different across branches
 version_branch = ''