Start targeting refactor

src/Dodge/Data.hs

@@ -10,6 +10,7 @@ circular imports are probably not a good idea.
 {-# LANGUAGE DerivingStrategies #-}
 module Dodge.Data 
     ( module Dodge.Data
+    , module Dodge.Data.Targeting
     , module Dodge.Data.ItEffect
     , module Dodge.Data.Hammer
     , module Dodge.Data.Item.Use
@@ -65,6 +66,7 @@ module Dodge.Data
     , module Dodge.Data.RadarBlip
     , module Dodge.Data.PathGraph
     ) where
+import Dodge.Data.Targeting
 import Dodge.Data.ItEffect
 import Dodge.Data.Hammer
 import Dodge.Data.Item.Use
@@ -442,31 +444,6 @@ data Targeting
         , _tgActive :: Bool
         }
 
--- I believe this is called every frame, not sure when though
-data ItEffect 
-    = NoItEffect
-    | ItInvEffect 
-        {_ieInv       :: ItInvEffect --Item -> Creature -> World -> World
-        ,_ieCounter   :: Int
-        }
-    | ItRewindEffect
-        {_ieInv       :: ItInvEffect --Item -> Creature -> World -> World
-        ,_ieStoredWorlds    :: [World]
-        }
-    | ItEffect 
-        {_ieInv       :: ItInvEffect --Item -> Creature -> World -> World 
-        ,_ieFloor     :: ItFloorEffect --Int -> World -> World 
-        ,_ieCounter   :: Int
-        }
-    | ItInvEffectID
-        {_ieInv       :: ItInvEffect --Item -> Creature -> World -> World
-        ,_ieMID   :: Maybe Int
-        }  -- the duplication of ieMID may cause errors...
-    | ItInvEffectDrop
-        { _ieInv  :: ItInvEffect --Item -> Creature -> World -> World
-        , _ieDrop    :: ItDropEffect --Item -> Creature -> World -> World
-        , _ieMID     :: Maybe Int
-        }
 data IntID a = IntID Int a
 
 data WorldBeams = WorldBeams
@@ -1227,7 +1204,6 @@ makeLenses ''CreatureState
 makeLenses ''World
 makeLenses ''Creature
 makeLenses ''Item
-makeLenses ''ItEffect
 makeLenses ''FloorItem
 makeLenses ''TweakParam
 makeLenses ''Prop