mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-04-08 23:38:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

SC2: Allowing unexcluded_items to affect items excluded by vanilla_items_only (#5520)

Browse Source
This commit is contained in:
Phaneros
2025-11-14 17:09:57 -08:00
committed by GitHub
parent a2f8877810
commit d7eb95a2ee
2 changed files with 58 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
worlds/sc2/__init__.py
View File

@@ -148,7 +148,6 @@ class SC2World(World):
flag_start_inventory(self, item_list)
flag_unused_upgrade_types(self, item_list)
flag_unreleased_items(item_list)
flag_user_excluded_item_sets(self, item_list)
flag_war_council_items(self, item_list)
flag_and_add_resource_locations(self, item_list)
flag_mission_order_required_items(self, item_list)
@@ -394,6 +393,17 @@ def create_and_flag_explicit_item_locks_and_excludes(world: SC2World) -> List[Fi
if world.options.exclude_overpowered_items.value == ExcludeOverpoweredItems.option_true:
for item_name in item_groups.overpowered_items:
auto_excludes[item_name] = 1
if world.options.vanilla_items_only.value == VanillaItemsOnly.option_true:
for item_name, item_data in item_tables.item_table.items():
if item_name in item_groups.terran_original_progressive_upgrades:
auto_excludes[item_name] = max(item_data.quantity - 1, auto_excludes.get(item_name, 0))
elif item_name in item_groups.vanilla_items:
continue
elif item_name in item_groups.nova_equipment:
continue
else:
auto_excludes[item_name] = 0
result: List[FilterItem] = []
for item_name, item_data in item_tables.item_table.items():
@@ -836,26 +846,6 @@ def flag_unreleased_items(item_list: List[FilterItem]) -> None:
item.flags |= ItemFilterFlags.Removed
def flag_user_excluded_item_sets(world: SC2World, item_list: List[FilterItem]) -> None:
"""Excludes items based on item set options (`only_vanilla_items`)"""
vanilla_nonprogressive_count = {
item_name: 0 for item_name in item_groups.terran_original_progressive_upgrades
}
if world.options.vanilla_items_only.value == VanillaItemsOnly.option_true:
vanilla_items = item_groups.vanilla_items + item_groups.nova_equipment
for item in item_list:
if ItemFilterFlags.UserExcluded in item.flags:
continue
if item.name not in vanilla_items:
item.flags |= ItemFilterFlags.UserExcluded
if item.name in item_groups.terran_original_progressive_upgrades:
if vanilla_nonprogressive_count[item.name]:
item.flags |= ItemFilterFlags.UserExcluded
vanilla_nonprogressive_count[item.name] += 1
excluded_count: Dict[str, int] = dict()
def flag_war_council_items(world: SC2World, item_list: List[FilterItem]) -> None:
"""Excludes / start-inventories items based on `nerf_unit_baselines` option.
Will skip items that are excluded by other sources."""