Cleanup UseEquip constructor

ghcidOutput

@@ -1 +1 @@
-All good (602 modules, at 10:06:36)
+All good (602 modules, at 10:15:11)

src/Dodge/Creature/Impulse/UseItem.hs

@@ -37,7 +37,7 @@ itemUseEffect cr it w = case it ^. ldtValue . itUse of
     UseHeld{} -> heldEffect it cr w
             & pointerToItem itm . itUse . heldHammer .~ HammerDown
     UseHotkey{} -> doequipmentchange
-    EquipUse{} -> doequipmentchange
+    UseEquip{} -> doequipmentchange
     (UseConsume eff) -> useC eff (_ldtValue it) cr w
     CraftUse{} -> w
     UseAttach{} -> selectUse it cr  w
@@ -105,7 +105,7 @@ useItemLeftClick cr w = fromMaybe w $ do
     case ituse of
         UseHeld{} -> return w
         UseConsume{} -> return $ useItemLeftClick' cr w
-        EquipUse{} -> return $ useItemLeftClick' cr w
+        UseEquip{} -> return $ useItemLeftClick' cr w
         UseHotkey{} -> return $ useItemLeftClick' cr w
         UseAmmoMag{} -> return w
         _ -> Nothing

src/Dodge/Creature/State.hs

@@ -26,7 +26,6 @@ import Dodge.Item.HeldOffset
 import Dodge.LightSource
 import Dodge.Prop.Gib
 import Dodge.SoundLogic
---import Dodge.WorldEvent.Flash
 import Dodge.Zoning.Creature
 import FoldableHelp
 import Geometry
@@ -72,16 +71,14 @@ stateUpdate f =
         ]
 
 checkDeath :: Creature -> World -> World
-checkDeath cr w
+checkDeath cr
     | _crHP cr > 0 =
-        w
+        cWorld . lWorld . creatures . ix (_crID cr) . crState . csDamage .~ []
-            & cWorld . lWorld . creatures . ix (_crID cr) . crState . csDamage .~ []
     | otherwise =
-        w
+        dropByState cr
-            & dropByState cr
+            . removecr
-            & removecr
+            . stopSoundFrom (CrWeaponSound (_crID cr) 0)
-            & stopSoundFrom (CrWeaponSound (_crID cr) 0)
+            . corpseOrGib cr
-            & corpseOrGib cr
   where
     removecr
         | _crID cr == 0 =

src/Dodge/Data/Item/Use.hs

@@ -50,13 +50,9 @@ data ItemUse
         , _leftConsumption :: LeftConsumption
         }
     | UseConsume { _cUse :: Cuse }
-    | EquipUse
+    | UseEquip { _uequipEffect :: EquipEffect }
-        { _equipEffect :: EquipEffect
-        , _equipTargeting :: Maybe TargetingType
-        }
     | CraftUse
-    | UseAttach
+    | UseAttach {_uaParams :: AttachParams}
-        {_uaParams :: AttachParams}
     | UseAmmoMag
         { _amagLoadStatus :: ReloadStatus
         , _amagParams :: AmmoParams

src/Dodge/Default/Item/Use.hs

@@ -21,9 +21,8 @@ defaultLeftUse = UseHotkey
     }
 
 defaultEquipUse :: ItemUse
-defaultEquipUse = EquipUse
+defaultEquipUse = UseEquip
-    { _equipEffect = defaultEquip
+    { _uequipEffect = defaultEquip
-    , _equipTargeting = Nothing
     }
 
 defaultHeldUse :: ItemUse

src/Dodge/Item/Display.hs

@@ -112,7 +112,7 @@ itemNumberDisplay :: Creature -> Item -> [String]
 itemNumberDisplay cr itm = case iu of
     UseHeld{} -> []
     UseHotkey{} -> [showAutoRechargeProgress (_leftConsumption iu)]
-    EquipUse{} -> showEquipmentNumber cr itm
+    UseEquip{} -> showEquipmentNumber cr itm
     CraftUse -> []
     UseConsume {} -> []
     UseAttach {} -> []