Cleanup targeting

src/Dodge/Data/Item/Targeting.hs

@@ -14,29 +14,21 @@ data Targeting
     = NoTargeting
     | Targeting
         { _tgPos :: Maybe Point2
-        , _tgUpdate :: TargetUpdate --Item -> Creature -> World -> Targeting -> (World, Targeting)
-        , _tgDraw :: TargetDraw --Item -> Creature -> Configuration -> World -> Picture
+        , _tgType :: TargetType --Item -> Creature -> World -> Targeting -> (World, Targeting)
+--        , _tgDraw :: TargetDraw --Item -> Creature -> Configuration -> World -> Picture
         , _tgID :: Maybe Int
         , _tgActive :: Bool
         }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data TargetUpdate
-    = NoTargetUpdate
-    | TargetLaserUpdate
-    | TargetRBPressUpdate
-    | TargetRBCreatureUpdate
-    | TargetCursorUpdate
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-data TargetDraw
-    = NoTargetDraw
-    | TargetDistanceDraw
-    | SimpleDrawTarget
-    | TargetRBCreatureDraw
+data TargetType
+    = TargetLaser
+    | TargetRBPress
+    | TargetRBLine
+    | TargetRBCreature
+    | TargetCursor
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Targeting
-deriveJSON defaultOptions ''TargetUpdate
-deriveJSON defaultOptions ''TargetDraw
+deriveJSON defaultOptions ''TargetType
 deriveJSON defaultOptions ''Targeting