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

SC2: Restrict allow Orphan to missions that already require that (#5405)

Browse Source 
* Restrict Allow Orphan for items to missions that already require that

* Add test for build mission orphan behavior

* Update item lists for Allow Orphan flag

* Update the unit test to clear that BotB is not in the mission list

* Update unit test name
This commit is contained in:
Ziktofel
2025-09-05 16:44:01 +02:00
committed by GitHub
parent 0d26b6426f
commit 8c2d246a53
2 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
worlds/sc2/__init__.py
View File

@@ -654,18 +654,21 @@ def flag_mission_based_item_excludes(world: SC2World, item_list: List[FilterItem
def flag_allowed_orphan_items(world: SC2World, item_list: List[FilterItem]) -> None:
"""Adds the `Allowed_Orphan` flag to items that shouldn't be filtered with their parents, like combat shield"""
missions = get_all_missions(world.custom_mission_order)
terran_nobuild_missions = any((MissionFlag.Terran|MissionFlag.NoBuild) in mission.flags and mission.campaign != SC2Campaign.NCO for mission in missions)
if terran_nobuild_missions:
if SC2Mission.PIERCING_OF_THE_SHROUD in missions:
for item in item_list:
if item.name in (
item_names.MARINE_COMBAT_SHIELD, item_names.MARINE_PROGRESSIVE_STIMPACK, item_names.MARINE_MAGRAIL_MUNITIONS,
item_names.MEDIC_STABILIZER_MEDPACKS, item_names.MEDIC_NANO_PROJECTOR, item_names.MARINE_LASER_TARGETING_SYSTEM,
item_names.MEDIC_STABILIZER_MEDPACKS, item_names.MARINE_LASER_TARGETING_SYSTEM,
):
item.flags |= ItemFilterFlags.AllowedOrphan
# 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:
if item.name in (item_names.FIREBAT_NANO_PROJECTORS, item_names.FIREBAT_NANO_PROJECTORS, item_names.FIREBAT_PROGRESSIVE_STIMPACK):
if item.name in (
item_names.MARINE_COMBAT_SHIELD, item_names.MARINE_PROGRESSIVE_STIMPACK, item_names.MARINE_MAGRAIL_MUNITIONS,
item_names.MEDIC_STABILIZER_MEDPACKS, item_names.MARINE_LASER_TARGETING_SYSTEM,
item_names.FIREBAT_NANO_PROJECTORS, item_names.FIREBAT_JUGGERNAUT_PLATING, item_names.FIREBAT_PROGRESSIVE_STIMPACK
):
item.flags |= ItemFilterFlags.AllowedOrphan
if SC2Mission.EVIL_AWOKEN in missions and world.options.required_tactics == RequiredTactics.option_standard:
for item in item_list:

36
worlds/sc2/test/test_generation.py
View File

@@ -4,7 +4,8 @@ Unit tests for world generation
from typing import *
from .test_base import Sc2SetupTestBase
from .. import mission_groups, mission_tables, options, locations, SC2Mission, SC2Campaign, SC2Race, unreleased_items
from .. import mission_groups, mission_tables, options, locations, SC2Mission, SC2Campaign, SC2Race, unreleased_items, \
RequiredTactics
from ..item import item_groups, item_tables, item_names
from .. import get_all_missions, get_random_first_mission
from ..options import EnabledCampaigns, NovaGhostOfAChanceVariant, MissionOrder, ExcludeOverpoweredItems, \
@@ -1226,3 +1227,36 @@ class TestItemFiltering(Sc2SetupTestBase):
# A unit nerf happens due to excluding OP items
self.assertNotIn(item_names.MOTHERSHIP_INTEGRATED_POWER, starting_inventory)
def test_terran_nobuild_sections_get_marine_medic_upgrades_with_units_excluded(self) -> None:
world_options = {
'mission_order': MissionOrder.option_grid,
'maximum_campaign_size': MaximumCampaignSize.range_end,
'enabled_campaigns': {
SC2Campaign.WOL.campaign_name
},
'excluded_items': [item_names.MARINE, item_names.MEDIC],
'shuffle_no_build': False,
'required_tactics': RequiredTactics.option_standard
}
mm_logic_upgrades = {
item_names.MARINE_COMBAT_SHIELD, item_names.MARINE_MAGRAIL_MUNITIONS,
item_names.MARINE_LASER_TARGETING_SYSTEM,
item_names.MARINE_PROGRESSIVE_STIMPACK, item_names.MEDIC_STABILIZER_MEDPACKS
}
self.generate_world(world_options)
itempool = [item.name for item in self.multiworld.itempool]
missions = self.multiworld.worlds[self.player].custom_mission_order.get_used_missions()
# These missions are rolled
self.assertIn(SC2Mission.THE_DIG, missions)
self.assertIn(SC2Mission.ENGINE_OF_DESTRUCTION, missions)
# This is not rolled
self.assertNotIn(SC2Mission.PIERCING_OF_THE_SHROUD, missions)
self.assertNotIn(SC2Mission.BELLY_OF_THE_BEAST, missions)
# These items are excluded and shouldn't appear
self.assertNotIn(item_names.MARINE, itempool)
self.assertNotIn(item_names.MEDIC, itempool)
# An upgrade is requested by logic for The Dig and Engine of Destruction
self.assertGreaterEqual(len(set(itempool).intersection(mm_logic_upgrades)), 1)