Make Elyvilon's evil weapon destruction messages properly account for

stacks of weapons, for the currently unused evil missile brands.


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

1 files changed, 9 insertions, 4 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 61bd4b4a0f..694d015740 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -3945,8 +3945,12 @@ bool ely_destroy_weapons()
             if (is_evil_weapon)
             {
                 // Print this is addition to the above!
-                simple_god_message(" welcomes the destruction of this evil "
-                                   "weapon.", GOD_ELYVILON);
+                simple_god_message(
+                    make_stringf(" welcomes the destruction of %s evil "
+                                 "weapon%s.",
+                                 item.quantity == 1 ? "this" : "these",
+                                 item.quantity == 1 ? ""     : "s").c_str(),
+                    GOD_ELYVILON);
             }
         }
 
@@ -4043,8 +4047,9 @@ bool trog_burn_spellbooks()
             const int duration = std::min(4 + count + random2(rarity/2), 23);
             place_cloud(CLOUD_FIRE, *ri, duration, KC_YOU);
 
-            mpr(count == 1 ? "The book bursts into flames."
-                           : "The books burst into flames.", MSGCH_GOD);
+            mprf(MSGCH_GOD, "The book%s burst%s into flames.",
+                 count == 1 ? ""  : "s",
+                 count == 1 ? "s" : "");
         }
     }