From 28bfe1b8a3178075e22eb4f55999e8709ff77328 Mon Sep 17 00:00:00 2001 From: Magnemania Date: Mon, 20 Nov 2023 16:28:40 -0500 Subject: [PATCH 1/2] Fix for duplicate progressive items --- worlds/sc2/PoolFilter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worlds/sc2/PoolFilter.py b/worlds/sc2/PoolFilter.py index c65751e7f6d9..92e5eae60dcd 100644 --- a/worlds/sc2/PoolFilter.py +++ b/worlds/sc2/PoolFilter.py @@ -322,7 +322,7 @@ def attempt_removal(item: Item) -> bool: removable_generic_items = [] self.multiworld.random.shuffle(generic_items) for item in generic_items[:reserved_generic_amount]: - locked_items.append(item) + locked_items.append(copy_item(item)) inventory.remove(item) if item.name not in self.logical_inventory and item.name not in self.locked_items: removable_generic_items.append(item) From 1230c52e90129cf4ad40e97a87f35b77c539323b Mon Sep 17 00:00:00 2001 From: Magnemania Date: Mon, 20 Nov 2023 16:28:52 -0500 Subject: [PATCH 2/2] Fix for vanilla generation --- worlds/sc2/Regions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worlds/sc2/Regions.py b/worlds/sc2/Regions.py index 7a231a025060..fde67ce44068 100644 --- a/worlds/sc2/Regions.py +++ b/worlds/sc2/Regions.py @@ -229,7 +229,7 @@ def wol_cleared_missions(state: CollectionState, mission_count: int) -> bool: lambda state: state.has("Beat Rak'Shir", player)), connect(multiworld, player, names, "Templar's Charge", "Templar's Return", lambda state: state.has("Beat Purification", player) - and state.has("Beat Rak Shir", player) + and state.has("Beat Rak'Shir", player) and state.has("Beat Templar's Charge", player)), connect(multiworld, player, names, "Templar's Return", "The Host", lambda state: state.has("Beat Templar's Return", player)),