Split potions of blood and potions of coagulated blood into two

distinct potion types to make stacking easier. Coagulated blood
is not created randomly, and aging potions of blood turn into
potions of coagulated blood, so none of that changed. Well, 
except the name: congealed -> coagulated. This also means that
they now have distinct descriptions, though seeing potions in
your inventory coagulate will identify both of them.

And I checked: potions in shops will coagulate as well and 
disappear. Coagulated blood is cheaper, but if you need it you 
won't want to wait around, right?


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

1 files changed, 5 insertions, 19 deletions

diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index f17b412a85..3614af1c52 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -518,6 +518,7 @@ static const char* potion_type_name(int potiontype)
     case POT_CURE_MUTATION:     return "cure mutation";
     case POT_MUTATION:          return "mutation";
     case POT_BLOOD:             return "blood";
+    case POT_BLOOD_COAGULATED:  return "coagulated blood";
     case POT_RESISTANCE:        return "resistance";
     default:                    return "bugginess";
     }
@@ -1285,17 +1286,7 @@ std::string item_def::name_aux( description_level_type desc,
         }
         if (know_type)
         {
-            buff << "potion of ";
-            
-            // rotting corpses don't get special dbnames, so neither do !blood
-            if (this->sub_type == POT_BLOOD
-                && this->special < 200
-                && !dbname)
-            {
-                buff << "congealed ";
-            }
-
-            buff << potion_type_name(item_typ);
+            buff << "potion of " << potion_type_name(item_typ);
         }
         else
         {
@@ -1320,15 +1311,10 @@ std::string item_def::name_aux( description_level_type desc,
                 (pqual < 0 || pqual >= PDQ_NQUALS)? "bug-filled "
                                     : potion_qualifiers[pqual];
 
-            const char *clr =
-                (pcolour < 0 || pcolour >= PDC_NCOLOURS)? "bogus"
-                                    : potion_colours[pcolour];
+            const char *clr =  (pcolour < 0 || pcolour >= PDC_NCOLOURS)?
+                                   "bogus" : potion_colours[pcolour];
 
-            if (this->sub_type == POT_BLOOD && this->special < 200)
-                buff << "congealed ";
-            else
-                buff << qualifier;
-            buff << clr << " potion";
+            buff << qualifier << clr << " potion";
         }
         break;