Cleanup

src/Dodge/Creature/Impulse/UseItem.hs

@@ -34,9 +34,9 @@ useRootItem crid w = fromMaybe w $ do
 
 itemUseEffect :: Creature -> LabelDoubleTree ComposeLinkType Item -> World -> World
 itemUseEffect cr it w = case it ^. ldtValue . itUse of
-    HeldUse{ } -> heldEffect it cr w
+    UseHeld{} -> heldEffect it cr w
             & pointerToItem itm . itUse . heldHammer .~ HammerDown
-    LeftUse{} -> doequipmentchange
+    UseHotkey{} -> doequipmentchange
     EquipUse{} -> doequipmentchange
     (ConsumeUse eff) -> useC eff (_ldtValue it) cr w
     CraftUse{} -> w
@@ -103,13 +103,11 @@ useItemLeftClick cr w = fromMaybe w $ do
     invid <- cr ^? crManipulation . manObject . imSelectedItem
     ituse <- cr ^? crInv . ix invid . itUse
     case ituse of
-        --HeldUse{} -> return $ hammerTest (cWorld . lWorld . creatures . ix (_crID cr) %~ crReloadToggle)
-        HeldUse{} -> return w
+        UseHeld{} -> return w
         ConsumeUse{} -> return $ useItemLeftClick' cr w
         EquipUse{} -> return $ useItemLeftClick' cr w
-        LeftUse{} -> return $ useItemLeftClick' cr w
+        UseHotkey{} -> return $ useItemLeftClick' cr w
         AmmoMagUse{} -> return w
-        --AmmoMagUse{} -> return $ hammerTest (cWorld . lWorld . creatures . ix (_crID cr) %~ crReloadToggle)
         _ -> Nothing
 
 useItemLeftClick' :: Creature -> World -> World