Implemented 1633681, Excruciating Wounds spell. Better wording welcome.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@854 c06c8d41-db1a-0410-9941-cceddc491573

7 files changed, 34 insertions, 3 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 24de663cae..92a71f22a1 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1565,10 +1565,13 @@ static void decrement_durations()
             strcat(info, " stops crackling.");
             break;
         case SPWPN_DISTORTION:
-            strcat( info, " seems straighter." );
+            strcat(info, " seems straighter.");
             // [dshaligram] Makes the brand unusable
             // miscast_effect( SPTYP_TRANSLOCATION, 9, 90, 100, "a distortion effect" );
             break;
+        case SPWPN_PAIN:
+            strcat(info, " seems less painful.");
+            break;
         default:
             strcat(info, " seems inexplicably less special.");
             break;
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 8c3c21fe8c..eaabafcb77 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -4285,6 +4285,13 @@ void describe_spell(int spelled)
             "creates a shower of colourful butterflies. How pretty!";
         break;
 
+    case SPELL_EXCRUCIATING_WOUNDS:
+        description +=
+            "temporarily infuses the weapon held by the caster with "
+            "the essence of pain itself. It will not affect weapons which "
+            "are otherwise subject to special enchantments.";
+        break;
+
     case SPELL_WARP_BRAND:
         description += "temporarily binds a localized warp field to the "
             "invoker's weapon. This spell is very dangerous to cast, "
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 76f0763b15..fc89fe9381 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -3399,7 +3399,8 @@ enum spell_type
     SPELL_STONESKIN,                   // 200
     SPELL_SIMULACRUM,
     SPELL_CONJURE_BALL_LIGHTNING,
-    SPELL_CHAIN_LIGHTNING,            // 203 (be wary of 209/210, see below)
+    SPELL_CHAIN_LIGHTNING,
+    SPELL_EXCRUCIATING_WOUNDS,        // 204 (be wary of 209/210, see below)
     NUM_SPELLS,
     SPELL_NO_SPELL = 210              //  210 - added 22jan2000 {dlb}
 };
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 00addb438f..40b8ea0445 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -621,6 +621,14 @@ bool brand_weapon(int which_brand, int power)
         //                9, 90, 100, "a distortion effect");
         break;
 
+    case SPWPN_PAIN:
+        // well, in theory, we could be silenced, but then how are
+        // we casting the brand spell?
+        strcat(info, " shrieks in agony.");
+        noisy( 15, you.x_pos, you.y_pos );
+        duration_affected = 8;
+        break;
+
     case SPWPN_DUMMY_CRUSHING:  //jmf: added for Maxwell's Silver Hammer
         if (wpn_type != DVORP_CRUSHING)
             return false;
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 98d08ee2fe..ea39448bc3 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -441,10 +441,10 @@ static int spellbook_template_array[NUMBER_SPELLBOOKS][SPELLBOOK_SIZE] =
      SPELL_ANIMATE_DEAD,
      SPELL_TWISTED_RESURRECTION,
      SPELL_BORGNJORS_REVIVIFICATION,
+     SPELL_EXCRUCIATING_WOUNDS,
      SPELL_SIMULACRUM,
      SPELL_NO_SPELL,
      SPELL_NO_SPELL,
-     SPELL_NO_SPELL,
      },
 
     // 35 - Tome of Destruction
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 887cba6fd1..b3e262f237 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1779,6 +1779,11 @@ int your_spells( int spc2, int powc, bool allow_fail )
         cast_summon_butterflies(powc);
         break;
 
+    case SPELL_EXCRUCIATING_WOUNDS:
+        if (!brand_weapon(SPWPN_PAIN, powc))
+            canned_msg(MSG_SPELL_FIZZLES);
+        break;
+
     case SPELL_WARP_BRAND:
         if (!brand_weapon(SPWPN_DISTORTION, powc))
             canned_msg(MSG_SPELL_FIZZLES);
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
index ef275fccfe..84dd322bd1 100644
--- a/crawl-ref/source/spl-data.h
+++ b/crawl-ref/source/spl-data.h
@@ -1280,6 +1280,13 @@
 },
 
 {
+    SPELL_EXCRUCIATING_WOUNDS, "Excruciating Wounds",
+     SPTYP_ENCHANTMENT | SPTYP_NECROMANCY,
+     SPFLAG_NONE,
+     5     // fairly high level - potentially one of the best brands
+},
+
+{
     SPELL_WARP_BRAND, "Warp Weapon",
      SPTYP_ENCHANTMENT | SPTYP_TRANSLOCATION,
      SPFLAG_NONE,