diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-01-22 22:06:56 -0700 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-01-22 22:06:56 -0700 |
| commit | 934f89028ea657c131806b0c683771e182617a37 (patch) | |
| tree | 5de9cd658f231f6c1ff764e0feb48717dfd12e68 /crawl-ref/source/fight.cc | |
| parent | 317cdd5a35c0f4166581cb1254b176f4894cbb1d (diff) | |
| download | crawl-ref-934f89028ea657c131806b0c683771e182617a37.tar.gz crawl-ref-934f89028ea657c131806b0c683771e182617a37.zip | |
Trigger grand avatar on ranged attacks (tenofswords).
Also contains some merging of duplicate code.
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 72ad30ed24..1043ae9180 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -221,14 +221,10 @@ bool fight_melee(actor *attacker, actor *defender, bool *did_hit, bool simu) trigger_spectral_weapon(attacker, defender); else if (!simu && attacker->is_monster() - && attacker->as_monster()->has_ench(ENCH_GRAND_AVATAR) - && orig_hp - defender->stat_hp() - >= random2(GRAND_AVATAR_DAMAGE)) + && attacker->as_monster()->has_ench(ENCH_GRAND_AVATAR)) { - actor* avatar = attacker->as_monster()->get_ench(ENCH_GRAND_AVATAR) - .agent(); - if (avatar) - trigger_grand_avatar(avatar->as_monster(), defender, SPELL_MELEE); + trigger_grand_avatar(attacker->as_monster(), defender, SPELL_MELEE, + orig_hp); } return true; |