Allow temporary branding to go over a permanent brand.

Toting around an unbranded weapon just to be able to swap to it
is no fun, and not even that much more of a difficulty; maybe it
just means getting pain out takes 0.7 more turns or so. You still
can't overwrite artefacts, of course.

1 files changed, 6 insertions, 0 deletions

diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 006ea86833..d6d0b5040c 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -990,6 +990,12 @@ static string _describe_weapon(const item_def &item, bool verbose)
         }
     }
 
+    if (you.duration[DUR_WEAPON_BRAND])
+    {
+        description += "\nIt is temporarily rebranded; it is actually a weapon of "
+                       + ego_type_string(item, false, you.props["orig brand"]) + ".";
+    }
+
     if (is_artefact(item))
     {
         string rand_desc = _randart_descrip(item);