Start unifying heldUse and heldMods

src/Dodge/Item/Weapon/Drone.hs

@@ -12,7 +12,7 @@ droneLauncher :: Item
 droneLauncher =
     defaultHeldItem
         & itUse . heldDelay . rateMax .~ 20
-        & itUse . heldMods .~ AmmoUseCheckMod
+--        & itUse . heldMods .~ AmmoUseCheckMod
         & itUse . heldAim . aimWeight .~ 8
         & itUse . heldAim . aimRange .~ 0.5
         & itUse . heldAim . aimStance .~ TwoHandOver

src/Dodge/Item/Weapon/Launcher.hs

@@ -18,7 +18,8 @@ explodeRemoteRocket itid pjid w =
     w
         & cWorld . lWorld . projectiles . ix pjid . prjUpdates .~ [PJRetireRemote itid 30 pjid]
         & cWorld . lWorld . projectiles . ix pjid . prjDraw .~ DrawBlankProjectile
-        & itPoint . itUse . heldUse .~ HeldDoNothing
+--        & itPoint . itUse . heldUse .~ HeldDoNothing
+        & itPoint . itUse . heldMods .~ DoNothingMod
         & usePayload (_prjPayload thepj) (_prjPos thepj)
   where
     itPoint = pointerToItemLocation $ w ^?! cWorld . lWorld . itemLocations . ix itid-- _itemLocations (_cWorld w) IM.! itid

src/Dodge/Item/Weapon/Spawn.hs

@@ -13,8 +13,8 @@ spawnGun :: Creature -> Item
 spawnGun _ =
     defaultHeldItem
         & itUse . heldDelay . rateMax .~ 100
-        & itUse . heldUse .~ HeldDoNothing --(\_ -> spawnCrNextTo cr)
-        & itUse . heldMods .~ HeldModNothing
+--        & itUse . heldUse .~ HeldDoNothing --(\_ -> spawnCrNextTo cr)
+--        & itUse . heldMods .~ DoNothingMod
         & itType . iyBase .~ LEFT SPAWNER
 
 spawnCrNextTo ::

src/Dodge/Item/Weapon/TriggerType.hs

@@ -342,7 +342,7 @@ withSidePushAfterI maxSide eff item cr w =
     (pushAmount, g) = randomR (- maxSide, maxSide) $ _randGen w
 
 useAllAmmo :: ChainEffect
-useAllAmmo eff item cr w = error "use all ammo"
+useAllAmmo = error "use all ammo"
 --useAllAmmo eff ams item cr w = fromMaybe w $ do
 --    let invids = ams ^.. traverse . itLocation . ipInvID
 --    return . eff ams item cr $ foldl' f w invids
@@ -668,7 +668,7 @@ repeatOnFrames is hm f it cr w =
 --        return $ f it cr' w'
 
 duplicateLoaded :: ChainEffect
-duplicateLoaded eff it cr w = error "duplicateLoaded"
+duplicateLoaded = error "duplicateLoaded"
 --duplicateLoaded :: ChainEffect
 --duplicateLoaded eff ams it cr w = foldr f w (take numbul [1::Int .. ])
 --  where
@@ -678,7 +678,7 @@ duplicateLoaded eff it cr w = error "duplicateLoaded"
 --        cr ^? crInv . ix i . itUse . amagLoadStatus . iaLoaded
 
 duplicateNumBarrels :: Int -> ChainEffect
-duplicateNumBarrels n eff itm cr w = error "duplicateNumBarrels"
+duplicateNumBarrels = error "duplicateNumBarrels"
 --duplicateNumBarrels :: Int -> ChainEffect
 --duplicateNumBarrels n eff ams itm cr w = foldr f w (take n $ itm ^?! itUse . heldAim . aimMuzzles)
 --  where
@@ -694,7 +694,7 @@ duplicateNumBarrels n eff itm cr w = error "duplicateNumBarrels"
 --            (a,g) = randomR (-inacc,inacc) $ _randGen w'
 
 duplicateLoadedBarrels :: ChainEffect
-duplicateLoadedBarrels eff itm cr = error "duplicateLoadedBarrels"
+duplicateLoadedBarrels eff itm cr = eff itm cr
 --    = duplicateNumBarrels numbul eff ams itm cr
 --  where
 --    numbul :: Int