diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-08-03 13:59:36 -0400 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-08-03 14:17:14 -0400 |
| commit | 2e52a0c19d866a6a15b36163fa145a94bbf9721f (patch) | |
| tree | 1ad40aea10861227400db415ab1c2adaef44252b /crawl-ref/source/attack.cc | |
| parent | 2091673ee858097442a1668a947626a489639ece (diff) | |
| download | crawl-ref-2e52a0c19d866a6a15b36163fa145a94bbf9721f.tar.gz crawl-ref-2e52a0c19d866a6a15b36163fa145a94bbf9721f.zip | |
Hide a hack better.
Ideally, we wouldn't be using special for unrands totally different from
how items of the same type do, but that's less trivial than this commit.
A centralised place to check for being an unrand should at least make such
a change easier.
Diffstat (limited to 'crawl-ref/source/attack.cc')
| -rw-r--r-- | crawl-ref/source/attack.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/crawl-ref/source/attack.cc b/crawl-ref/source/attack.cc index 30f7993fbd..715462fb3f 100644 --- a/crawl-ref/source/attack.cc +++ b/crawl-ref/source/attack.cc @@ -280,11 +280,8 @@ int attack::calc_to_hit(bool random) if (attacker->confused()) mhit -= 5; - if (using_weapon() && is_unrandom_artefact(*weapon) - && weapon->special == UNRAND_WOE) - { + if (using_weapon() && is_unrandom_artefact(*weapon, UNRAND_WOE)) return AUTOMATIC_HIT; - } // If no defender, we're calculating to-hit for debug-display // purposes, so don't drop down to defender code below @@ -1756,7 +1753,7 @@ bool attack::apply_damage_brand(const char *what) || attacker->is_player() && you.duration[DUR_DEATHS_DOOR] || !attacker->is_player() && attacker->as_monster()->has_ench(ENCH_DEATHS_DOOR) - || (x_chance_in_y(2, 5) && !(weapon->special == UNRAND_LEECH))) + || (x_chance_in_y(2, 5) && !is_unrandom_artefact(*weapon, UNRAND_LEECH)) { break; } @@ -1782,8 +1779,8 @@ bool attack::apply_damage_brand(const char *what) } } - int hp_boost = weapon->special == UNRAND_VAMPIRES_TOOTH - ? damage_done : 1 + random2(damage_done); + int hp_boost = is_unrandom_artefact(*weapon, UNRAND_VAMPIRES_TOOTH) + ? damage_done : 1 + random2(damage_done); dprf(DIAG_COMBAT, "Vampiric Healing: damage %d, healed %d", damage_done, hp_boost); @@ -1853,8 +1850,7 @@ bool attack::apply_damage_brand(const char *what) break; default: - if (using_weapon() && is_unrandom_artefact(*weapon) - && weapon->special == UNRAND_HELLFIRE) + if (using_weapon() && is_unrandom_artefact(*weapon, UNRAND_HELLFIRE)) { calc_elemental_brand_damage(BEAM_HELLFIRE, defender->is_monster() |