From 534a61b9e9b44d70a50a0cd4d3d39549526ec38d Mon Sep 17 00:00:00 2001
From: Chris Campbell <chriscampbell89@gmail.com>
Date: Thu, 18 Dec 2014 20:56:54 +0000
Subject: [PATCH] Don't enhance Dragon's Call while in Dragon form

It's not an interaction that's especially likely to ever be very relevant.
---
 crawl-ref/source/dat/descript/spells.txt | 2 --
 crawl-ref/source/player.cc               | 6 ++----
 crawl-ref/source/spl-cast.cc             | 3 ---
 crawl-ref/source/spl-util.cc             | 2 --
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/crawl-ref/source/dat/descript/spells.txt b/crawl-ref/source/dat/descript/spells.txt
index a69f753250b..6b7b146d04c 100644
--- a/crawl-ref/source/dat/descript/spells.txt
+++ b/crawl-ref/source/dat/descript/spells.txt
@@ -483,8 +483,6 @@ This spell issues a powerful call to a draconic realm, beckoning forth dragon
 after dragon to engage the summoner's enemies. The spell is taxing to maintain,
 and each new dragon which answers the call will further drain the summoner's
 magical reserves.
-
-If the caster is a mighty dragon, the spell echoes more powerfully still.
 %%%%
 Drain Life spell
 
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 3c59bcdd546..7eacb7d073b 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -2555,10 +2555,8 @@ int player_armour_shield_spell_penalty()
  */
 int player_wizardry(spell_type spell)
 {
-    const int item_wiz = you.wearing(EQ_RINGS, RING_WIZARDRY)
-                          + you.wearing(EQ_STAFF, STAFF_WIZARDRY);
-    const int form_wiz = you.form == TRAN_DRAGON && spell == SPELL_DRAGON_CALL;
-    return item_wiz + form_wiz;
+    return you.wearing(EQ_RINGS, RING_WIZARDRY)
+           + you.wearing(EQ_STAFF, STAFF_WIZARDRY);
 }
 
 /**
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index e0c2016f619..8f708d674a1 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -498,9 +498,6 @@ static int _spell_enhancement(spell_type spell)
     if (you.form == TRAN_SHADOW)
         enhanced -= 2;
 
-    if (you.form == TRAN_DRAGON && spell == SPELL_DRAGON_CALL)
-        enhanced++;
-
     enhanced += you.archmagi();
     enhanced += player_equip_unrand(UNRAND_MAJIN);
 
diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc
index 5102a115fbf..d9fdde8ad3c 100644
--- a/crawl-ref/source/spl-util.cc
+++ b/crawl-ref/source/spl-util.cc
@@ -1068,8 +1068,6 @@ static bool _spell_is_empowered(spell_type spell)
             return true;
         }
         break;
-    case SPELL_DRAGON_CALL:
-        return you.form == TRAN_DRAGON;
     default:
         break;
     }