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/melee_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/melee_attack.cc')
| -rw-r--r-- | crawl-ref/source/melee_attack.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc index b3dfa46741..03bf8d27f0 100644 --- a/crawl-ref/source/melee_attack.cc +++ b/crawl-ref/source/melee_attack.cc @@ -1103,7 +1103,7 @@ void melee_attack::player_aux_setup(unarmed_attack_type atk) || you.hunger_state < HS_SATIATED && coinflip() || you.hunger_state >= HS_SATIATED && one_chance_in(4))) { - damage_brand = SPWPN_VAMPIRICISM; + damage_brand = SPWPN_VAMPIRISM; } if (player_mutation_level(MUT_ANTIMAGIC_BITE)) @@ -1250,7 +1250,7 @@ bool melee_attack::player_aux_unarmed() continue; to_hit = random2(calc_your_to_hit_unarmed(atk, - damage_brand == SPWPN_VAMPIRICISM)); + damage_brand == SPWPN_VAMPIRISM)); handle_noise(defender->pos()); alert_nearby_monsters(); @@ -1363,7 +1363,7 @@ bool melee_attack::player_aux_apply(unarmed_attack_type atk) // Normal vampiric biting attack, not if already got stabbing special. - if (damage_brand == SPWPN_VAMPIRICISM && you.species == SP_VAMPIRE + if (damage_brand == SPWPN_VAMPIRISM && you.species == SP_VAMPIRE && (!stab_attempt || stab_bonus <= 0)) { _player_vampire_draws_blood(defender->as_monster(), damage_done); @@ -1878,7 +1878,7 @@ bool melee_attack::player_monattk_hit_effects() // No further effects. } else if (you.species == SP_VAMPIRE - && damage_brand == SPWPN_VAMPIRICISM + && damage_brand == SPWPN_VAMPIRISM && you.weapon() && _player_vampire_draws_blood(defender->as_monster(), damage_done, false, 5)) |