SM: 0.4.2 percent goals fix #2183
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…VariaRandomizer's rules, items, locations and accessPoint (as regions)
…se (fills ROM item table) This is dependant on modifications done to sm_randomizer_rom project
- player name inject in ROM and get in client - end game get from ROM in client - send self item to server - add player names table in ROM
…ition of an array of it (required to generation more than one SM world, which is still fails but is better)
… and done some cleaning
…er's" This reverts commit fb3ca18.
- fixed seeded generation - fixed broken logic when more than one SM world - added missing rules for inter-area transitions - added basic patch presence for logic - added DoorManager init call to reflect present patches for logic - moved CollectionState addition out of BaseClasses into SM world - added condition to apply progitempool presorting only if SM world is present - set Bosses item id to None to prevent them going into multidata - now use get_game_players
…VariaRandomizer's rules, items, locations and accessPoint (as regions)
…se (fills ROM item table) This is dependant on modifications done to sm_randomizer_rom project
- player name inject in ROM and get in client - end game get from ROM in client - send self item to server - add player names table in ROM
…ition of an array of it (required to generation more than one SM world, which is still fails but is better)
… and done some cleaning
Berserker66
reviewed
Sep 16, 2023
| @@ -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]}) | |||
There was a problem hiding this comment.
If I understand this right, it's not actually percent, but that many locations? As in, it's checking for being able to reach 25, 50, 75 and 100 locations respectively?
There was a problem hiding this comment.
You're right: thats wrong. Its should really be a percentage of obtainable location checks otherwise things like "Nothing" Items will be counted. I'll fix that.
Silvris
approved these changes
Sep 16, 2023
|
Haven't reviewed the code, but as far as testing, I encountered weird generation issues blocking 10 of 10 attempts at generating a fairly normal 3-player SM multi on 0.4.2. Checking out this PR branch fixed the issue, yielding multiple successful generations with the same yamls. |
Berserker66
reviewed
Sep 17, 2023
Comment on lines
524
to
525
| goal = 'collect %d%% items' % pct | ||
| self.goals[goal].clearFunc = getPctFunc(pct, totalItemsCount, container) |
There was a problem hiding this comment.
Suggested change
| goal = 'collect %d%% items' % pct | |
| self.goals[goal].clearFunc = getPctFunc(pct, totalItemsCount, container) | |
| goal = 'collect %d%% items' % pct | |
| self.goals[goal].clearFunc = getPctFunc(pct, totalItemsCount, container) |
There was a problem hiding this comment.
Fixed with latest commit.
Berserker66
reviewed
Sep 17, 2023
| def setItemPercentFuncs(self, totalItemsCount=None, allUpgradeTypes=None): | ||
| def getPctFunc(pct, totalItemsCount): | ||
| def setItemPercentFuncs(self, totalItemsCount=None, allUpgradeTypes=None, container=None): | ||
| def getPctFunc(pct, totalItemsCount, container): |
There was a problem hiding this comment.
Suggested change
| def getPctFunc(pct, totalItemsCount, container): | |
| def getPctFunc(pct, totalItemsCount, container): | |
| total_needed: float = pct * totalItemsCount / 100 |
There was a problem hiding this comment.
Fixed with latest commit.
Berserker66
reviewed
Sep 17, 2023
Comment on lines
517
to
519
| nonlocal pct, totalItemsCount, container | ||
| locs_checked = len(container.getUsedLocs(lambda loc: True)) | ||
| return SMBool(locs_checked * 100 / totalItemsCount >= pct) |
There was a problem hiding this comment.
Suggested change
| nonlocal pct, totalItemsCount, container | |
| locs_checked = len(container.getUsedLocs(lambda loc: True)) | |
| return SMBool(locs_checked * 100 / totalItemsCount >= pct) | |
| locs_checked = len(container.getUsedLocs(lambda loc: True)) | |
| return SMBool(locs_checked >= total_needed) |
There was a problem hiding this comment.
calculating it once ahead of the function should make it a nice bit faster.
There was a problem hiding this comment.
Fixed with latest commit.
Berserker66
approved these changes
Sep 19, 2023
ThePhar
added
the
is: bug/fix
FlySniper
pushed a commit
to FlySniper/Archipelago
that referenced
this pull request
Nov 14, 2023
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)
Jouramie
pushed a commit
to Jouramie/Archipelago
that referenced
this pull request
Feb 28, 2024
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)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this fixing or adding?
How was this tested?