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: various spelling, grammar, and clarity fixes in item descriptions #376

Merged
merged 1 commit into from
Dec 14, 2024
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
48 changes: 24 additions & 24 deletions worlds/sc2/item/item_descriptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -738,9 +738,9 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
item_names.TYRANNOZOR_IMPALING_STRIKE: "Ultralisk and Tyrannozor melee attacks have a 20% chance to stun for 2 seconds.",
item_names.TYRANNOZOR_HEALING_ADAPTATION: "Ultralisks and Tyrannozors regenerate life quickly when out of combat.",
item_names.BILE_LAUNCHER_ARTILLERY_DUCTS: "Increases Bile Launcher range by +8.",
item_names.BILE_LAUNCHER_RAPID_BOMBARMENT: "Bile Launchers attack by 40% faster.",
item_names.BILE_LAUNCHER_RAPID_BOMBARMENT: "Bile Launchers attack 40% faster.",
item_names.NYDUS_WORM_ECHIDNA_WORM_SUBTERRANEAN_SCALES: f"Increases {DISPLAY_NAME_WORMS} maximum health by 250 and armor by 1.",
item_names.NYDUS_WORM_ECHIDNA_WORM_JORMUNGANDR_STRAIN: f"Removes emerge time for {DISPLAY_NAME_WORMS}, and allows them to be salvaged, returning the cost spent on them.",
item_names.NYDUS_WORM_ECHIDNA_WORM_JORMUNGANDR_STRAIN: f"Removes emerge time for {DISPLAY_NAME_WORMS}, and allows them to be salvaged to return the resources spent on them.",
item_names.NYDUS_WORM_RAVENOUS_APPETITE: "Allows Nydus Worms to unload and load units nearly instantly.",
item_names.NYDUS_WORM_ECHIDNA_WORM_RESOURCE_EFFICIENCY: _get_resource_efficiency_desc(DISPLAY_NAME_WORMS),
item_names.ECHIDNA_WORM_OUROBOROS_STRAIN: "Allows Echidna Worms to train a limited assortment of combat units (Zerglings, Roachs, Hydralisks, and Aberrations) at a reduced time and cost.",
Expand All @@ -751,17 +751,17 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
item_names.INFESTED_SIEGE_TANK_ACIDIC_ENZYMES: "Infested Siege Tanks deal an additional 15 damage to armored units and structures in both modes.",
item_names.INFESTED_SIEGE_TANK_DEEP_TUNNEL: _ability_desc("Infested Siege Tanks", "Deep Tunnel", "allows them to burrow to any visible location on the map covered in creep"),
item_names.INFESTED_SIEGE_TANK_SEISMIC_SONAR: "Infested Siege Tank Tentacle weapon gains +1 range. Volatile Burst weapon gains +3 range.",
item_names.INFESTED_SIEGE_TANK_BALANCED_ROOTS: "Allows Infested Siege Tank to attack while moving with its Tentacle weapon.",
item_names.INFESTED_SIEGE_TANK_BALANCED_ROOTS: "Allows Infested Siege Tanks to attack while moving with their Tentacle weapons.",
item_names.INFESTED_DIAMONDBACK_CAUSTIC_MUCUS: "Infested Diamondbacks leave behind a trail of acid when moving that deals 12 damage per second to enemy units.",
item_names.INFESTED_DIAMONDBACK_VIOLENT_ENZYMES: "Infested Diamondbacks deal an additional +8 damage.",
item_names.INFESTED_DIAMONDBACK_CONCENTRATED_SPEW: "Infested Diamondbacks gain +2 weapon range. Fungal Snare gains +2 range.",
item_names.INFESTED_DIAMONDBACK_PROGRESSIVE_FUNGAL_SNARE: inspect.cleandoc("""
Level 1: Infested Diamondbacks gain the Fungal Snare ability, allowing them to temporary ground flying units.
Level 1: Infested Diamondbacks gain the Fungal Snare ability, allowing them to temporarily ground flying units.
Level 2: Infested Diamondback Fungal Snare ability cooldown reduced by 15 seconds.
"""),
item_names.INFESTED_BANSHEE_BRACED_EXOSKELETON: "Infested Banshees gain +100 life.",
item_names.INFESTED_BANSHEE_RAPID_HIBERNATION: "Infested Banshees regenerate 20 life and energy per second while burrowed.",
item_names.INFESTED_BANSHEE_ADVANCED_TARGETING_OPTICS: "Infested Banshees gain +2 range while cloacked.",
item_names.INFESTED_BANSHEE_ADVANCED_TARGETING_OPTICS: "Infested Banshees gain +2 range while cloaked.",
item_names.INFESTED_LIBERATOR_CLOUD_DISPERSAL: "Infested Liberators instantly transform into a cloud of microscopic organisms while attacking, reducing the damage they take by 85%.",
item_names.INFESTED_LIBERATOR_VIRAL_CONTAMINATION: "Increases the damage Infested Liberators deal to their primary target by 100%.",
item_names.INFESTED_LIBERATOR_DEFENDER_MODE: "Allows Infested Liberators to deploy into Defender Mode to attack ground units.",
Expand Down Expand Up @@ -829,17 +829,17 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
item_names.INFESTED_MEDICS: "Mercenary infested Medics that may be called in from the Predator Nest.",
item_names.INFESTED_SIEGE_BREAKERS: "Mercenary infested Siege Breakers that may be called in from the Predator Nest.",
item_names.INFESTED_DUSK_WINGS: "Mercenary infested Dusk Wings that may be called in from the Predator Nest.",
item_names.HUNTER_KILLERS: "Elite Hydralisks that may be called in from the Predator Nest.",
item_names.DEVOURING_ONES: "Mercenary Zerglings.",
item_names.TORRASQUE_MERC: "Torrasque Mercenary.",
item_names.HUNTERLING: "Hunterling Mercenary.",
item_names.YGGDRASIL: "Mercenary Overlord that has the ability to transport buildings and ground units.",
item_names.MERC_ROACH: "Mercenary Roaches that have the ability to attack air units.",
item_names.HUNTER_KILLERS: "Elite Hydralisk strain. Summoned at the Predator Nest.",
item_names.DEVOURING_ONES: "Elite Zergling strain. Summoned at the Predator Nest.",
item_names.TORRASQUE_MERC: "Elite Ultralisk strain. Summoned at the Predator Nest.",
item_names.HUNTERLING: "Elite strain. Can jump up and down cliffs and stun enemies by jumping on them. Summoned at the Predator Nest.",
item_names.YGGDRASIL: "Elite Overlord strain that has the ability to transport buildings and ground units. Summoned at the Predator Nest.",
item_names.THORNSHELL: "Elite Roach Strain that has the ability to attack air units. Summoned at the Predator Nest.",
item_names.OVERLORD_VENTRAL_SACS: "Overlords gain the ability to transport ground units.",
item_names.OVERLORD_GENERATE_CREEP: "Overlords gain the ability to generate creep while standing still.",
item_names.OVERLORD_ANTENNAE: "Increases Overlord sight range.",
item_names.OVERLORD_PNEUMATIZED_CARAPACE: "Increases Overlord movement speed.",
item_names.OVERLORD_OVERSEER_ASPECT: "Allows to morph Overlords into Overseers. Overseers can use Spawn Creep Tumor and Contaminate abilities.",
item_names.OVERLORD_OVERSEER_ASPECT: "Allows Overlords to morph into Overseers. Overseers can use the Spawn Creep Tumor and Contaminate abilities.",
item_names.MUTALISK_CORRUPTOR_GUARDIAN_ASPECT: "Long-range anti-ground flyer. Can attack ground units. Morphed from the Mutalisk or Corruptor.",
item_names.MUTALISK_CORRUPTOR_DEVOURER_ASPECT: "Anti-air flyer. Attack inflict Acid Spores. Can attack air units. Morphed from the Mutalisk or Corruptor.",
item_names.ROACH_RAVAGER_ASPECT: "Ranged artillery. Can use Corrosive Bile. Can attack ground units. Morphed from the Roach.",
Expand All @@ -850,12 +850,12 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
item_names.OBSERVER: "Flying spy. Cloak renders the unit invisible to enemies without detection.",
item_names.CENTURION: "Powerful melee warrior. Has the Shadow Charge and Darkcoil abilities.",
item_names.SENTINEL: "Powerful melee warrior. Has the Charge and Reconstruction abilities.",
item_names.SUPPLICANT: "Powerful melee warrior. Has powerful damage resistant shields.",
item_names.SUPPLICANT: "Powerful melee warrior. Has powerful damage-resistant shields.",
item_names.INSTIGATOR: "Ranged support strider. Can store multiple Blink charges.",
item_names.SLAYER: "Ranged attack strider. Can use the Phase Blink and Phasing Armor abilities.",
item_names.SENTRY: "Robotic support unit can use the Guardian Shield ability and restore the shields of nearby Protoss units.",
item_names.ENERGIZER: "Robotic support unit. Can use the Chrono Beam ability and become stationary to power nearby structures.",
item_names.HAVOC: "Robotic support unit. Can use the Target Lock and Force Field abilities and increase the range of nearby Protoss units.",
item_names.SENTRY: "Robotic support unit. Can use the Guardian Shield ability and can restore the shields of nearby Protoss units.",
item_names.ENERGIZER: "Robotic support unit. Can use the Chrono Beam ability and can become stationary to power nearby structures.",
item_names.HAVOC: "Robotic support unit. Can use the Target Lock and Force Field abilities and increases the range of nearby Protoss units.",
item_names.SIGNIFIER: "Potent permanently cloaked psionic master. Can use the Feedback and Crippling Psionic Storm abilities. Can merge into an Archon.",
item_names.ASCENDANT: "Potent psionic master. Can use the Psionic Orb, Mind Blast, and Sacrifice abilities.",
item_names.AVENGER: "Deadly warrior-assassin. Permanently cloaked. Recalls to the nearest Dark Shrine upon death.",
Expand All @@ -867,18 +867,18 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
item_names.ANNIHILATOR: "Assault Strider. Can use the Shadow Cannon ability to damage air and ground units.",
item_names.STALWART: "Assault strider. Has shields that deflect high-damage attacks.",
item_names.VANGUARD: "Assault Strider. Deals splash damage around the primary target.",
item_names.WRATHWALKER: "Battle strider with a powerful single target attack. Can walk up and down cliffs.",
item_names.WRATHWALKER: "Battle strider with a powerful single-target attack. Can walk up and down cliffs.",
item_names.REAVER: "Area damage siege unit. Builds and launches explosive Scarabs for high burst damage.",
item_names.DISRUPTOR: "Robotic disruption unit. Can use the Purification Nova ability to deal heavy area damage.",
item_names.MIRAGE: "Air superiority starfighter. Can use Graviton Beam and Phasing Armor abilities.",
item_names.SKIRMISHER: "Fast skirmish starfighter.",
item_names.SKIRMISHER: "Fast skirmish starfighter. Can target ground units.",
item_names.CORSAIR: "Air superiority starfighter. Can use the Disruption Web ability.",
item_names.DESTROYER: "Area assault craft. Can use the Destruction Beam ability to attack multiple units at once.",
item_names.WARP_RAY: "Surgical-strike craft. Damage output increases the longer the Warp Ray remains on target.",
item_names.DAWNBRINGER: "Flying Anti-Surface Assault Ship. Attacks in an area around the target. Attack count increases as it continues firing.",
item_names.SCOUT: "Versatile high-speed fighter.",
item_names.SCOUT: "Versatile high-speed fighter. Has a powerful anti-armoured air attack and a weaker anti-ground attack.",
item_names.TEMPEST: "Siege artillery craft. Attacks from long range. Can use the Disintegration ability.",
item_names.MOTHERSHIP: "Ultimate Protoss vessel, Can use the Vortex and Mass Recall abilities. Cloaks nearby units and structures.",
item_names.MOTHERSHIP: "Ultimate Protoss vessel. Can use the Vortex and Mass Recall abilities.",
item_names.ARBITER: "Army support craft. Has the Stasis Field and Recall abilities. Cloaks nearby units.",
item_names.ORACLE: "Flying caster. Can use the Revelation and Stasis Ward abilities.",
item_names.SKYLORD: "Capital ship. Fires a powerful laser that deals damage in a line. Can use Tactical Jump ability.",
Expand Down Expand Up @@ -972,7 +972,7 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
item_names.HIGH_TEMPLAR_SIGNIFIER_KHAYDARIN_AMULET: _get_start_and_max_energy_desc("High Templar and Signifiers"),
item_names.ARCHON_HIGH_ARCHON: "Archons can use High Templar abilities.",
item_names.ARCHON_TRANSCENDENCE: "Archons can float in the air. Can traverse cliffs and phase through most units.",
item_names.ARCHON_POWER_SIPHON: _ability_desc("Archons", "Power Siphon", "Deals damage to a target and replenishes shields over 2 seconds."),
item_names.ARCHON_POWER_SIPHON: _ability_desc("Archons", "Power Siphon", "deals damage to a target and replenishes shields over 2 seconds"),
item_names.ARCHON_ERADICATE: "On death, Archons launch towards nearby enemy ground units, dealing damage on impact.",
item_names.ARCHON_OBLITERATE: "Archon attacks get increased area of effect, and deal their biological bonus damage to all targets.",
item_names.DARK_ARCHON_FEEDBACK: _ability_desc("Dark Archons", "Feedback", "drains all energy from a target and deals 1 damage per point of energy drained"),
Expand All @@ -983,9 +983,9 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
item_names.ASCENDANT_BLOOD_AMULET: _get_start_and_max_energy_desc("Ascendants"),
item_names.SENTRY_ENERGIZER_HAVOC_CLOAKING_MODULE: "Sentries, Energizers, and Havocs become permanently cloaked.",
item_names.SENTRY_ENERGIZER_HAVOC_SHIELD_BATTERY_RAPID_RECHARGING: "Sentries, Energizers, and Havocs gain +100% energy regeneration rate.",
item_names.SENTRY_FORCE_FIELD: _ability_desc("Sentries", "Force Field"),
item_names.SENTRY_FORCE_FIELD: _ability_desc("Sentries", "Force Field", "creates a force field that blocks units from walking through"),
item_names.SENTRY_HALLUCINATION: _ability_desc("Sentries", "Hallucination", "creates hallucinated versions of Protoss units"),
item_names.ENERGIZER_RECLAMATION: _ability_desc("Energizers", "Reclamation"),
item_names.ENERGIZER_RECLAMATION: _ability_desc("Energizers", "Reclamation", "temporarily takes control of an enemy mechanical unit. When the ability expires, the enemy unit self-destructs"),
item_names.ENERGIZER_FORGED_CHASSIS: "Increases Energizer Life by +20.",
item_names.HAVOC_DETECT_WEAKNESS: "Havocs' Target Lock gives an additional +15% damage bonus.",
item_names.HAVOC_BLOODSHARD_RESONANCE: "Havoc gain increased range for Squad Sight, Target Lock, and Force Field.",
Expand Down Expand Up @@ -1032,7 +1032,7 @@ def _ability_desc(unit_name_plural: str, ability_name: str, ability_description:
# Warp Ray
item_names.DAWNBRINGER_SOLARITE_LENS: "Dawnbringer War Council upgrade. Dawnbringers gain +2 range.",
item_names.CARRIER_REPAIR_DRONES: "Carrier War Council upgrade. Carriers gain 2 repair drones which heal nearby mechanical units.",
item_names.SKYLORD_HYPERJUMP: "Skylord War Council upgrade. " + _ability_desc("Skylords", "Hyperjump", "teleports the skylord to any location on the map."),
item_names.SKYLORD_HYPERJUMP: "Skylord War Council upgrade. " + _ability_desc("Skylords", "Hyperjump", "teleports the skylord to any location on the map"),
item_names.TRIREME_SOLAR_BEAM: "Trireme War Council upgrade. Triremes gain an anti-air laser attack that deals more damage over time.",
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
Expand Down
2 changes: 1 addition & 1 deletion worlds/sc2/item/item_names.py
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@
TORRASQUE_MERC = "Torrasque"
HUNTERLING = "Hunterling"
YGGDRASIL = "Yggdrasil"
MERC_ROACH = "Thornshells"
THORNSHELL = "Thornshells"


# Kerrigan Upgrades
Expand Down
2 changes: 1 addition & 1 deletion worlds/sc2/item/item_tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -1632,7 +1632,7 @@ def get_full_item_list():
item_names.TORRASQUE_MERC: ItemData(605 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mercenary, 5, SC2Race.ZERG),
item_names.HUNTERLING: ItemData(606 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mercenary, 6, SC2Race.ZERG, classification=ItemClassification.progression),
item_names.YGGDRASIL: ItemData(607 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mercenary, 7, SC2Race.ZERG, classification=ItemClassification.progression),
item_names.MERC_ROACH: ItemData(608 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mercenary, 8, SC2Race.ZERG),
item_names.THORNSHELL: ItemData(608 + SC2HOTS_ITEM_ID_OFFSET, ZergItemType.Mercenary, 8, SC2Race.ZERG),


# Misc Upgrades
Expand Down
Loading