From 177780801828438204b415f40d8fa0c69b53e20e Mon Sep 17 00:00:00 2001
From: blackcustard <peterwicksstringfield@gmail.com>
Date: Wed, 15 May 2013 13:05:05 -0500
Subject: [PATCH] Make troves not accept equipped items.

Previously the trove would unequip and accept the item automatically. This
creates a dilemma for some items, like distortion branded weapons. If the
unwield effect is suppressed then the trove can be exploited. If the effect
is triggered, then when to trigger it? If the player is Abyssed, a special
case is needed so the player can visit both the Abyss and the trove in
sequence.

This may also prevent some mistakes.
---
 crawl-ref/source/dat/dlua/lm_trove.lua | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crawl-ref/source/dat/dlua/lm_trove.lua b/crawl-ref/source/dat/dlua/lm_trove.lua
index 02aca47..a12dd98 100644
--- a/crawl-ref/source/dat/dlua/lm_trove.lua
+++ b/crawl-ref/source/dat/dlua/lm_trove.lua
@@ -345,6 +345,11 @@ function TroveMarker:check_item(marker, pname, position, dry_run)
     else
     if dry_run ~= nil then crawl.mpr("Checking item: " .. it.name()) end
 
+    if it.equipped then
+        if dry_run ~= nil then crawl.mpr("Item equipped.") end
+        this_item = false
+    end
+
     if not it.identified("type properties pluses") then
       if dry_run ~= nil then crawl.mpr("Item not identified.") end
       this_item = false
@@ -525,7 +530,7 @@ function TroveMarker:check_veto(marker, pname)
       return
     else
       crawl.mpr("You don't have the item" .. self:plural() ..
-                " to give! Perhaps you haven't completely identified the item yet?")
+                " to give! Perhaps it is equipped or unidentified?")
       return "veto"
     end
   end
-- 
1.7.11.msysgit.1