Adding Vampire aptitudes to tables.txt (Bug 1816344).

Also changed Ranged Combat to Throwing, while I was at it.

Fixing 1817775: portaled projectile treats returning weapons like
any other projectile (no duplicates any more, but also no returning).
I think this makes sense, seeing how the spell teleports it somewhere
so how should it know the path back.

Fixing 1817995: starting items not stacking correctly.
Question: Why is the flag BEEN_IN_INV even set for starting inventory?

Applying two patches by dolorous:
1818736: comment fix for MUT_SAPROVOROUS
1818667: remove redundant MUT_HOOVES check


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

6 files changed, 10 insertions, 16 deletions

diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 69f8862bde..7e482656e4 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -1999,7 +1999,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
     // CALCULATIONS FOR THROWN WEAPONS
     if (projected == LRET_THROWN)
     {
-        returning = (get_weapon_brand(item) == SPWPN_RETURNING &&
+        returning = (get_weapon_brand(item) == SPWPN_RETURNING && !teleport &&
                      !one_chance_in(1 + skill_bump(SK_THROWING)));
         baseHit = 0;
 
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index dfd8fde379..178f26c778 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -1135,14 +1135,6 @@ bool check_armour_shape( const item_def &item, bool quiet )
 
                     return (false);
                 }
-
-                if (you.mutation[MUT_HOOVES])
-                {
-                    if (!quiet)
-                        mpr( "You can't wear boots with hooves!" );
-
-                    return (false);
-                }
                 break;
             }
             break;
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index ddcb527f8e..d4807bbd0f 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -1332,10 +1332,11 @@ bool items_stack( const item_def &item1, const item_def &item2,
         return false;
 
     // Check the non-ID flags, but ignore dropped, thrown, cosmetic,
-    // and note flags
+    // and note flags. Also, whether item was in inventory before.
 #define NON_IDENT_FLAGS ~(ISFLAG_IDENT_MASK | ISFLAG_COSMETIC_MASK | \
                           ISFLAG_DROPPED | ISFLAG_THROWN | \
-                          ISFLAG_NOTED_ID | ISFLAG_NOTED_GET)
+                          ISFLAG_NOTED_ID | ISFLAG_NOTED_GET | \
+                          ISFLAG_BEEN_IN_INV)
     if ((item1.flags & NON_IDENT_FLAGS) !=
         (item2.flags & NON_IDENT_FLAGS))
     {
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index f35591372e..82cd64ec9d 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -538,6 +538,7 @@ const char *gain_mutation[][3] = {
 
     // saprovorous: can never be gained or lost, only started with    
     {"", "", ""},
+    
     {"", "", ""},
     {"", "", ""},
 
@@ -747,10 +748,7 @@ const char *lose_mutation[][3] = {
     
     {"", "", ""},
     {"", "", ""},
-
-    // saprovorous: can never be gained or lost, only started with
     {"", "", ""},
-
     {"", "", ""},
 
     // 65
@@ -758,7 +756,10 @@ const char *lose_mutation[][3] = {
     {"Your movements feel completely certain again.",
      "Your movements feel more certain.",
      "Your movements feel more certain."},
+
+    // saprovorous: can never be gained or lost, only started with
     {"", "", ""},
+    
     {"", "", ""},
     {"", "", ""},
 
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index eaeaa5c576..4de80c5991 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -882,6 +882,7 @@ game_start:
     {
         if (is_valid_item(you.inv[i]))
         {
+            // Why is this here? Elsewhere it's only ever used for runes
             you.inv[i].flags |= ISFLAG_BEEN_IN_INV;
 
             // identify all items in pack
@@ -2367,7 +2368,7 @@ static void give_random_potion( int slot )
     you.inv[ slot ].plus2 = 0;
 
     int temp_rand = 8;
-    if (you.is_undead)
+    if (you.is_undead) // no Berserk for undeads
         temp_rand--;
 
     switch (random2(temp_rand))
diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc
index 54cf96f70d..913f395bbf 100644
--- a/crawl-ref/source/transfor.cc
+++ b/crawl-ref/source/transfor.cc
@@ -610,7 +610,6 @@ bool can_equip( equipment_type use_which, bool ignore_temporary )
             switch (you.species)
             {
             case SP_NAGA:
-            case SP_CENTAUR:
             case SP_KENKU:
                 return (false);
             default: