diff options
| author | reaverb <reaverb.Crawl@gmail.com> | 2014-06-15 16:39:31 -0400 |
|---|---|---|
| committer | reaverb <reaverb.Crawl@gmail.com> | 2014-06-15 17:22:49 -0400 |
| commit | e1f089e4d803acad323b702ff29d2f754c6d3641 (patch) | |
| tree | bf5a644952ce47aa951c7b780959e0acb8f461d0 /crawl-ref/source/attack.cc | |
| parent | 073eae0ed26fb313dbd3aa0e2cf0a5fa207a1c12 (diff) | |
| download | crawl-ref-e1f089e4d803acad323b702ff29d2f754c6d3641.tar.gz crawl-ref-e1f089e4d803acad323b702ff29d2f754c6d3641.zip | |
Rename "vampiricism" to "vampirism" (ChrisOelmueller, #8435)
Chris Oelmueller made an excellent patch for this, but unfortunately it
was rather rotted by the time somebody decided to look at it. It was
easier to recreate than update. I've also added some tiles stuff which
was missed in the original patch.
Diffstat (limited to 'crawl-ref/source/attack.cc')
| -rw-r--r-- | crawl-ref/source/attack.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/attack.cc b/crawl-ref/source/attack.cc index a0d88c2856..33f2d09f48 100644 --- a/crawl-ref/source/attack.cc +++ b/crawl-ref/source/attack.cc @@ -903,7 +903,7 @@ brand_type attack::random_chaos_brand() 10, SPWPN_VENOM, 10, SPWPN_CHAOS, 5, SPWPN_DRAINING, - 5, SPWPN_VAMPIRICISM, + 5, SPWPN_VAMPIRISM, 5, SPWPN_HOLY_WRATH, 5, SPWPN_ANTIMAGIC, 2, SPWPN_CONFUSE, @@ -928,7 +928,7 @@ brand_type attack::random_chaos_brand() if (defender->holiness() == MH_UNDEAD) susceptible = false; break; - case SPWPN_VAMPIRICISM: + case SPWPN_VAMPIRISM: if (defender->is_summoned()) { susceptible = false; @@ -979,7 +979,7 @@ brand_type attack::random_chaos_brand() case SPWPN_VENOM: brand_name += "venom"; break; case SPWPN_DRAINING: brand_name += "draining"; break; case SPWPN_DISTORTION: brand_name += "distortion"; break; - case SPWPN_VAMPIRICISM: brand_name += "vampiricism"; break; + case SPWPN_VAMPIRISM: brand_name += "vampirism"; break; case SPWPN_VORPAL: brand_name += "vorpal"; break; case SPWPN_ANTIMAGIC: brand_name += "antimagic"; break; @@ -1640,7 +1640,7 @@ bool attack::apply_damage_brand(const char *what) brand = damage_brand == SPWPN_CHAOS ? random_chaos_brand() : damage_brand; if (brand != SPWPN_FLAMING && brand != SPWPN_FREEZING - && brand != SPWPN_ELECTROCUTION && brand != SPWPN_VAMPIRICISM + && brand != SPWPN_ELECTROCUTION && brand != SPWPN_VAMPIRISM && !defender->alive()) { // Most brands have no extra effects on just killed enemies, and the @@ -1651,7 +1651,7 @@ bool attack::apply_damage_brand(const char *what) if (!damage_done && (brand == SPWPN_FLAMING || brand == SPWPN_FREEZING || brand == SPWPN_HOLY_WRATH || brand == SPWPN_DRAGON_SLAYING - || brand == SPWPN_VORPAL || brand == SPWPN_VAMPIRICISM + || brand == SPWPN_VORPAL || brand == SPWPN_VAMPIRISM || brand == SPWPN_ANTIMAGIC)) { // These brands require some regular damage to function. @@ -1756,7 +1756,7 @@ bool attack::apply_damage_brand(const char *what) // Note: Leaving special_damage_message empty because there isn't one. break; - case SPWPN_VAMPIRICISM: + case SPWPN_VAMPIRISM: { if (x_chance_in_y(defender->res_negative_energy(), 3)) break; |