diff options
author | Adam Borowski <kilobyte@angband.pl> | 2009-10-07 12:36:22 +0200 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2009-10-07 12:36:22 +0200 |
commit | 4617b8e5df18e0abf655d24688b417b7b3794344 (patch) | |
tree | ad42ed7a4aa4e39239f6c52e87c900cb0aba495e /crawl-ref/source/spells2.cc | |
parent | a4d44c02431b1c8d4be77b154b8a9bf3bb9b15e7 (diff) | |
download | crawl-ref-4617b8e5df18e0abf655d24688b417b7b3794344.tar.gz crawl-ref-4617b8e5df18e0abf655d24688b417b7b3794344.zip |
Using Tukima's Dance on a weapon your god hates is a bad thing.
Diffstat (limited to 'crawl-ref/source/spells2.cc')
-rw-r--r-- | crawl-ref/source/spells2.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 83e14e2816..a534f0f862 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1582,6 +1582,7 @@ bool summon_holy_warrior(int pow, god_type god, int spell, bool cast_tukimas_dance(int pow, god_type god, bool force_hostile) { bool success = true; + conduct_type why; const int dur = std::min(2 + (random2(pow) / 5), 6); @@ -1662,7 +1663,6 @@ bool cast_tukimas_dance(int pow, god_type god, bool force_hostile) mitm[i].flags |= ISFLAG_THROWN; mprf("%s dances into the air!", you.inv[wpn].name(DESC_CAP_YOUR).c_str()); - you.inv[wpn].quantity = 0; destroy_item(menv[monster].inv[MSLOT_WEAPON]); @@ -1670,6 +1670,13 @@ bool cast_tukimas_dance(int pow, god_type god, bool force_hostile) menv[monster].colour = mitm[i].colour; burden_change(); + if ((why = god_hates_item_handling(you.inv[wpn])) + || (why = good_god_hates_item_handling(you.inv[wpn]))) + { + simple_god_message(" booms: How dare you animate that foul thing!"); + did_god_conduct(why, 10, true, &menv[monster]); + } + return (true); } |