Vampires, yay! Credit mostly goes to Jarmo, though

there are a few traces of things I've changed 
(that I've included and then commented out).

There's still lots of stuff to be added, but they 
should be playable right now. I notice that their 
vampiric bite attack needs to be made more
probable. Feel free to comment on anything that 
looks weird, is plain wrong, or goes against the 
spirit of Crawl/Stonesoup. 
Positive feedback will be appreciated as well. :)


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

1 files changed, 31 insertions, 2 deletions

diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index d27962dc0e..1480f03cfc 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -1318,8 +1318,15 @@ std::string status_mut_abilities()
     if (you.duration[DUR_PRAYER])
         text += "praying, ";
 
-    if (you.duration[DUR_REGENERATION])
+    if (you.duration[DUR_REGENERATION]
+        && (you.species != SP_VAMPIRE || you.hunger_state >= HS_HUNGRY)
+        || you.species == SP_VAMPIRE && you.hunger_state == HS_FULL)
+    {
+        if (you.disease)
+            text += "recuperating, ";
+        else
         text += "regenerating, ";
+    }
 
 // not used as resistance part already says so
 //    if (you.duration[DUR_INSULATION])
@@ -1456,12 +1463,21 @@ std::string status_mut_abilities()
 
     text += info;
 
+    if (you.disease 
+        || you.species == SP_VAMPIRE && you.hunger_state < HS_HUNGRY)
+    {
+        text += "non-regenerating";
+    }
+
     switch (you.attribute[ATTR_TRANSFORMATION])
     {
       case TRAN_SPIDER:
           text += "\nYou are in spider-form.";
           break;
-      case TRAN_BLADE_HANDS:
+     case TRAN_BAT:
+          text += "\nYou are in bat-form.";
+          break;
+     case TRAN_BLADE_HANDS:
           text += "\nYou have blades for hands.";
           break;
       case TRAN_STATUE:
@@ -1660,6 +1676,10 @@ std::string status_mut_abilities()
           have_any = true;
           break;
 
+      case SP_VAMPIRE:
+          text += "sharp teeth 3";
+          have_any = true;
+          break;
       default:
           break;
     }                           //end switch - innate abilities
@@ -2046,6 +2066,15 @@ std::string status_mut_abilities()
                 text += "hooves";
                 have_any = true;
                 break;
+            case MUT_FANGS:
+                if (you.species == SP_VAMPIRE)
+                   break;
+                if (have_any)
+                    text += ", ";
+                snprintf(info, INFO_SIZE, "sharp teeth %d", level);
+                text += info;
+                have_any = true;
+                break;
             case MUT_BREATHE_POISON:
                 if (have_any)
                     text += ", ";