Move towards allowing equipable targeting items

src/Dodge/Combine/Combinations.hs

@@ -27,11 +27,20 @@ backpackCombinations =
     po xs it = (map o xs, it)
     o = (1,)
 
+hatCombinations :: [([(ItAmount,ItemBaseType)],Item)]
+hatCombinations = 
+    [ po [EQUIP HAT, CRAFT (TARGETMODULE tt)] (targetingHat tt) | tt <- [minBound..]
+    ]
+  where
+    po xs it = (map o xs, it)
+    o = (1,)
+
 
 itemCombinations :: [([(ItAmount, ItemBaseType)], Item)]
 itemCombinations =
     watchCombinations ++
     backpackCombinations ++
+    hatCombinations ++
     [ po [CRAFT PIPE, CRAFT HARDWARE] (bangStick 1)
     , po [HELD (BANGSTICK 1), CRAFT TIN] pistol
     , po [HELD PISTOL, CRAFT SPRING] autoPistol

src/Dodge/Combine/Module.hs

@@ -1,7 +1,6 @@
 module Dodge.Combine.Module where
 
 import Data.Foldable
-import Dodge.Item.Targeting
 import Dodge.Data.Beam
 import Dodge.Data.Item
 import Dodge.Tesla
@@ -19,7 +18,7 @@ moduleModification imt = case imt of
     PENBUL -> itUse . heldConsumption . laAmmoType . amBullet . buEffect .~ PenetrateBullet
     STATICBUL -> itUse . heldConsumption . laAmmoType . amBullet . buSpawn .~ BulBall TeslaBall
     CONCUSBUL -> itUse . heldConsumption . laAmmoType . amBullet . buSpawn .~ BulBall ConcBall
-    TARGET t -> itUse . heldTargeting .~ (defaultTargeting & tgType .~ t)
+    TARGET t -> itUse . useTargeting .~ (Just t)
     MAGNETTRAJ ->
         (itUse . heldConsumption . laAmmoType . amBullet . buTrajectory .~ MagnetTrajectory 0)
             . (itUse . heldConsumption . laAmmoType . amBullet . buVel .~ V2 10 0)
@@ -37,7 +36,7 @@ moduleModification imt = case imt of
   where
     makeDirectedTele it =
         it
-            & itUse . heldTargeting .~ (defaultTargeting & tgType .~ TargetRBPress)
+            & itUse . useTargeting .~ (Just TargetRBPress)
             & itUse . heldMods %~ ModWithDirectedTeleport -- .:~ withPosDirWallCheck directedTelPos
             -- for the camera: the simplest option is to remove all zoom/offset
             & itUse . heldAim . aimZoom . izFac .~ 1