Cleanup

2022-07-27 12:49:23 +01:00
parent 6554d219dc
commit 8d17ce66e9
106 changed files with 2911 additions and 2678 deletions
@@ -1,51 +1,52 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
-module Dodge.Data.Item 
-    ( module Dodge.Data.Item
-    , module Dodge.Data.Item.Misc
-    , module Dodge.Data.Item.Tweak
-    , module Dodge.Data.Item.Params
-    , module Dodge.Data.Item.Use
-    , module Dodge.Data.Item.Consumption
-    , module Dodge.Data.Item.CurseStatus
-    , module Dodge.Data.Item.Attachment
-    ) where
-import GHC.Generics
-import Data.Aeson
+{-# LANGUAGE TemplateHaskell #-}
+
+module Dodge.Data.Item (
+    module Dodge.Data.Item,
+    module Dodge.Data.Item.Effect,
+    module Dodge.Data.Item.Misc,
+    module Dodge.Data.Item.Tweak,
+    module Dodge.Data.Item.Params,
+    module Dodge.Data.Item.Use,
+    module Dodge.Data.Item.CurseStatus,
+    module Dodge.Data.Item.Attachment,
+    module Dodge.Data.Item.Combine,
+    module Dodge.Data.Item.Targeting,
+) where
+
+import Color
 import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
+import Dodge.Data.Item.Combine
+import Dodge.Data.Item.Effect
+import Dodge.Data.Item.Attachment
 import Dodge.Data.Item.CurseStatus
 import Dodge.Data.Item.Misc
-import Dodge.Data.Item.Tweak
-import Dodge.Data.Item.Consumption
-import Dodge.Data.Item.Use
 import Dodge.Data.Item.Params
-import Dodge.Data.ItEffect
-import Dodge.Data.Targeting
-import Dodge.Combine.Data
-import Dodge.Data.Item.Attachment
-import Color
+import Dodge.Data.Item.Tweak
+import Dodge.Data.Item.Use
+import Dodge.Data.Item.Targeting
+
 data Item = Item
-    { _itConsumption    :: ItemConsumption
-    , _itUse        :: ItemUse
-    , _itType       :: ItemType
+    { _itUse :: ItemUse
+    , _itType :: ItemType
    , _itAttachment :: ItAttachment
-    , _itID         :: Maybe Int
-    , _itPos        :: ItemPos
-    , _itIsHeld     :: Bool
-    , _itEffect     :: ItEffect
-    , _itInvSize    :: Float
-    , _itInvColor   :: Color
-    , _itTargeting  :: Targeting
-    , _itDimension  :: ItemDimension
-    , _itCurseStatus    :: CurseStatus
-    , _itTweaks     :: ItemTweaks
-    , _itScope      :: Scope
-    , _itValue      :: ItemValue
-    , _itParams     :: ItemParams
+    , _itID :: Maybe Int
+    , _itPos :: ItemPos
+    , _itIsHeld :: Bool
+    , _itEffect :: ItEffect
+    , _itInvSize :: Float
+    , _itInvColor :: Color
+    , _itTargeting :: Targeting
+    , _itDimension :: ItemDimension
+    , _itCurseStatus :: CurseStatus
+    , _itTweaks :: ItemTweaks
+    , _itScope :: Scope
+    , _itValue :: ItemValue
+    , _itParams :: ItemParams
    }
-   deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON Item  where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON Item 
+    deriving (Eq, Show, Read)
+
 makeLenses ''Item
+deriveJSON defaultOptions ''Item