Super Metroid: Replace random module with world random in variaRandomizer

worlds/sm/__init__.py

@@ -124,7 +124,7 @@ def generate_early(self):
         Logic.factory('vanilla')
 
         dummy_rom_file = Utils.user_path(SMSettings.RomFile.copy_to)  # actual rom set in generate_output
-        self.variaRando = VariaRandomizer(self.options, dummy_rom_file, self.player)
+        self.variaRando = VariaRandomizer(self.options, dummy_rom_file, self.player, self.multiworld.seed, self.random)
         self.multiworld.state.smbm[self.player] = SMBoolManager(self.player, self.variaRando.maxDifficulty)
 
         # keeps Nothing items local so no player will ever pickup Nothing

worlds/sm/variaRandomizer/graph/graph_utils.py

@@ -1,5 +1,4 @@
 import copy
-import random
 from ..logic.logic import Logic
 from ..utils.parameters import Knows
 from ..graph.location import locationsDict
@@ -136,7 +135,8 @@ def getPossibleStartAPs(areaMode, maxDiff, morphPlacement, player):
                 refused[apName] = cause
         return ret, refused
 
-    def updateLocClassesStart(startGraphArea, split, possibleMajLocs, preserveMajLocs, nLocs):
+    @staticmethod
+    def updateLocClassesStart(startGraphArea, split, possibleMajLocs, preserveMajLocs, nLocs, random):
         locs = locationsDict
         preserveMajLocs = [locs[locName] for locName in preserveMajLocs if locs[locName].isClass(split)]
         possLocs = [locs[locName] for locName in possibleMajLocs][:nLocs]
@@ -160,7 +160,8 @@ def getGraphPatches(startApName):
         ap = getAccessPoint(startApName)
         return ap.Start['patches'] if 'patches' in ap.Start else []
 
-    def createBossesTransitions():
+    @staticmethod
+    def createBossesTransitions(random):
         transitions = vanillaBossesTransitions
         def isVanilla():
             for t in vanillaBossesTransitions:
@@ -180,13 +181,15 @@ def isVanilla():
                 transitions.append((src,dst))
         return transitions
 
-    def createAreaTransitions(lightAreaRando=False):
+    @staticmethod
+    def createAreaTransitions(lightAreaRando=False, *, random):
         if lightAreaRando:
-            return GraphUtils.createLightAreaTransitions()
+            return GraphUtils.createLightAreaTransitions(random=random)
         else:
-            return GraphUtils.createRegularAreaTransitions()
+            return GraphUtils.createRegularAreaTransitions(random=random)
 
-    def createRegularAreaTransitions(apList=None, apPred=None):
+    @staticmethod
+    def createRegularAreaTransitions(apList=None, apPred=None, *, random):
         if apList is None:
             apList = Logic.accessPoints
         if apPred is None:
@@ -239,7 +242,8 @@ def loopUnusedTransitions(transitions, apList=None):
             transitions.append((ap.Name, ap.Name))
 
     # crateria can be forced in corner cases
-    def createMinimizerTransitions(startApName, locLimit, forcedAreas=None):
+    @staticmethod
+    def createMinimizerTransitions(startApName, locLimit, forcedAreas=None, *, random):
         if forcedAreas is None:
             forcedAreas = []
         if startApName == 'Ceres':
@@ -316,7 +320,8 @@ def openTransitions():
         GraphUtils.log.debug("FINAL MINIMIZER areas: "+str(areas))
         return transitions
 
-    def createLightAreaTransitions():
+    @staticmethod
+    def createLightAreaTransitions(random):
         # group APs by area
         aps = {}
         totalCount = 0
@@ -407,7 +412,8 @@ def getRooms():
 
         return rooms
 
-    def escapeAnimalsTransitions(graph, possibleTargets, firstEscape):
+    @staticmethod
+    def escapeAnimalsTransitions(graph, possibleTargets, firstEscape, random):
         n = len(possibleTargets)
         assert (n < 4 and firstEscape is not None) or (n <= 4 and firstEscape is None), "Invalid possibleTargets list: " + str(possibleTargets)
         GraphUtils.log.debug("escapeAnimalsTransitions. possibleTargets="+str(possibleTargets)+", firstEscape="+str(firstEscape))

worlds/sm/variaRandomizer/rando/Choice.py

@@ -1,4 +1,3 @@
-import random
 from ..utils import log
 from ..utils.utils import getRangeDict, chooseFromRange
 from ..rando.ItemLocContainer import ItemLocation
@@ -23,8 +22,9 @@ def getLocList(self, itemLocDict, item):
 
 # simple random choice, that chooses an item first, then a locatio to put it in
 class ItemThenLocChoice(Choice):
-    def __init__(self, restrictions):
+    def __init__(self, restrictions, random):
         super(ItemThenLocChoice, self).__init__(restrictions)
+        self.random = random
 
     def chooseItemLoc(self, itemLocDict, isProg):
         itemList = self.getItemList(itemLocDict)
@@ -49,7 +49,7 @@ def chooseItemProg(self, itemList):
         return self.chooseItemRandom(itemList)
 
     def chooseItemRandom(self, itemList):
-        return random.choice(itemList)
+        return self.random.choice(itemList)
 
     def chooseLocation(self, locList, item, isProg):
         if len(locList) == 0:
@@ -63,12 +63,12 @@ def chooseLocationProg(self, locList, item):
         return self.chooseLocationRandom(locList)
 
     def chooseLocationRandom(self, locList):
-        return random.choice(locList)
+        return self.random.choice(locList)
 
 # Choice specialization for prog speed based filler
 class ItemThenLocChoiceProgSpeed(ItemThenLocChoice):
-    def __init__(self, restrictions, progSpeedParams, distanceProp, services):
-        super(ItemThenLocChoiceProgSpeed, self).__init__(restrictions)
+    def __init__(self, restrictions, progSpeedParams, distanceProp, services, random):
+        super(ItemThenLocChoiceProgSpeed, self).__init__(restrictions, random)
         self.progSpeedParams = progSpeedParams
         self.distanceProp = distanceProp
         self.services = services
@@ -104,7 +104,7 @@ def chooseItemLoc(self, itemLocDict, isProg, progressionItemLocs, ap, container)
         if self.restrictions.isLateMorph() and canRollback and len(itemLocDict) == 1:
             item, locList = list(itemLocDict.items())[0]
             if item.Type == 'Morph':
-                morphLocs = self.restrictions.lateMorphCheck(container, locList)
+                morphLocs = self.restrictions.lateMorphCheck(container, locList, self.random)
                 if morphLocs is not None:
                     itemLocDict[item] = morphLocs
                 else:
@@ -115,7 +115,7 @@ def chooseItemLoc(self, itemLocDict, isProg, progressionItemLocs, ap, container)
                 assert len(locs) == 1 and locs[0].Name == item.Name
                 return ItemLocation(item, locs[0])
         # late doors check for random door colors
-        if self.restrictions.isLateDoors() and random.random() < self.lateDoorsProb:
+        if self.restrictions.isLateDoors() and self.random.random() < self.lateDoorsProb:
             self.processLateDoors(itemLocDict, ap, container)
         self.progressionItemLocs = progressionItemLocs
         self.ap = ap
@@ -145,14 +145,14 @@ def chooseItemProg(self, itemList):
 
     def chooseLocationProg(self, locs, item):
         locs = self.getLocsSpreadProgression(locs)
-        random.shuffle(locs)
+        self.random.shuffle(locs)
         ret = self.getChooseFunc(self.chooseLocRanges, self.chooseLocFuncs)(locs)
         self.log.debug('chooseLocationProg. ret='+ret.Name)
         return ret
 
     # get choose function from a weighted dict
     def getChooseFunc(self, rangeDict, funcDict):
-        v = chooseFromRange(rangeDict)
+        v = chooseFromRange(rangeDict, self.random)
 
         return funcDict[v]
 
@@ -209,6 +209,6 @@ def getLocsSpreadProgression(self, availableLocations):
         for i in range(len(availableLocations)):
             loc = availableLocations[i]
             d = distances[i]
-            if d == maxDist or random.random() >= self.spreadProb:
+            if d == maxDist or self.random.random() >= self.spreadProb:
                 locs.append(loc)
         return locs

worlds/sm/variaRandomizer/rando/Filler.py

@@ -1,5 +1,5 @@
 
-import copy, time, random
+import copy, time
 from ..utils import log
 from ..logic.cache import RequestCache
 from ..rando.RandoServices import RandoServices
@@ -15,11 +15,11 @@
 # item pool is not empty).
 # entry point is generateItems
 class Filler(object):
-    def __init__(self, startAP, graph, restrictions, emptyContainer, endDate=infinity):
+    def __init__(self, startAP, graph, restrictions, emptyContainer, endDate=infinity, *, random):
         self.startAP = startAP
         self.cache = RequestCache()
         self.graph = graph
-        self.services = RandoServices(graph, restrictions, self.cache)
+        self.services = RandoServices(graph, restrictions, self.cache, random=random)
         self.restrictions = restrictions
         self.settings = restrictions.settings
         self.endDate = endDate
@@ -108,9 +108,9 @@ def step(self):
 
 # very simple front fill algorithm with no rollback and no "softlock checks" (== dessy algorithm)
 class FrontFiller(Filler):
-    def __init__(self, startAP, graph, restrictions, emptyContainer, endDate=infinity):
-        super(FrontFiller, self).__init__(startAP, graph, restrictions, emptyContainer, endDate)
-        self.choice = ItemThenLocChoice(restrictions)
+    def __init__(self, startAP, graph, restrictions, emptyContainer, endDate=infinity, *, random):
+        super(FrontFiller, self).__init__(startAP, graph, restrictions, emptyContainer, endDate, random=random)
+        self.choice = ItemThenLocChoice(restrictions, random)
         self.stdStart = GraphUtils.isStandardStart(self.startAP)
 
     def isEarlyGame(self):

worlds/sm/variaRandomizer/rando/GraphBuilder.py

@@ -1,5 +1,5 @@
 
-import random, copy
+import copy
 from ..utils import log
 from ..graph.graph_utils import GraphUtils, vanillaTransitions, vanillaBossesTransitions, escapeSource, escapeTargets, graphAreas, getAccessPoint
 from ..logic.logic import Logic
@@ -11,13 +11,14 @@
 
 # creates graph and handles randomized escape
 class GraphBuilder(object):
-    def __init__(self, graphSettings):
+    def __init__(self, graphSettings, random):
         self.graphSettings = graphSettings
         self.areaRando = graphSettings.areaRando
         self.bossRando = graphSettings.bossRando
         self.escapeRando = graphSettings.escapeRando
         self.minimizerN = graphSettings.minimizerN
         self.log = log.get('GraphBuilder')
+        self.random = random
 
     # builds everything but escape transitions
     def createGraph(self, maxDiff):
@@ -48,18 +49,18 @@ def createGraph(self, maxDiff):
                             objForced = forcedAreas.intersection(escAreas)
                             escAreasList = sorted(list(escAreas))
                             while len(objForced) < n and len(escAreasList) > 0:
-                                objForced.add(escAreasList.pop(random.randint(0, len(escAreasList)-1)))
+                                objForced.add(escAreasList.pop(self.random.randint(0, len(escAreasList)-1)))
                             forcedAreas = forcedAreas.union(objForced)
-                transitions = GraphUtils.createMinimizerTransitions(self.graphSettings.startAP, self.minimizerN, sorted(list(forcedAreas)))
+                transitions = GraphUtils.createMinimizerTransitions(self.graphSettings.startAP, self.minimizerN, sorted(list(forcedAreas)), random=self.random)
             else:
                 if not self.bossRando:
                     transitions += vanillaBossesTransitions
                 else:
-                    transitions += GraphUtils.createBossesTransitions()
+                    transitions += GraphUtils.createBossesTransitions(self.random)
                 if not self.areaRando:
                     transitions += vanillaTransitions
                 else:
-                    transitions += GraphUtils.createAreaTransitions(self.graphSettings.lightAreaRando)
+                    transitions += GraphUtils.createAreaTransitions(self.graphSettings.lightAreaRando, random=self.random)
         ret = AccessGraph(Logic.accessPoints, transitions, self.graphSettings.dotFile)
         Objectives.objDict[self.graphSettings.player].setGraph(ret, maxDiff)
         return ret
@@ -100,7 +101,7 @@ def escapeGraph(self, container, graph, maxDiff, escapeTrigger):
         self.escapeTimer(graph, paths, self.areaRando or escapeTrigger is not None)
         self.log.debug("escapeGraph: ({}, {}) timer: {}".format(escapeSource, dst, graph.EscapeAttributes['Timer']))
         # animals
-        GraphUtils.escapeAnimalsTransitions(graph, possibleTargets, dst)
+        GraphUtils.escapeAnimalsTransitions(graph, possibleTargets, dst, self.random)
         return True
 
     def _getTargets(self, sm, graph, maxDiff):
@@ -110,7 +111,7 @@ def _getTargets(self, sm, graph, maxDiff):
         if len(possibleTargets) == 0:
             self.log.debug("Can't randomize escape, fallback to vanilla")
             possibleTargets.append('Climb Bottom Left')
-        random.shuffle(possibleTargets)
+        self.random.shuffle(possibleTargets)
         return possibleTargets
 
     def getPossibleEscapeTargets(self, emptyContainer, graph, maxDiff):