Merge pull request #384 from MatthewMarinets/mm/war_council_updates

War Council updates (Instigator + Zealot class RE)
Ziktofel · Dec 30, 2024 · ccdf0ee · ccdf0ee
2 parents b29b37c + bce1f35
commit ccdf0ee
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/worlds/sc2/item/item_descriptions.py b/worlds/sc2/item/item_descriptions.py
@@ -77,9 +77,8 @@
     item_names.INFESTED_LIBERATOR:    (0, 25, 0),
 
     # War Council
-    item_names.CENTURION:     (0, 50, 0),
+    item_names.CENTURION:     (0, 40, 0),
     item_names.SENTINEL:      (60, 0, 1),
-    item_names.INSTIGATOR:    (40, 15, 0),
 }
 
 
@@ -1000,7 +999,7 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
         item_names.SENTINEL),
     item_names.STALKER_PHASE_REACTOR: "Stalker War Council upgrade. Stalkers restore 80 shields over 5 seconds after they Blink.",
     item_names.DRAGOON_PHALANX_SUIT: "Dragoon War Council upgrade. Dragoons gain +1 range, move slightly faster, and can form tighter formations.",
-    item_names.INSTIGATOR_RESOURCE_EFFICIENCY: f"Instigator War Council upgrade. {_get_resource_efficiency_desc(item_names.INSTIGATOR)}",
+    item_names.INSTIGATOR_MODERNIZED_SERVOS: "Instigator War Council upgrade. Instigators move 20% faster.",
     item_names.ADEPT_DISRUPTIVE_TRANSFER: "Adept War Council upgrade. Adept shades apply a debuff to enemies they touch, increasing damage taken by +5.",
     item_names.SLAYER_PHASE_BLINK: "Slayer War Council upgrade. Slayers can now blink. After blinking, the Slayer's next attack within 8 seconds deals double damage.",
     item_names.AVENGER_KRYHAS_CLOAK: "Avenger War Council upgrade. Avengers are now permanently cloaked.",

diff --git a/worlds/sc2/item/item_names.py b/worlds/sc2/item/item_names.py
@@ -798,7 +798,7 @@
 SENTINEL_RESOURCE_EFFICIENCY                            = "Resource Efficiency (Sentinel)"
 STALKER_PHASE_REACTOR                                   = "Phase Reactor (Stalker)"
 DRAGOON_PHALANX_SUIT                                    = "Phalanx Suit (Dragoon)"
-INSTIGATOR_RESOURCE_EFFICIENCY                          = "Resource Efficiency (Instigator)"
+INSTIGATOR_MODERNIZED_SERVOS                            = "Modernized Servos (Instigator)"
 ADEPT_DISRUPTIVE_TRANSFER                               = "Disruptive Transfer (Adept)"
 SLAYER_PHASE_BLINK                                      = "Phase Blink (Slayer)"
 AVENGER_KRYHAS_CLOAK                                    = "Kryhas Cloak (Avenger)"

diff --git a/worlds/sc2/item/item_tables.py b/worlds/sc2/item/item_tables.py
@@ -1900,7 +1900,7 @@ def get_full_item_list():
     item_names.SENTINEL_RESOURCE_EFFICIENCY: ItemData(502 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 2, SC2Race.PROTOSS, parent=item_names.SENTINEL),
     item_names.STALKER_PHASE_REACTOR: ItemData(503 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 3, SC2Race.PROTOSS, parent=item_names.STALKER),
     item_names.DRAGOON_PHALANX_SUIT: ItemData(504 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 4, SC2Race.PROTOSS, parent=item_names.DRAGOON),
-    item_names.INSTIGATOR_RESOURCE_EFFICIENCY: ItemData(505 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 5, SC2Race.PROTOSS, parent=item_names.INSTIGATOR),
+    item_names.INSTIGATOR_MODERNIZED_SERVOS: ItemData(505 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 5, SC2Race.PROTOSS, parent=item_names.INSTIGATOR),
     item_names.ADEPT_DISRUPTIVE_TRANSFER: ItemData(506 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 6, SC2Race.PROTOSS, parent=item_names.ADEPT),
     item_names.SLAYER_PHASE_BLINK: ItemData(507 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 7, SC2Race.PROTOSS, classification=ItemClassification.progression, parent=item_names.SLAYER),
     item_names.AVENGER_KRYHAS_CLOAK: ItemData(508 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.War_Council, 8, SC2Race.PROTOSS, parent=item_names.AVENGER),