SM: 0.4.2 percent goals fix

worlds/sm/variaRandomizer/rando/GraphBuilder.py

@@ -164,6 +164,7 @@ def escapeTrigger(self, emptyContainer, graph, maxDiff, escapeTrigger):
                     availLocsByArea[itemLoc.Location.GraphArea].append(itemLoc.Location.Name)
             self.log.debug("escapeTrigger. availLocsByArea="+str(availLocsByArea))
             sm.objectives.setAreaFuncs({area:lambda sm,ap:SMBool(len(container.getLocs(lambda loc: loc.Name in availLocsByArea[area]))==0) for area in availLocsByArea})
+            sm.objectives.setPercentFuncs({percent:lambda sm,ap:SMBool(len(container.getUsedLocs(lambda loc: True)) >= percent) for percent in [25, 50, 75, 100]})
         self.log.debug("escapeTrigger. collect locs until G4 access")
         # collect all item/locations up until we can pass G4 (the escape triggers)
         itemLocs = allItemLocs[:]

worlds/sm/variaRandomizer/utils/objectives.py

@@ -518,9 +518,10 @@ def f(sm, ap):
                 return sm.hasItemsPercent(pct, totalItemsCount)
             return f
 
-        for pct in [25,50,75,100]:
-            goal = 'collect %d%% items' % pct
-            self.goals[goal].clearFunc = getPctFunc(pct, totalItemsCount)
+        # AP: now based on location checks instead of local item (see setPercentFuncs)
+        # for pct in [25,50,75,100]:
+        #     goal = 'collect %d%% items' % pct
+        #     self.goals[goal].clearFunc = getPctFunc(pct, totalItemsCount)
         if allUpgradeTypes is not None:
             self.goals["collect all upgrades"].clearFunc = lambda sm, ap: sm.haveItems(allUpgradeTypes)
 
@@ -530,6 +531,11 @@ def setAreaFuncs(self, funcsByArea):
             if area in goalsByArea:
                 goalsByArea[area].clearFunc = func
 
+    def setPercentFuncs(self, funcsByPercent):
+        for pct, func in funcsByPercent.items():
+            goal = 'collect %d%% items' % pct
+            self.goals[goal].clearFunc = func
+
     def setSolverMode(self, solver):
         self.setScavengerHuntFunc(solver.scavengerHuntComplete)
         # in rando we know the number of items after randomizing, so set the functions only for the solver