Don't put Dominion Trooper Advanced alloys into pool if there are no …

…advanced weapons.
EnvyDragon · Oct 7, 2024 · 4477ae3 · 4477ae3
1 parent 1418cac
commit 4477ae3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/worlds/sc2/items.py b/worlds/sc2/items.py
@@ -1025,13 +1025,13 @@ def get_full_item_list():
                  parent_item=item_names.EMPERORS_SHADOW),
     item_names.DOMINION_TROOPER_B2_HIGH_CAL_LMG:
         ItemData(757 + SC2WOL_ITEM_ID_OFFSET, TerranItemType.Armory_7, 11, SC2Race.TERRAN,
-                 parent_item=item_names.DOMINION_TROOPER),
+                 parent_item=item_names.DOMINION_TROOPER, important_for_filtering=True),
     item_names.DOMINION_TROOPER_HAILSTORM_LAUNCHER:
         ItemData(758 + SC2WOL_ITEM_ID_OFFSET, TerranItemType.Armory_7, 12, SC2Race.TERRAN,
-                 parent_item=item_names.DOMINION_TROOPER),
+                 parent_item=item_names.DOMINION_TROOPER, important_for_filtering=True),
     item_names.DOMINION_TROOPER_CPO7_SALAMANDER_FLAMETHROWER:
         ItemData(759 + SC2WOL_ITEM_ID_OFFSET, TerranItemType.Armory_7, 13, SC2Race.TERRAN,
-                 parent_item=item_names.DOMINION_TROOPER),
+                 parent_item=item_names.DOMINION_TROOPER, important_for_filtering=True),
     item_names.DOMINION_TROOPER_ADVANCED_ALLOYS:
         ItemData(760 + SC2WOL_ITEM_ID_OFFSET, TerranItemType.Armory_7, 14, SC2Race.TERRAN,
                  parent_item=item_names.DOMINION_TROOPER),

diff --git a/worlds/sc2/pool_filter.py b/worlds/sc2/pool_filter.py
@@ -274,6 +274,15 @@ def attempt_removal(item: Item) -> bool:
             inventory = [item for item in inventory if item.name != item_names.PLANETARY_FORTRESS_ORBITAL_MODULE]
             unused_items = [item_name for item_name in unused_items if item_name !=item_names.PLANETARY_FORTRESS_ORBITAL_MODULE]
             locked_items = [item for item in locked_items if item.name != item_names.PLANETARY_FORTRESS_ORBITAL_MODULE]
+        # No weapon upgrades for Dominion Trooper -> drop weapon is useless
+        if not {
+            item_names.DOMINION_TROOPER_B2_HIGH_CAL_LMG,
+            item_names.DOMINION_TROOPER_HAILSTORM_LAUNCHER,
+            item_names.DOMINION_TROOPER_CPO7_SALAMANDER_FLAMETHROWER
+        } & logical_inventory_set:
+            inventory = [item for item in inventory if item.name != item_names.DOMINION_TROOPER_ADVANCED_ALLOYS]
+            unused_items = [item_name for item_name in unused_items if item_name != item_names.DOMINION_TROOPER_ADVANCED_ALLOYS]
+            locked_items = [item for item in locked_items if item.name != item_names.DOMINION_TROOPER_ADVANCED_ALLOYS]
 
         # HotS
         # Baneling without sources => remove Baneling and upgrades