monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SC2: Fix Nondeterministic Behavior (#4246) 

* Add < for sorting

* Sorting for determinism

* id instead of value
This commit is contained in:
Exempt-Medic 2024-11-25 13:25:00 -05:00 committed by GitHub
parent a650e90b57
commit e6e31a27e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
worlds/sc2/MissionTables.py
View File

@ -43,6 +43,9 @@ class SC2Campaign(Enum):
self.goal_priority = goal_priority self.goal_priority = goal_priority
self.race = race self.race = race
def __lt__(self, other: "SC2Campaign"):
return self.id < other.id
GLOBAL = 0, "Global", SC2CampaignGoalPriority.NONE, SC2Race.ANY GLOBAL = 0, "Global", SC2CampaignGoalPriority.NONE, SC2Race.ANY
WOL = 1, "Wings of Liberty", SC2CampaignGoalPriority.VERY_HARD, SC2Race.TERRAN WOL = 1, "Wings of Liberty", SC2CampaignGoalPriority.VERY_HARD, SC2Race.TERRAN
PROPHECY = 2, "Prophecy", SC2CampaignGoalPriority.MINI_CAMPAIGN, SC2Race.PROTOSS PROPHECY = 2, "Prophecy", SC2CampaignGoalPriority.MINI_CAMPAIGN, SC2Race.PROTOSS

2
worlds/sc2/Regions.py
View File

@ -50,7 +50,7 @@ def create_vanilla_regions(
names: Dict[str, int] = {} names: Dict[str, int] = {}
# Generating all regions and locations for each enabled campaign # Generating all regions and locations for each enabled campaign
for campaign in enabled_campaigns: for campaign in sorted(enabled_campaigns):
for region_name in vanilla_mission_req_table[campaign].keys(): for region_name in vanilla_mission_req_table[campaign].keys():
regions.append(create_region(world, locations_per_region, location_cache, region_name)) regions.append(create_region(world, locations_per_region, location_cache, region_name))
world.multiworld.regions += regions world.multiworld.regions += regions