Merge pull request Ziktofel#262 from EnvyDragon/predator-rolling-out

SC2: Predator Rework
EnvyDragon · Sep 2, 2024 · 00fc24a · 00fc24a
2 parents 3195a2f + e85d509
commit 00fc24a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/worlds/sc2/item_descriptions.py b/worlds/sc2/item_descriptions.py
@@ -222,8 +222,8 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
     item_names.GOLIATH_INTERNAL_TECH_MODULE: INTERNAL_TECH_MODULE_DESCRIPTION_TEMPLATE.format("Goliaths", "Factory"),
     item_names.SIEGE_TANK_SHAPED_HULL: "Increases Siege Tank life by 25.",
     item_names.SIEGE_TANK_RESOURCE_EFFICIENCY: _get_resource_efficiency_desc(item_names.SIEGE_TANK),
-    item_names.PREDATOR_CLOAK: CLOAK_DESCRIPTION_TEMPLATE.format("Predators"),
-    item_names.PREDATOR_CHARGE: "Allows Predators to intercept enemy ground units.",
+    item_names.PREDATOR_CLOAK: "Allows Predators to briefly cloak. Predators ignore unit collision while cloaked.",
+    item_names.PREDATOR_CHARGE: "Allows Predators to intercept enemy ground units, and applies an AoE slow on arrival.",
     item_names.MEDIVAC_SCATTER_VEIL: "Medivacs get 100 shields.",
     item_names.REAPER_PROGRESSIVE_STIMPACK: STIMPACK_SMALL_DESCRIPTION,
     item_names.REAPER_LASER_TARGETING_SYSTEM: LASER_TARGETING_SYSTEMS_DESCRIPTION,
@@ -440,7 +440,8 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
     item_names.PLANETARY_FORTRESS_ADVANCED_TARGETING: "Planetary Fortress can attack air units.",
     item_names.VALKYRIE_LAUNCHING_VECTOR_COMPENSATOR: "Allows Valkyries to shoot air while moving.",
     item_names.VALKYRIE_RESOURCE_EFFICIENCY: _get_resource_efficiency_desc(item_names.VALKYRIE),
-    item_names.PREDATOR_PREDATOR_S_FURY: "Predators can use an attack that jumps between targets.",
+    item_names.PREDATOR_VESPENE_SYNTHESIS: "Gives 1 free Vespene per target hit with Lightning Field.",
+    item_names.PREDATOR_ADAPTIVE_DEFENSES: "Predators gain a shield that halves incoming ranged and splash damage while active.",
     item_names.BATTLECRUISER_BEHEMOTH_PLATING: "Increases Battlecruiser armor by 2.",
     item_names.BATTLECRUISER_COVERT_OPS_ENGINES: "Increases Battlecruiser movement speed.",
     item_names.PLANETARY_FORTRESS_ORBITAL_MODULE: inspect.cleandoc("""

diff --git a/worlds/sc2/item_names.py b/worlds/sc2/item_names.py
@@ -220,9 +220,10 @@
 DEVASTATOR_TURRET_ANTI_ARMOR_MUNITIONS             = "Anti-Armor Munitions (Devastator Turret)"
 DEVASTATOR_TURRET_RESOURCE_EFFICIENCY              = "Resource Efficiency (Devastator Turret)"
 PREDATOR_RESOURCE_EFFICIENCY                       = "Resource Efficiency (Predator)"
-PREDATOR_CLOAK                                     = "Cloak (Predator)"
-PREDATOR_CHARGE                                    = "Charge (Predator)"
-PREDATOR_PREDATOR_S_FURY                           = "Predator's Fury (Predator)"
+PREDATOR_CLOAK                                     = "Phase Cloak (Predator)"
+PREDATOR_CHARGE                                    = "Concussive Charge (Predator)"
+PREDATOR_VESPENE_SYNTHESIS                         = "Vespene Synthesis (Predator)"
+PREDATOR_ADAPTIVE_DEFENSES                         = "Adaptive Defenses (Predator)"
 RAVEN_ANTI_ARMOR_MISSILE                           = "Anti-Armor Missile (Raven)"
 RAVEN_BIO_MECHANICAL_REPAIR_DRONE                  = "Bio Mechanical Repair Drone (Raven)"
 RAVEN_HUNTER_SEEKER_WEAPON                         = "Hunter-Seeker Weapon (Raven)"

diff --git a/worlds/sc2/items.py b/worlds/sc2/items.py
@@ -797,7 +797,7 @@ def get_full_item_list():
     item_names.VALKYRIE_RESOURCE_EFFICIENCY:
         ItemData(391 + SC2WOL_ITEM_ID_OFFSET, TerranItemType.Armory_6, 9, SC2Race.TERRAN,
                  parent_item=item_names.VALKYRIE, origin={"ext"}),
-    item_names.PREDATOR_PREDATOR_S_FURY:
+    item_names.PREDATOR_VESPENE_SYNTHESIS:
         ItemData(392 + SC2WOL_ITEM_ID_OFFSET, TerranItemType.Armory_6, 10, SC2Race.TERRAN,
                  parent_item=item_names.PREDATOR, origin={"ext"}),
     item_names.BATTLECRUISER_BEHEMOTH_PLATING:
@@ -980,6 +980,9 @@ def get_full_item_list():
     item_names.BATTLECRUISER_FIELD_ASSIST_TARGETING_SYSTEM:
         ItemData(752 + SC2WOL_ITEM_ID_OFFSET, TerranItemType.Armory_7, 6, SC2Race.TERRAN,
                  parent_item=item_names.BATTLECRUISER, origin={"ext"}),
+    item_names.PREDATOR_ADAPTIVE_DEFENSES:
+        ItemData(753 + SC2WOL_ITEM_ID_OFFSET, TerranItemType.Armory_7, 7, SC2Race.TERRAN,
+                 parent_item=item_names.PREDATOR, origin={"ext"}),
 
     # Filler items to fill remaining spots
     item_names.STARTING_MINERALS: