Assorted changes, cleanup menu selection text

src/Dodge/Creature/State.hs

@@ -129,27 +129,29 @@ movementSideEff cr w
     (randAng,_) = randomR (0,2*pi) $ _randGen w
 
 heldItemUpdate :: Int -> Item -> Item
-heldItemUpdate invid = (itIsHeld .~ True) . invItemUpdate invid
+heldItemUpdate invid = (itUse %~ useUpdate) . (itIsHeld .~ True) . (itInvPos ?~ invid)
 
 invItemUpdate :: Int -> Item -> Item
-invItemUpdate invid = (itUse %~ useupdate) . (itIsHeld .~ False) . (itInvPos ?~ invid)
-  where
-    useupdate = (useHammer . hammerPosition %~ moveHammerUp)
+invItemUpdate invid = (itUse %~ useUpdate) . (itIsHeld .~ False) . (itInvPos ?~ invid)
+
+useUpdate :: ItemUse -> ItemUse
+useUpdate = (useHammer . hammerPosition %~ moveHammerUp)
         . (useDelay . warmTime %~ decreaseToZero)
         . (useDelay . rateTime %~ decreaseToZero)
 
+useEquipment :: Creature -> Int -> World -> World
+useEquipment cr i = _eqUse (_itUse $ _crInv cr IM.! i) cr i
+
 invSideEff :: Creature -> World -> World
 invSideEff cr w = weaponReloadSounds cr 
-    . flip (IS.foldr useeq) (_crInvEquipped cr)
---    . doHeldItemTargeting cr
+    . flip (IS.foldr $ useEquipment cr) (_crInvEquipped cr)
     $ IM.foldrWithKey f w (_crInv cr)
   where 
-    useeq i = _eqUse (_itUse $ _crInv cr IM.! i) cr i
-    f i it w' = case it ^? itEffect . itInvEffect of
-        Nothing -> w' & doitemupdate
-        Just g  -> g (_itEffect it) cr i w' & doitemupdate
+    f i it w' = doitemupdate w' & case it ^? itEffect . itInvEffect of
+        Nothing -> id
+        Just g  -> g (heldItemUpdate i it) cr -- this is done twice!
       where
-        doitemupdate 
+        doitemupdate
             | i == _crInvSel cr = doItemTargeting i cr . (itpointer %~ heldItemUpdate i) 
             | otherwise         = doItemTargeting i cr . (itpointer %~ invItemUpdate i)  
         itpointer = creatures . ix (_crID cr) . crInv . ix i