Skip to content

Commit

Permalink
SC2: Adding Aberration and Corruptor upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
EnvyDragon committed May 24, 2024
1 parent 284237e commit 17238d3
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 2 deletions.
11 changes: 11 additions & 0 deletions worlds/sc2/item_descriptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
item_names.HYDRALISK: (25, 25, 1),
item_names.SWARM_HOST: (100, 25, 0),
item_names.ULTRALISK: (100, 0, 2),
item_names.ABERRATION: (50, 25, 0),
item_names.CORRUPTOR: (50, 25, 0),
DISPLAY_NAME_BROOD_LORD: (0, 75, 0),
item_names.SWARM_QUEEN: (0, 50, 0),
item_names.ARBITER: (50, 0, 0),
Expand Down Expand Up @@ -591,6 +593,15 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
item_names.DEFILER_TRAPDOOR_ADAPTATION: "Defilers can now use abilities while burrowed.",
item_names.DEFILER_PREDATORY_CONSUMPTION: "Defilers can now use Consume on any non-heroic biological unit, not just friendly Zerg.",
item_names.DEFILER_COMORBIDITY: "Plague now stacks up to three times, and depletes energy as well as health.",
item_names.ABERRATION_MONSTROUS_RESILIENCE: "Aberrations gain +140 life.",
item_names.ABERRATION_CONSTRUCT_REGENERATION: "Aberrations gain increased life regeneration.",
item_names.ABERRATION_PROTECTIVE_COVER: "Aberrations grant damage reduction to allied units directly beneath them.",
item_names.ABERRATION_BANELING_INCUBATION: "Aberrations spawn 2 Banelings upon death.",
item_names.ABERRATION_RESOURCE_EFFICIENCY: _get_resource_efficiency_desc(item_names.ABERRATION),
item_names.CORRUPTOR_MONSTROUS_RESILIENCE: "Corruptors gain +100 life.",
item_names.CORRUPTOR_CONSTRUCT_REGENERATION: "Corruptors gain increased life regeneration.",
item_names.CORRUPTOR_SCOURGE_INCUBATION: "Corruptors spawn 2 Scourge upon death (3 with Swarm Scourge).",
item_names.CORRUPTOR_RESOURCE_EFFICIENCY: _get_resource_efficiency_desc(item_names.CORRUPTOR),
item_names.ZERGLING_RAPTOR_STRAIN: "Allows Zerglings to jump up and down cliffs and leap onto enemies. Also increases Zergling attack damage by 2.",
item_names.ZERGLING_SWARMLING_STRAIN: "Zerglings will spawn instantly and with an extra Zergling per egg at no additional cost.",
item_names.ROACH_VILE_STRAIN: "Roach attacks will slow the movement and attack speed of enemies.",
Expand Down
9 changes: 9 additions & 0 deletions worlds/sc2/item_names.py
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,15 @@
DEFILER_TRAPDOOR_ADAPTATION = "Trapdoor Adaptation (Defiler)"
DEFILER_PREDATORY_CONSUMPTION = "Predatory Consumption (Defiler)"
DEFILER_COMORBIDITY = "Comorbidity (Defiler)"
ABERRATION_MONSTROUS_RESILIENCE = "Monstrous Resilience (Aberration)"
ABERRATION_CONSTRUCT_REGENERATION = "Construct Regeneration (Aberration)"
ABERRATION_BANELING_INCUBATION = "Baneling Incubation (Aberration)"
ABERRATION_PROTECTIVE_COVER = "Protective Cover (Aberration)"
ABERRATION_RESOURCE_EFFICIENCY = "Resource Efficiency (Aberration)"
CORRUPTOR_MONSTROUS_RESILIENCE = "Monstrous Resilience (Corruptor)"
CORRUPTOR_CONSTRUCT_REGENERATION = "Construct Regeneration (Corruptor)"
CORRUPTOR_SCOURGE_INCUBATION = "Scourge Incubation (Corruptor)"
CORRUPTOR_RESOURCE_EFFICIENCY = "Resource Efficiency (Corruptor)"

# Zerg Strains
ZERGLING_RAPTOR_STRAIN = "Raptor Strain (Zergling)"
Expand Down
29 changes: 27 additions & 2 deletions worlds/sc2/items.py
Original file line number Diff line number Diff line change
Expand Up @@ -1274,6 +1274,33 @@ def get_full_item_list():
item_names.DEFILER_COMORBIDITY:
ItemData(280 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_3, 18, SC2Race.ZERG, parent_item=item_names.DEFILER,
origin={"ext"}),
item_names.ABERRATION_MONSTROUS_RESILIENCE:
ItemData(281 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_3, 21, SC2Race.ZERG, parent_item=item_names.ABERRATION,
origin={"ext"}),
item_names.ABERRATION_CONSTRUCT_REGENERATION:
ItemData(282 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_3, 22, SC2Race.ZERG, parent_item=item_names.ABERRATION,
origin={"ext"}),
item_names.ABERRATION_BANELING_INCUBATION:
ItemData(283 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_3, 23, SC2Race.ZERG, parent_item=item_names.ABERRATION,
origin={"ext"}),
item_names.ABERRATION_PROTECTIVE_COVER:
ItemData(284 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_3, 24, SC2Race.ZERG, parent_item=item_names.ABERRATION,
origin={"ext"}),
item_names.ABERRATION_RESOURCE_EFFICIENCY:
ItemData(285 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_3, 25, SC2Race.ZERG, parent_item=item_names.ABERRATION,
origin={"ext"}),
item_names.CORRUPTOR_MONSTROUS_RESILIENCE:
ItemData(286 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_3, 26, SC2Race.ZERG, parent_item=item_names.CORRUPTOR,
origin={"ext"}),
item_names.CORRUPTOR_CONSTRUCT_REGENERATION:
ItemData(287 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_3, 27, SC2Race.ZERG, parent_item=item_names.CORRUPTOR,
origin={"ext"}),
item_names.CORRUPTOR_SCOURGE_INCUBATION:
ItemData(288 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_3, 28, SC2Race.ZERG, parent_item=item_names.CORRUPTOR,
origin={"ext"}),
item_names.CORRUPTOR_RESOURCE_EFFICIENCY:
ItemData(289 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mutation_3, 29, SC2Race.ZERG, parent_item=item_names.CORRUPTOR,
origin={"ext"}),

item_names.ZERGLING_RAPTOR_STRAIN:
ItemData(300 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Strain, 0, SC2Race.ZERG, parent_item=item_names.ZERGLING,
Expand Down Expand Up @@ -1740,8 +1767,6 @@ def get_basic_units(world: 'SC2World', race: SC2Race) -> typing.Set[str]:
# Zerg static defenses
item_names.SPORE_CRAWLER,
item_names.SPINE_CRAWLER,
# Aberration (no upgrades)
item_names.ABERRATION,
# Spear of Adun Abilities
item_names.SOA_CHRONO_SURGE,
item_names.SOA_PROGRESSIVE_PROXY_PYLON,
Expand Down

0 comments on commit 17238d3

Please sign in to comment.