Start unifying heldUse and heldMods

src/Dodge/Item/Held/Utility.hs

@@ -37,9 +37,10 @@ forceFieldGun =
 --        & itUse . useTargeting ?~ TargetRBLine
         & itType . iyModules . at ModTarget ?~ TARGET TargetRBLine
         & itParams .~ ParamMID Nothing
-        & itUse . heldUse .~ HeldForceField --useForceFieldGun
+--        & itUse . heldUse .~ HeldForceField --useForceFieldGun
         & itUse . heldDelay .~ NoDelay
-        & itUse . heldMods .~ AmmoHammerTimeUseOneMod -- this is slightly different
+        -- & itUse . heldMods .~ AmmoHammerTimeUseOneMod -- this is slightly different
+        & itUse . heldMods .~ ForceFieldMod -- this is slightly different
         -- than the list below
         --[ hammerCheckI , ammoCheckI , useAmmoAmount 1]
         & itType . iyBase .~ HELD FORCEFIELDGUN
@@ -52,8 +53,9 @@ clickDetector :: Detector -> Item
 clickDetector dt =
     defaultWeapon
         & itUse . heldDelay . rateMax .~ 20
-        & itUse . heldUse .~ HeldDetectorEffect dt --detectorEffect dt
-        & itUse . heldMods .~ AmmoUseCheckMod
+--        & itUse . heldUse .~ HeldDetectorEffect dt --detectorEffect dt
+--        & itUse . heldMods .~ AmmoUseCheckMod
+        & itUse . heldMods .~ DetectorMod dt --detectorEffect dt
         & itUse . heldAim . aimRange .~ 1
         & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1}
         & itType . iyBase .~ HELD (HELDDETECTOR dt)