Put skeletal dragons back in the dragon genus, and treat all

dragon-types consistently when dealing with weapons of dragon slaying 
(dragons, draconians, dragon-transformed players, zombified dragons, and 
zombified draconians).  New function is_dragonkind() handles this.


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

1 files changed, 23 insertions, 0 deletions

diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index a5f5cc577b..ffc862cd29 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -2861,3 +2861,26 @@ bool stop_attack_prompt(const monsters *mon, bool beam_attack,
 
     return (retval);
 }
+
+bool is_dragonkind(const actor *act, const monsters *mon)
+{
+    if (mons_genus(act->mons_species()) == MONS_DRAGON
+        || mons_genus(act->mons_species()) == MONS_DRACONIAN)
+    {
+        return (true);
+    }
+    else if (act->atype() == ACT_PLAYER
+        && you.attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON)
+    {
+        return (true);
+    }
+    else if (act->atype() == ACT_MONSTER
+        && mons_is_zombified(mon)
+        && (mons_genus(mon->base_monster) == MONS_DRAGON
+            || mons_genus(mon->base_monster) == MONS_DRACONIAN))
+    {
+        return (true);
+    }
+
+    return (false);
+}