Vleanup

src/Dodge/Data/Item/Use.hs

@@ -5,9 +5,7 @@
 
 module Dodge.Data.Item.Use (
     module Dodge.Data.Item.Use,
-    module Dodge.Data.Item.Use.Equipment,
     module Dodge.Data.Item.HeldUse,
---    module Dodge.Data.Item.HeldDelay,
     module Dodge.Data.Item.Use.Consumption,
     module Dodge.Data.Item.Targeting,
     module Dodge.Data.GenFloat,
@@ -26,12 +24,11 @@ import Dodge.Data.Item.HeldUse
 import Dodge.Data.Item.Scope
 import Dodge.Data.Item.Targeting
 import Dodge.Data.Item.Use.Consumption
-import Dodge.Data.Item.Use.Equipment
 import Geometry.Data
 
 data ItemUse
     = UseHeld
-    | UseEquip {_uequipEffect :: EquipEffect}
+    | UseEquip
     | UseAttach {_uaParams :: AttachParams}
     | UseInt {_uInt :: Int}
     | UseNothing

src/Dodge/Data/Item/Use/Equipment.hs

@@ -1,43 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE StrictData #-}
-{-# LANGUAGE TemplateHaskell #-}
-module Dodge.Data.Item.Use.Equipment (
-    module Dodge.Data.Equipment.Misc,
-    module Dodge.Data.Item.Use.Equipment,
-) where
-
-import Control.Lens
-import Data.Aeson
-import Data.Aeson.TH
-import Dodge.Data.Equipment.Misc
-
-data EquipEffect = EquipEffect
---    { _eeUse :: Euse --Item -> Creature -> World -> World
-----    , _eeOnEquip :: ItmCrWdWd --Item -> Creature -> World -> World
-----    , _eeOnRemove :: ItmCrWdWd --Item -> Creature -> World -> World
-----    , _eeParams :: EquipParams
-----    , _eeViewDist :: Maybe Float
-----    , _eeAttachPos :: Point3
---    }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-data ItmCrWdWd
-    = ItmCrWdWdDoNothing
---    | ECamouflage {_euseCamouflageStatus :: CamouflageStatus}
-    | EonWristShield
-    | EoffWristShield
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
---data EquipParams
---    = NoEquipParams
-----    | EquipID {_eparamID :: Int}
-----    | EquipCounter {_eparamInt :: Int}
---    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-makeLenses ''EquipEffect
---makeLenses ''EquipParams
-makeLenses ''ItmCrWdWd
-deriveJSON defaultOptions ''ItmCrWdWd
---deriveJSON defaultOptions ''EquipParams
-deriveJSON defaultOptions ''EquipEffect