Merged in DR v0.4.0.12

Main.py

@@ -4,7 +4,8 @@ from itertools import zip_longest
 import json
 import logging
 import os
-import random
+import RaceRandom as random
+import string
 import time
 import zlib
 
@@ -28,7 +29,7 @@ from Fill import sell_potions, sell_keys, balance_multiworld_progression, balanc
 from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops
 from Utils import output_path, parse_player_names
 
-__version__ = '0.4.0.11u'
+__version__ = '0.4.0.12u'
 
 
 class EnemizerError(RuntimeError):
@@ -42,8 +43,8 @@ def main(args, seed=None, fish=None):
 
     start = time.perf_counter()
 
-    # if args.securerandom:
-    #     random.use_secure()
+    if args.securerandom:
+        random.use_secure()
 
     # initialize the world
     if args.code:
@@ -62,7 +63,7 @@ def main(args, seed=None, fish=None):
     random.seed(world.seed)
 
     if args.securerandom:
-        world.seed = None
+        world.seed = ''.join(random.choice(string.ascii_uppercase + string.ascii_lowercase + string.digits) for _ in range(9))
 
     world.remote_items = args.remote_items.copy()
     world.mapshuffle = args.mapshuffle.copy()
@@ -341,7 +342,7 @@ def main(args, seed=None, fish=None):
     logger.info(world.fish.translate("cli","cli","made.playthrough") % (YES if (args.calc_playthrough) else NO))
     logger.info(world.fish.translate("cli","cli","made.spoiler") % (YES if (not args.jsonout and args.create_spoiler) else NO))
     logger.info(world.fish.translate("cli","cli","used.enemizer") % (YES if enemized else NO))
-    logger.info(world.fish.translate("cli","cli","seed") + ": %d", world.seed)
+    logger.info(world.fish.translate("cli","cli","seed") + ": %s", world.seed)
     logger.info(world.fish.translate("cli","cli","total.time"), time.perf_counter() - start)
 
 #    print_wiki_doors_by_room(dungeon_regions,world,1)