Cleanup targeting

src/Dodge/Item/Display.hs

@@ -75,7 +75,7 @@ showConsumption :: ItemUse -> String
 showConsumption iu = case iu of
     HeldUse{} -> showReloadProgress' (_heldConsumption iu)
     LeftUse{} -> showAutoRechargeProgress (_leftConsumption iu)
-    EquipUse ee -> showEUseNumber ee
+    EquipUse {_equipEffect = ee} -> showEUseNumber ee
     _ -> show $ iu ^?! useAmount . getItAmount
 
 showEUseNumber :: EquipEffect -> String

src/Dodge/Item/Held/Rod.hs

@@ -73,7 +73,7 @@ sniperRifle =
         & itUse . heldAim . aimZoom .~ defaultItZoom{_izMax = 0.5, _izMin = 0.5}
         & itUse . heldScroll .~ HeldScrollZoom -- zoomLongGun
         & itScope .~ ZoomScope (V2 0 0) 0 1 0.5 False
-        & itTargeting .~ targetLaser
+        & itUse . heldTargeting .~ (defaultTargeting & tgType .~ TargetLaser)
         & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1}
 
 machineGun :: Item

src/Dodge/Item/Held/Utility.hs

@@ -44,7 +44,7 @@ torch =
 forceFieldGun :: Item
 forceFieldGun =
     defaultWeapon
-        & itTargeting .~ (targetRBPress & tgDraw .~ TargetDistanceDraw)
+        & itUse . heldTargeting .~ (defaultTargeting & tgType .~ TargetRBLine)
         & itParams .~ ParamMID Nothing
         & itUse . heldUse .~ HeldForceField --useForceFieldGun
         & itUse . heldDelay .~ NoDelay

src/Dodge/Item/Targeting.hs

@@ -1,37 +1,13 @@
 module Dodge.Item.Targeting where
 
-import Control.Lens
 import Dodge.Data.Item.Targeting
 
 defaultTargeting :: Targeting
 defaultTargeting =
     Targeting
         { _tgPos = Nothing
-        , _tgUpdate = NoTargetUpdate
-        , _tgDraw = NoTargetDraw
+        , _tgType = TargetRBPress
+        --, _tgDraw = NoTargetDraw
         , _tgID = Nothing
         , _tgActive = False
         }
-
-targetLaser :: Targeting
-targetLaser =
-    defaultTargeting
-        & tgUpdate .~ TargetLaserUpdate
-
-targetRBPress :: Targeting
-targetRBPress =
-    defaultTargeting
-        & tgUpdate .~ TargetRBPressUpdate
-        & tgDraw .~ SimpleDrawTarget
-
-targetRBCreature :: Targeting
-targetRBCreature =
-    defaultTargeting
-        & tgUpdate .~ TargetRBCreatureUpdate
-        & tgDraw .~ TargetRBCreatureDraw
-
-targetCursor :: Targeting
-targetCursor =
-    defaultTargeting
-        & tgUpdate .~ TargetCursorUpdate
-        & tgDraw .~ SimpleDrawTarget

src/Dodge/Item/Weapon/ExtraEffect.hs

@@ -147,7 +147,7 @@ targetLaserUpdate _ cr w t
                 , _lpDir = _crDir cr
                 , _lpPos = sp
                 , _lpColor = col
-                , _lpType = TargetLaser
+                , _lpType = TargetingLaser
                 }
     --wpammo = _itConsumption it
     --    reloadFrac

src/Dodge/Item/Weapon/Targeting.hs

@@ -12,9 +12,9 @@ useTargetPos ::
     Creature ->
     World ->
     World
-useTargetPos f cr w = case cr ^? crInv . ix (crSel cr) . itTargeting . tgPos of
+useTargetPos f cr w = case cr ^? crInv . ix (crSel cr) . itUse . heldTargeting . tgPos of
     Nothing -> w
     Just p -> f p cr w
 
 removeItTarget :: Item -> Item
-removeItTarget = itTargeting . tgPos .~ Nothing
+removeItTarget = itUse . heldTargeting . tgPos .~ Nothing