Cleanup targeting

src/Dodge/Combine/Combinations.hs

@@ -167,9 +167,9 @@ moduleCombinations =
         ( ModTarget
         , homingLaunchers ++ bulletWeapons
         ,
-            [ amod [cr MICROCHIP, cr HEATSENSOR] TARGCR
-            , amod [cr MICROCHIP, cr LIGHTSENSOR] TARGLAS
-            , amod [cr MICROCHIP, cr SOUNDSENSOR] TARGPOS
+            [ amod [cr MICROCHIP, cr HEATSENSOR] (TARGET TargetRBCreature)
+            , amod [cr MICROCHIP, cr LIGHTSENSOR] (TARGET TargetLaser)
+            , amod [cr MICROCHIP, cr SOUNDSENSOR] (TARGET TargetRBPress)
             ]
         )
     ,

src/Dodge/Combine/Module.hs

@@ -19,9 +19,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
-    TARGCR -> itTargeting .~ targetRBCreature
-    TARGLAS -> itTargeting .~ targetLaser
-    TARGPOS -> itTargeting .~ targetRBPress
+    TARGET t -> itUse . heldTargeting .~ (defaultTargeting & tgType .~ t)
     MAGNETTRAJ ->
         (itUse . heldConsumption . laAmmoType . amBullet . buTrajectory .~ MagnetTrajectory 0)
             . (itUse . heldConsumption . laAmmoType . amBullet . buVel .~ V2 10 0)
@@ -39,7 +37,7 @@ moduleModification imt = case imt of
   where
     makeDirectedTele it =
         it
-            & itTargeting .~ targetRBPress
+            & itUse . heldTargeting .~ (defaultTargeting & tgType .~ TargetRBPress)
             & itUse . heldMods %~ ModWithDirectedTeleport -- .:~ withPosDirWallCheck directedTelPos
             -- for the camera: the simplest option is to remove all zoom/offset
             & itUse . heldAim . aimZoom . izFac .~ 1