Start unifying heldUse and heldMods

src/Dodge/Creature/Impulse/UseItem.hs

@@ -10,7 +10,7 @@ import Dodge.Data.ComposedItem
 import Dodge.Data.DoubleTree
 import Control.Lens
 import Control.Monad
-import Data.Foldable
+--import Data.Foldable
 import Data.Maybe
 import Dodge.Cuse
 import Dodge.Data.World
@@ -36,8 +36,11 @@ useItemRightClick cr' w = fromMaybe (f w) $ do
 
 itemEffect :: Creature -> LabelDoubleTree ComposeLinkType Item -> World -> World
 itemEffect cr it w = case it ^. ldtValue . itUse of
-    HeldUse{_heldUse = eff, _heldMods = usemods} ->
-        foldl' (&) (useHeld eff) (useMod usemods) it cr w
+--    HeldUse{_heldUse = eff, _heldMods = usemods} ->
+--        foldl' (&) (useHeld eff) (useMod usemods) it cr w
+--            & pointerToItem itm . itUse . heldHammer .~ HammerDown
+    HeldUse{ _heldMods = usemods} -> 
+        heldEffect usemods it cr w
             & pointerToItem itm . itUse . heldHammer .~ HammerDown
     LeftUse{} -> doequipmentchange
     EquipUse{} -> doequipmentchange