Cleanup

src/Dodge/Data/Item/Use.hs

@@ -1,14 +1,18 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
-module Dodge.Data.Item.Use where
+module Dodge.Data.Item.Use 
+    ( module Dodge.Data.Item.Use
+    , module Dodge.Data.Equipment
+    )
+    where
 import GHC.Generics
 import Data.Aeson
 import Dodge.Data.Item.HeldUse
 import Dodge.Data.Item.HeldScroll
 import Dodge.Data.Item.UseDelay
 import Dodge.Data.Hammer
-import Dodge.Equipment.Data
+import Dodge.Data.Equipment
 import Control.Lens
 data ItemUse
     = RightUse 
@@ -36,18 +40,6 @@ data ItemUse
 instance ToJSON ItemUse where
     toEncoding = genericToEncoding defaultOptions
 instance FromJSON ItemUse
-data Equipment = Equipment
-    { _eqUse        :: Euse --Item -> Creature -> World -> World
-    , _eqOnEquip    :: Euse --Item -> Creature -> World -> World
-    , _eqOnRemove   :: Euse --Item -> Creature -> World -> World
-    , _eqSite       :: EquipSite
-    , _eqParams     :: EquipParams
-    , _eqViewDist   :: Maybe Float
-    }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON Equipment  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON Equipment 
 data AimParams = AimParams
     { _aimWeight    :: Int
     , _aimRange     :: Float
@@ -69,14 +61,6 @@ data AimStance
 instance ToJSON AimStance where
     toEncoding = genericToEncoding defaultOptions
 instance FromJSON AimStance
-data EquipParams
-    = NoEquipParams
-    | EquipID {_eparamID :: Int}
-    | EquipCounter {_eparamInt :: Int}
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON EquipParams where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON EquipParams
 data ItZoom = ItZoom 
     { _itZoomMax    :: Float
     , _itZoomMin    :: Float
@@ -87,7 +71,5 @@ instance ToJSON ItZoom  where
     toEncoding = genericToEncoding defaultOptions
 instance FromJSON ItZoom 
 makeLenses ''ItemUse
-makeLenses ''Equipment
 makeLenses ''AimParams
-makeLenses ''EquipParams
 makeLenses ''ItZoom