Skip to content

Commit

Permalink
Merge remote-tracking branch 'SirChuckOfTheChuckles/DisruptorItems' i…
Browse files Browse the repository at this point in the history
…nto sc2-next
Ziktofel committed Aug 12, 2024
2 parents 1377747 + 878526e commit 9038093
Showing 3 changed files with 12 additions and 3 deletions.
5 changes: 4 additions & 1 deletion worlds/sc2/item_descriptions.py
Original file line number Diff line number Diff line change
@@ -842,6 +842,9 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
item_names.IMMORTAL_ANNIHILATOR_STALWART_SINGULARITY_CHARGE: "Increases Immortal, Annihilator, and Stalwart attack range by +2.",
item_names.IMMORTAL_ANNIHILATOR_STALWART_ADVANCED_TARGETING_MECHANICS: "Immortals, Annihilators, and Stalwarts can attack air units.",
item_names.IMMORTAL_ANNIHILATOR_STALWART_DISRUPTOR_DISPERSION: "Immortals, Annihilators, and Stalwarts deal minor splash damage.",
item_names.DISRUPTOR_CLOAKING_MODULE: "Disruptors are permanently cloaked.",
item_names.DISRUPTOR_PERFECTED_POWER: "Allows Purification Nova to hit air units. Bonus damage to shields is now baseline for enemies (friendly damage unaffected).",
item_names.DISRUPTOR_RESTRAINED_DESTRUCTION: "Purification Nova does 50% reduced damage to friendly units and structures.",
item_names.COLOSSUS_PACIFICATION_PROTOCOL: "Increases Colossus attack speed.",
item_names.WRATHWALKER_RAPID_POWER_CYCLING: "Reduces the charging time and increases attack speed of the Wrathwalker's Charged Blast.",
item_names.WRATHWALKER_EYE_OF_WRATH: "Increases Wrathwalker weapon range by +1.",
@@ -897,7 +900,7 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
item_names.COLOSSUS_FIRE_LANCE: "Colossus War Council upgrade. Colossi set the ground on fire with their attacks, dealing damage to enemies over time.",
item_names.WRATHWALKER_AERIAL_TRACKING: "Wrathwalker War Council upgrade. Wrathwalkers can now target air units.",
item_names.REAVER_KHALAI_REPLICATORS: "Reaver War Council upgrade. Reaver Scarabs no longer cost minerals.",
# Disruptor
item_names.DISRUPTOR_RESTRUCTURED_THRUSTERS: "Disruptor War Council upgrade. Allows the Disruptor to move while casting Purification Nova. Also allows the Disruptor to Blink.",
# Warp Prism
# Observer
item_names.PHOENIX_DOUBLE_GRAVITON_BEAM: "Phoenix War Council upgrade. Phoenixes can now use Graviton Beam to lift two targets at once.",
5 changes: 4 additions & 1 deletion worlds/sc2/item_names.py
Original file line number Diff line number Diff line change
@@ -671,6 +671,9 @@
IMMORTAL_ANNIHILATOR_STALWART_SINGULARITY_CHARGE = "Singularity Charge (Immortal/Annihilator/Stalwart)"
IMMORTAL_ANNIHILATOR_STALWART_ADVANCED_TARGETING_MECHANICS = "Advanced Targeting Mechanics (Immortal/Annihilator/Stalwart)"
IMMORTAL_ANNIHILATOR_STALWART_DISRUPTOR_DISPERSION = "Disruptor Dispersion (Immortal/Annihilator/Stalwart)"
DISRUPTOR_CLOAKING_MODULE = "Cloaking Module (Disruptor)"
DISRUPTOR_PERFECTED_POWER = "Perfected Power (Disruptor)"
DISRUPTOR_RESTRAINED_DESTRUCTION = "Restrained Destruction (Disruptor)"
COLOSSUS_PACIFICATION_PROTOCOL = "Pacification Protocol (Colossus)"
WRATHWALKER_RAPID_POWER_CYCLING = "Rapid Power Cycling (Wrathwalker)"
WRATHWALKER_EYE_OF_WRATH = "Eye of Wrath (Wrathwalker)"
@@ -728,7 +731,7 @@
COLOSSUS_FIRE_LANCE = "Fire Lance (Colossus)"
WRATHWALKER_AERIAL_TRACKING = "Aerial Tracking (Wrathwalker)"
REAVER_KHALAI_REPLICATORS = "Khalai Replicators (Reaver)"
# Disruptor
DISRUPTOR_RESTRUCTURED_THRUSTERS = "Restructured Thrusters (Disruptor)"
# Warp Prism
# Observer
PHOENIX_DOUBLE_GRAVITON_BEAM = "Double Graviton Beam (Phoenix)"
5 changes: 4 additions & 1 deletion worlds/sc2/items.py
Original file line number Diff line number Diff line change
@@ -1760,6 +1760,9 @@ def get_full_item_list():
item_names.ORACLE_BOSONIC_CORE: ItemData(378 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 18, SC2Race.PROTOSS, origin={"ext"}, parent_item=item_names.ORACLE),
item_names.SCOUT_RESOURCE_EFFICIENCY: ItemData(379 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 19, SC2Race.PROTOSS, origin={"ext"}, parent_item=item_names.SCOUT),
item_names.IMMORTAL_ANNIHILATOR_STALWART_DISRUPTOR_DISPERSION: ItemData(380 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 20, SC2Race.PROTOSS, origin={"ext"}),
item_names.DISRUPTOR_CLOAKING_MODULE: ItemData(381 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 21, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"ext"}),
item_names.DISRUPTOR_PERFECTED_POWER: ItemData(382 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 22, SC2Race.PROTOSS, origin={"ext"}),
item_names.DISRUPTOR_RESTRAINED_DESTRUCTION: ItemData(383 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 23, SC2Race.PROTOSS, classification=ItemClassification.filler, origin={"ext"}),
item_names.TEMPEST_INTERPLANETARY_RANGE: ItemData(384 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_3, 24, SC2Race.PROTOSS, parent_item=item_names.TEMPEST),

# War Council
@@ -1790,7 +1793,7 @@ def get_full_item_list():
item_names.COLOSSUS_FIRE_LANCE: ItemData(524 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 24, SC2Race.PROTOSS, classification=ItemClassification.progression, parent_item=item_names.COLOSSUS),
item_names.WRATHWALKER_AERIAL_TRACKING: ItemData(525 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 25, SC2Race.PROTOSS, classification=ItemClassification.progression, parent_item=item_names.WRATHWALKER),
item_names.REAVER_KHALAI_REPLICATORS: ItemData(526 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 26, SC2Race.PROTOSS, parent_item=item_names.REAVER),
# 527 reserved for Disruptor
item_names.DISRUPTOR_RESTRUCTURED_THRUSTERS: ItemData(527 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 27, SC2Race.PROTOSS, parent_item=item_names.DISRUPTOR),
# 528 reserved for Warp Prism
# 529 reserved for Observer
item_names.PHOENIX_DOUBLE_GRAVITON_BEAM: ItemData(530 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council_2, 0, SC2Race.PROTOSS, parent_item=item_names.PHOENIX),

0 comments on commit 9038093

Please sign in to comment.