Cleanup

src/Dodge/Data/Item/Use.hs

@@ -49,28 +49,20 @@ data ItemUse
         , _equipEffect :: EquipEffect
         , _leftConsumption :: LeftConsumption
         }
-    | ConsumeUse
-        { _cUse :: Cuse
-        --        , _useAmount :: ItAmount
-        }
+    | UseConsume { _cUse :: Cuse }
     | EquipUse
         { _equipEffect :: EquipEffect
         , _equipTargeting :: Maybe TargetingType
         }
     | CraftUse
-    | --        {_useAmount :: ItAmount}
-      AttachUse
+    | AttachUse
         {_atLinkedProjectile :: Maybe Int}
-    | --        {_attachParams :: AttachParams}
-      UseAmmoMag
+    | UseAmmoMag
         { _amagLoadStatus :: ReloadStatus
         , _amagParams :: AmmoParams
         , _amagType :: AmmoType
         }
-    | ScopeUse
-        { -- | a camera offset
-          _scopeScope :: Scope
-        }
+    | ScopeUse { _scopeScope :: Scope }
     | TargetingUse
         { _tgPos :: Maybe Point2
         , _tgID :: Maybe Int
@@ -79,12 +71,10 @@ data ItemUse
     | BulletModUse
         { _buMod :: BulletMod
         }
-    deriving (Eq, Show, Read) --Generic, Flat)
+    deriving (Eq, Show, Read)
 
-data TriggerType
-    = AutoTrigger
-    | HammerTrigger
-    deriving (Eq, Show, Read) --Generic, Flat)
+data TriggerType = AutoTrigger | HammerTrigger
+    deriving (Eq, Show, Read)
 
 data HeldParams
     = DefaultHeldParams
@@ -121,18 +111,10 @@ data HeldParams
 
 data AmmoParams
     = BulletParams {_ampBullet :: Bullet}
-    | ProjectileParams
-        { _ampPayload :: Payload
---        , _ampPjDraw :: ProjectileDraw
-        }
+    | ProjectileParams { _ampPayload :: Payload }
     | GasParams {_ampCreateGas :: GasFuel}
     deriving (Eq, Show, Read) --Generic, Flat)
 
---data ScrollAttachParams
---    = CharScrollParams
---        { _scrollChar :: Seq.Seq Char}
---    deriving (Eq, Show, Read) --Generic, Flat)
-
 data AimParams = AimParams
     { _aimWeight :: Int
     , _aimTurnSpeed :: Float
@@ -194,9 +176,7 @@ data AimStance
     | TwoHandOver
     | TwoHandFlat
     | OneHand
-    --    | LeaveHolstered
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
-    --deriving (Eq, Show, Ord, Enum, Read) --Generic, Flat)
 
 data ItZoom = ItZoom
     { _izMax :: Float