morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

SM: 0.4.2 percent goals fix (#2183)

Browse Source 
fixed percent items goals that can fail generation (reported here https://discord.com/channels/731205301247803413/1147318124383850516/1147318124383850516 and here https://discord.com/channels/731205301247803413/1138137515505750108/1138137515505750108)
This commit is contained in:
lordlou
2023-09-19 19:26:42 -04:00
committed by GitHub
parent 6e02a4ca3c
commit 0012584e51
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
worlds/sm/variaRandomizer/utils/objectives.py
View File

@@ -511,16 +511,18 @@ class Objectives(object):
def setScavengerHuntFunc(self, scavClearFunc):
self.goals["finish scavenger hunt"].clearFunc = scavClearFunc
def setItemPercentFuncs(self, totalItemsCount=None, allUpgradeTypes=None):
def getPctFunc(pct, totalItemsCount):
def setItemPercentFuncs(self, totalItemsCount=None, allUpgradeTypes=None, container=None):
def getPctFunc(total_needed, container):
def f(sm, ap):
nonlocal pct, totalItemsCount
return sm.hasItemsPercent(pct, totalItemsCount)
nonlocal total_needed, container
locs_checked = len(container.getUsedLocs(lambda loc: True))
return SMBool(locs_checked >= total_needed)
return f
# AP: now based on location checks instead of local item
for pct in [25,50,75,100]:
goal = 'collect %d%% items' % pct
self.goals[goal].clearFunc = getPctFunc(pct, totalItemsCount)
self.goals[goal].clearFunc = getPctFunc(totalItemsCount * pct / 100, container)
if allUpgradeTypes is not None:
self.goals["collect all upgrades"].clearFunc = lambda sm, ap: sm.haveItems(allUpgradeTypes)