Fix for multiworld progression balancing with shopsanity off

Fill.py

@@ -377,6 +377,19 @@ def flood_items(world):
                 break
 
 
+def lock_shop_locations(world, player):
+    for shop, loc_names in shop_to_location_table.items():
+        for loc in loc_names:
+            world.get_location(loc, player).event = True
+            world.get_location(loc, player).locked = True
+    # I don't believe these locations exist in non-shopsanity
+    # if world.retro[player]:
+    #     for shop, loc_names in retro_shops.items():
+    #         for loc in loc_names:
+    #             world.get_location(loc, player).event = True
+    #             world.get_location(loc, player).locked = True
+
+
 def sell_potions(world, player):
     loc_choices = []
     for shop in world.shops[player]:

Main.py

@@ -22,7 +22,7 @@ from RoomData import create_rooms
 from Rules import set_rules
 from Dungeons import create_dungeons, fill_dungeons, fill_dungeons_restrictive
 from Fill import distribute_items_cutoff, distribute_items_staleness, distribute_items_restrictive, flood_items
-from Fill import sell_potions, sell_keys, balance_multiworld_progression, balance_money_progression
+from Fill import sell_potions, sell_keys, balance_multiworld_progression, balance_money_progression, lock_shop_locations
 from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops
 from Utils import output_path, parse_player_names
 
@@ -165,6 +165,9 @@ def main(args, seed=None, fish=None):
             sell_potions(world, player)
             if world.retro[player]:
                 sell_keys(world, player)
+        else:
+            lock_shop_locations(world, player)
+
 
     logger.info(world.fish.translate("cli","cli","placing.dungeon.prizes"))
 

RELEASENOTES.md

@@ -131,6 +131,8 @@ New item counter modified to show total
 * 0.3.1.5-u
 	* Ganon hints fixed for shops
 	* Added support for a settings file so SahasrahBot and the main website can use it easier. (Thanks Synack)
+	* Fix for Skull Pinball during re-generation attempts (thank compiling)
+	* Fix for multiworld progression balancing and shopsanity
 * 0.3.1.4-u
 	* Fix for Blind when shuffled to TT and another dungeon
 	* Remove use of RaceRandom