diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-03-07 22:26:26 -0700 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-03-07 22:27:06 -0700 |
| commit | 9d36bc65e8b8fbc40fe9225e0294e4b4eea71f54 (patch) | |
| tree | 8af26519a20d5c8c53b76453deedd09bbf9ab682 /crawl-ref/source/art-func.h | |
| parent | c3ea3b707afa11309dfc91b1f994ffc55041be02 (diff) | |
| download | crawl-ref-9d36bc65e8b8fbc40fe9225e0294e4b4eea71f54.tar.gz crawl-ref-9d36bc65e8b8fbc40fe9225e0294e4b4eea71f54.zip | |
Badtiles for the latest unrands.
If only so that they can have *something* to show.
Diffstat (limited to 'crawl-ref/source/art-func.h')
| -rw-r--r-- | crawl-ref/source/art-func.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/art-func.h b/crawl-ref/source/art-func.h index 9614709812..860223919f 100644 --- a/crawl-ref/source/art-func.h +++ b/crawl-ref/source/art-func.h @@ -915,6 +915,7 @@ static void _ELEMENTAL_STAFF_melee_effects(item_def* item, actor* attacker, actor* defender, bool mondied, int dam) { int evoc = attacker->skill(SK_EVOCATIONS, 27); + beam_type flavour = BEAM_NONE; if (mondied || !(x_chance_in_y(evoc, 729) || x_chance_in_y(evoc, 729))) return; @@ -928,16 +929,19 @@ static void _ELEMENTAL_STAFF_melee_effects(item_def* item, actor* attacker, d = resist_adjust_damage(defender, BEAM_FIRE, defender->res_fire(), d); verb = "burn"; + flavour = BEAM_FIRE; break; case 1: d = resist_adjust_damage(defender, BEAM_COLD, defender->res_cold(), d); verb = "freeze"; + flavour = BEAM_COLD; break; case 2: d = resist_adjust_damage(defender, BEAM_ELECTRICITY, defender->res_elec(), d); verb = "electrocute"; + flavour = BEAM_ELECTRICITY; break; case 3: d = defender->apply_ac(d); @@ -953,6 +957,8 @@ static void _ELEMENTAL_STAFF_melee_effects(item_def* item, actor* attacker, attacker->is_player() ? verb : pluralise(verb).c_str(), defender->name(DESC_THE).c_str()); defender->hurt(attacker, d); + if (defender->alive() && flavour != BEAM_NONE) + defender->expose_to_element(flavour, 2); } /////////////////////////////////////////////////// |