Modify quiver to only quiver ammunition explicitly chosen by the player

(via (,) or i, or by the new quivering command). Ammo that just happens
to come next in the fire order is not quivered anymore even if you continue
firing.
Add a new quiver command on Q, and while I was at it, restrict the items
offered when firing (fi) or quivering to actual throwables. (This was a
long outstanding FR.) I think that's it...


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

1 files changed, 10 insertions, 3 deletions

diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 42cd0de8da..90f5b2c6f4 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -1344,19 +1344,26 @@ static std::string _describe_jewellery( const item_def &item, bool verbose)
                 break;
 
             case RING_SLAYING:
-                if (item.plus != 0 || is_random_artefact( item ))
+                if (item.plus != 0)
                 {
                     description += "$It affects your accuracy (";
                     _append_value( description, item.plus, true );
                     description += ").";
                 }
 
-                if (item.plus2 != 0 || is_random_artefact( item ))
+                if (item.plus2 != 0)
                 {
                     description += "$It affects your damage-dealing abilities (";
                     _append_value( description, item.plus2, true );
                     description += ").";
                 }
+
+                if (item.plus == 0 && item.plus2 == 0)
+                {
+                    description += "This buggy ring affects neither your "
+                                   "accuracy nor your damage-dealing "
+                                   "abilities.";
+                }
                 break;
 
             default:
@@ -1365,7 +1372,7 @@ static std::string _describe_jewellery( const item_def &item, bool verbose)
         }
     }
 
-    // randart properties
+    // Randart properties.
     if (is_random_artefact( item ))
     {
         description += "$";