Cleanup targeting

src/Dodge/Data/Item.hs

@@ -13,7 +13,6 @@ module Dodge.Data.Item (
     module Dodge.Data.Item.CurseStatus,
     module Dodge.Data.Item.Scope,
     module Dodge.Data.Item.Combine,
-    module Dodge.Data.Item.Targeting,
     module Dodge.Data.Item.Location,
 ) where
 
@@ -29,7 +28,6 @@ import Dodge.Data.Item.Misc
 import Dodge.Data.Item.Params
 import Dodge.Data.Item.Tweak
 import Dodge.Data.Item.Use
-import Dodge.Data.Item.Targeting
 import Dodge.Data.Item.Location
 
 data Item = Item
@@ -41,7 +39,6 @@ data Item = Item
     , _itEffect :: ItEffect
     , _itInvSize :: Float
     , _itInvColor :: Color
-    , _itTargeting :: Targeting
     , _itDimension :: ItemDimension
     , _itCurseStatus :: CurseStatus
     , _itTweaks :: ItemTweaks

src/Dodge/Data/Item/Combine.hs

@@ -5,6 +5,7 @@
 
 module Dodge.Data.Item.Combine where
 
+import Dodge.Data.Item.Targeting
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -187,9 +188,7 @@ data ItemModuleType
     | PENBUL
     | STATICBUL
     | CONCUSBUL
-    | TARGCR
-    | TARGLAS
-    | TARGPOS
+    | TARGET TargetType
     | MAGNETTRAJ
     | FLECHETRAJ
     | BEZIERTRAJ

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

src/Dodge/Data/Item/Use.hs

@@ -11,6 +11,7 @@ module Dodge.Data.Item.Use (
     module Dodge.Data.Item.HeldDelay,
     module Dodge.Data.Item.Use.Consumption,
     module Dodge.Data.Hammer,
+    module Dodge.Data.Item.Targeting,
 ) where
 
 import Control.Lens
@@ -22,6 +23,7 @@ import Dodge.Data.Item.HeldUse
 import Dodge.Data.Item.Use.Consumption
 import Dodge.Data.Item.Use.Equipment
 import Dodge.Data.Item.HeldDelay
+import Dodge.Data.Item.Targeting
 
 data ItemUse
     = HeldUse
@@ -32,6 +34,7 @@ data ItemUse
         , _heldAim :: AimParams
         , _heldScroll :: HeldScroll
         , _heldConsumption :: HeldConsumption
+        , _heldTargeting :: Targeting
         }
     | LeftUse
         { _leftUse :: Luse
@@ -46,6 +49,7 @@ data ItemUse
         }
     | EquipUse
         { _equipEffect :: EquipEffect
+        , _equipTargeting :: Targeting
         }
     | CraftUse
         {_useAmount :: ItAmount}

src/Dodge/Data/Laser.hs

@@ -13,7 +13,7 @@ import Geometry.Data
 
 data LaserType
     = DamageLaser {_laserTypeDamage :: Int}
-    | TargetLaser
+    | TargetingLaser
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data LaserStart = LaserStart