Merge remote-tracking branch 'upstream/DoorDevUnstable' into OverworldShuffle

Main.py

@@ -24,11 +24,11 @@ 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
 
-__version__ = '0.3.1.0-u'
+__version__ = '0.3.1.7-u'
 
 
 class EnemizerError(RuntimeError):
@@ -42,6 +42,9 @@ def main(args, seed=None, fish=None):
 
     start = time.perf_counter()
 
+    # if args.securerandom:
+    #     random.use_secure()
+
     # initialize the world
     if args.code:
         for player, code in args.code.items():
@@ -58,6 +61,9 @@ def main(args, seed=None, fish=None):
         world.seed = int(seed)
     random.seed(world.seed)
 
+    if args.securerandom:
+        world.seed = None
+
     world.remote_items = args.remote_items.copy()
     world.mapshuffle = args.mapshuffle.copy()
     world.compassshuffle = args.compassshuffle.copy()
@@ -82,6 +88,8 @@ def main(args, seed=None, fish=None):
     world.keydropshuffle = args.keydropshuffle.copy()
     world.mixed_travel = args.mixed_travel.copy()
     world.standardize_palettes = args.standardize_palettes.copy()
+    world.treasure_hunt_count = args.triforce_goal.copy()
+    world.treasure_hunt_total = args.triforce_pool.copy()
 
     world.rom_seeds = {player: random.randint(0, 999999999) for player in range(1, world.players + 1)}
 
@@ -167,6 +175,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"))