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

SC2: Bugfixes for YAML Option Interactions (#1215) 

Early Unit: Now respects Excluded Items when selecting a random unit.

Units Always Have Upgrades: Changed removal cascade behavior; now additionally checks to see if an associated item is already locked when attempting to remove, and locks associated items if so. Occasionally caused issues with starter items in the past, frequently caused issues with yaml-defined Locked Items.
This commit is contained in:
Magnemania 2022-11-09 07:53:55 -05:00 committed by GitHub
parent a014bb4ab7
commit 63c0d027e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
worlds/sc2wol/PoolFilter.py
View File

@ -160,22 +160,30 @@ class ValidInventory:
if item in cascade_keys:
items_to_remove = self.cascade_removal_map[item]
transient_items = []
cascade_failure = False
while len(items_to_remove) > 0:
item_to_remove = items_to_remove.pop()
transient_items.append(item_to_remove)
if item_to_remove not in inventory:
continue
if units_always_have_upgrades and item_to_remove in locked_items:
cascade_failure = True
break
else:
continue
success = attempt_removal(item_to_remove)
if success:
transient_items.append(item_to_remove)
elif units_always_have_upgrades:
# Lock all associated items if any of them cannot be removed
if not success and units_always_have_upgrades:
cascade_failure = True
transient_items += items_to_remove
for transient_item in transient_items:
if transient_item not in inventory and transient_item not in locked_items:
locked_items.append(transient_item)
if transient_item.classification in (ItemClassification.progression, ItemClassification.progression_skip_balancing):
self.logical_inventory.add(transient_item.name)
break
# Lock all associated items if any of them cannot be removed on Units Always Have Upgrades
if cascade_failure:
for transient_item in transient_items:
if transient_item in inventory:
inventory.remove(transient_item)
if transient_item not in locked_items:
locked_items.append(transient_item)
if transient_item.classification in (ItemClassification.progression, ItemClassification.progression_skip_balancing):
self.logical_inventory.add(transient_item.name)
else:
attempt_removal(item)

2
worlds/sc2wol/__init__.py
View File

@ -131,7 +131,7 @@ def get_excluded_items(self: SC2WoLWorld, world: MultiWorld, player: int) -> Set
def assign_starter_items(world: MultiWorld, player: int, excluded_items: Set[str], locked_locations: List[str]) -> List[Item]:
non_local_items = world.non_local_items[player].value
if get_option_value(world, player, "early_unit"):
local_basic_unit = tuple(item for item in get_basic_units(world, player) if item not in non_local_items)
local_basic_unit = tuple(item for item in get_basic_units(world, player) if item not in non_local_items and item not in excluded_items)
if not local_basic_unit:
raise Exception("At least one basic unit must be local")