Cleanup

src/Dodge/Data/Item.hs

@@ -3,7 +3,7 @@
 
 module Dodge.Data.Item (
     module Dodge.Data.Item,
-    module Dodge.Data.Item.Effect,
+    --module Dodge.Data.Item.Effect,
     module Dodge.Data.Item.Misc,
     module Dodge.Data.Item.Params,
     module Dodge.Data.Item.Use,
@@ -18,7 +18,7 @@ import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.Item.Combine
-import Dodge.Data.Item.Effect
+--import Dodge.Data.Item.Effect
 import Dodge.Data.Item.Location
 import Dodge.Data.Item.Misc
 import Dodge.Data.Item.Params

src/Dodge/Data/Item/Effect.hs

@@ -1,43 +0,0 @@
-{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE StrictData #-}
-{-# LANGUAGE TemplateHaskell #-}
-
-module Dodge.Data.Item.Effect (
-    module Dodge.Data.Item.Effect,
-    module Dodge.Data.BlBl,
-) where
-
-import Control.Lens
-import Data.Aeson
-import Data.Aeson.TH
-import Dodge.Data.BlBl
-
-data ItEffect = ItEffect
-    { _ieInv :: ItInvEffect --Item -> Creature -> World -> World
-    , _ieOnInsert :: ItInvEffect
-    , _ieOnDrop :: ItInvEffect --Item -> Creature -> World -> World
-    }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-data ItInvEffect
-    = NoInvEffect
-    | EffectRootNotroot ItInvEffect ItInvEffect
-    | CreateShieldWall
-    | RemoveShieldWall
-    | EffectWhileRoot ItInvEffect
-    | EffectWhileAttached ItInvEffect
-    | ItemUseToggle BlBl
-    | ItemCancelExamineInventory
-    | ItemCopierUpdate
-    | ItemReduceWarmTime
-    | ItemSetWarmTime Int
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-data ItDropEffect = NoDropEffect
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-makeLenses ''ItEffect
-deriveJSON defaultOptions ''ItInvEffect
-deriveJSON defaultOptions ''ItDropEffect
-deriveJSON defaultOptions ''ItEffect

src/Dodge/Data/Item/Use.hs

@@ -55,7 +55,5 @@ data AmmoParams
 makeLenses ''ItemUse
 makeLenses ''AttachParams
 makeLenses ''AmmoParams
---makeLenses ''UseFocus
---deriveJSON defaultOptions ''AmmoParams
 deriveJSON defaultOptions ''AttachParams
 deriveJSON defaultOptions ''ItemUse