morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SC2: Fix Terran global upgrades present even if no Terran build missions are rolled (#5452)

Browse Source 
* Fix Terran global upgrades present even if no Terran build missions are rolled

* Code cleanup
This commit is contained in:
Ziktofel
2025-10-01 02:40:30 +02:00
committed by GitHub
parent 76b0197462
commit 4893ac3e51
2 changed files with 75 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
worlds/sc2/__init__.py
View File

@@ -468,7 +468,8 @@ def flag_excludes_by_faction_presence(world: SC2World, item_list: List[FilterIte
for item in item_list:
# Catch-all for all of a faction's items
if not terran_missions and item.data.race == SC2Race.TERRAN:
# Unit upgrades required for no-builds will get the FilterExcluded lifted when flagging AllowedOrphan
if not terran_build_missions and item.data.race == SC2Race.TERRAN:
if item.name not in item_groups.nova_equipment:
item.flags |= ItemFilterFlags.FilterExcluded
continue
@@ -483,10 +484,6 @@ def flag_excludes_by_faction_presence(world: SC2World, item_list: List[FilterIte
continue
# Faction units
if (not terran_build_missions
and item.data.type in (item_tables.TerranItemType.Unit, item_tables.TerranItemType.Building, item_tables.TerranItemType.Mercenary)
):
item.flags |= ItemFilterFlags.FilterExcluded
if (not zerg_build_missions
and item.data.type in (item_tables.ZergItemType.Unit, item_tables.ZergItemType.Mercenary, item_tables.ZergItemType.Evolution_Pit)
):
@@ -661,6 +658,7 @@ def flag_allowed_orphan_items(world: SC2World, item_list: List[FilterItem]) -> N
item_names.MEDIC_STABILIZER_MEDPACKS, item_names.MARINE_LASER_TARGETING_SYSTEM,
):
item.flags |= ItemFilterFlags.AllowedOrphan
item.flags &= ~ItemFilterFlags.FilterExcluded
# These rules only trigger on Standard tactics
if SC2Mission.BELLY_OF_THE_BEAST in missions and world.options.required_tactics == RequiredTactics.option_standard:
for item in item_list:
@@ -670,6 +668,7 @@ def flag_allowed_orphan_items(world: SC2World, item_list: List[FilterItem]) -> N
item_names.FIREBAT_NANO_PROJECTORS, item_names.FIREBAT_JUGGERNAUT_PLATING, item_names.FIREBAT_PROGRESSIVE_STIMPACK
):
item.flags |= ItemFilterFlags.AllowedOrphan
item.flags &= ~ItemFilterFlags.FilterExcluded
if SC2Mission.EVIL_AWOKEN in missions and world.options.required_tactics == RequiredTactics.option_standard:
for item in item_list:
if item.name in (item_names.STALKER_PHASE_REACTOR, item_names.STALKER_INSTIGATOR_SLAYER_DISINTEGRATING_PARTICLES, item_names.STALKER_INSTIGATOR_SLAYER_PARTICLE_REFLECTION):