Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sc2: War council upgrades for ascendant, arbiter, skylord #286

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions worlds/sc2/item_descriptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
item_names.ORACLE_BOSONIC_CORE: "Increases starting energy by 150 and maximum energy by 50.",
item_names.ARBITER_CHRONOSTATIC_REINFORCEMENT: "Arbiters gain +50 maximum life and +1 armor.",
item_names.ARBITER_KHAYDARIN_CORE: _get_start_and_max_energy_desc("Arbiters"),
item_names.ARBITER_SPACETIME_ANCHOR: "Arbiter Stasis Field lasts 50 seconds longer.",
item_names.ARBITER_SPACETIME_ANCHOR: "Allows Arbiters to use an alternate version of Stasis Field which lasts 50 seconds longer.",
item_names.ARBITER_RESOURCE_EFFICIENCY: _get_resource_efficiency_desc(item_names.ARBITER),
item_names.ARBITER_ENHANCED_CLOAK_FIELD: "Increases Arbiter Cloaking Field range.",
item_names.CARRIER_SKYLORD_PURGER_GRAVITON_CATAPULT: "Carriers can launch Interceptors more quickly.",
Expand Down Expand Up @@ -887,7 +887,7 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
item_names.HAVOC_ENDURING_SIGHT: "Havoc War Council upgrade. Havoc Squad Sight stays up indefinitely and no longer takes energy.",
item_names.HIGH_TEMPLAR_PLASMA_SURGE: "High Templar War Council upgrade. High Templar Psionic Storm will heal fiendly protoss shields under it.",
# Signifier
# Ascendant
item_names.ASCENDANT_ABILITY_EFFICIENCY: "Ascendant War Council upgrade. Ascendant spells cost -25 energy.",
item_names.DARK_ARCHON_INDOMITABLE_WILL: "Dark Archon War Council upgrade. Casting Mind Control will no longer deplete the Dark Archon's shields.",
item_names.IMMORTAL_IMPROVED_BARRIER: "Immortal War Council upgrade. The Immortal's Barrier ability absorbs an additional +100 damage.",
item_names.VANGUARD_RAPIDFIRE_CANNON: "Vanguard War Council upgrade. Vanguards attack 38% faster.",
Expand All @@ -909,11 +909,11 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
# Warp Ray
# Dawnbringer
# Carrier
# Skylord
item_names.SKYLORD_HYPERJUMP: "Skylord War Council upgrade. " + _ability_desc("Skylords", "Hyperjump", "teleports the skylord to any location on the map."),
# Trireme
item_names.TEMPEST_DISINTEGRATION: "Tempest War Council upgrade. " + _ability_desc("Tempests", "Disintegration", "deals 500 damage to a target unit or structure over 20 seconds"),
# Scout
# Arbiter
item_names.ARBITER_ABILITY_EFFICIENCY: "Arbiter War Council upgrade. Reduces the energy cost of Recall by 50 and Stasis Field by 100.",
# Oracle
# Mothership
item_names.SOA_CHRONO_SURGE: "The Spear of Adun increases a target structure's unit warp in and research speeds by +1000% for 20 seconds.",
Expand Down
6 changes: 3 additions & 3 deletions worlds/sc2/item_names.py
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@
HAVOC_ENDURING_SIGHT = "Enduring Sight (Havoc)"
HIGH_TEMPLAR_PLASMA_SURGE = "Plasma Surge (High Templar)"
# Signifier
# Ascendant
ASCENDANT_ABILITY_EFFICIENCY = "Ability Efficiency (Ascendant)"
DARK_ARCHON_INDOMITABLE_WILL = "Indomitable Will (Dark Archon)"
IMMORTAL_IMPROVED_BARRIER = "Improved Barrier (Immortal)"
VANGUARD_RAPIDFIRE_CANNON = "Rapid-Fire Cannon (Vanguard)"
Expand All @@ -740,11 +740,11 @@
# Warp Ray
# Dawnbringer
# Carrier
# Skylord
SKYLORD_HYPERJUMP = "Hyperjump (Skylord)"
# Trireme
TEMPEST_DISINTEGRATION = "Disintegration (Tempest)"
# Scout
# Arbiter
ARBITER_ABILITY_EFFICIENCY = "Ability Efficiency (Arbiter)"
# Oracle
# Mothership

Expand Down
6 changes: 3 additions & 3 deletions worlds/sc2/items.py
Original file line number Diff line number Diff line change
Expand Up @@ -1780,7 +1780,7 @@ def get_full_item_list():
item_names.HAVOC_ENDURING_SIGHT: ItemData(514 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 14, SC2Race.PROTOSS, parent_item=item_names.HAVOC),
item_names.HIGH_TEMPLAR_PLASMA_SURGE: ItemData(515 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 15, SC2Race.PROTOSS, parent_item=item_names.HIGH_TEMPLAR),
# 516 reserved for Signifier
# 517 reserved for Ascendant
item_names.ASCENDANT_ABILITY_EFFICIENCY: ItemData(517 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 17, SC2Race.PROTOSS, parent_item=item_names.ASCENDANT),
item_names.DARK_ARCHON_INDOMITABLE_WILL: ItemData(518 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 18, SC2Race.PROTOSS),
item_names.IMMORTAL_IMPROVED_BARRIER: ItemData(519 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 19, SC2Race.PROTOSS, parent_item=item_names.IMMORTAL),
item_names.VANGUARD_RAPIDFIRE_CANNON: ItemData(520 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 20, SC2Race.PROTOSS, parent_item=item_names.VANGUARD),
Expand All @@ -1802,11 +1802,11 @@ def get_full_item_list():
# 536 reserved for Warp Ray
# 537 reserved for Dawnbringer
# 538 reserved for Carrier
# 539 reserved for Skylord
item_names.SKYLORD_HYPERJUMP: ItemData(539 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council_2, 9, SC2Race.PROTOSS, parent_item=item_names.SKYLORD),
# 540 reserved for Trireme
item_names.TEMPEST_DISINTEGRATION: ItemData(541 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council_2, 11, SC2Race.PROTOSS, parent_item=item_names.TEMPEST),
# 542 reserved for Scout
# 543 reserved for Arbiter
item_names.ARBITER_ABILITY_EFFICIENCY: ItemData(543 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council_2, 13, SC2Race.PROTOSS, parent_item=item_names.ARBITER),
# 544 reserved for Oracle
# 545 reserved for Mothership

Expand Down
Loading