Cleanup

src/Dodge/Item/Held/Utility.hs

@@ -15,10 +15,10 @@ flatShield =
         & itUse . heldAim . aimStance .~ TwoHandFlat
         -- & itUse . heldAim . aimHandlePos .~ 0
         & itInvSize .~ 3
-        & itType . iyBase .~ HELD FLATSHIELD
+        & itType .~ HELD FLATSHIELD
 
 keyCard :: Int -> Item
-keyCard n = defaultHeldItem & itType . iyBase .~ HELD (KEYCARD n)
+keyCard n = defaultHeldItem & itType .~ HELD (KEYCARD n)
 
 latchkey :: Int -> Item
 latchkey _ = defaultHeldItem 
@@ -27,7 +27,7 @@ torch :: Item
 torch =
     defaultHeldItem
         & itEffect . ieInv .~ EffectWhileRoot CreateHeldLight
-        & itType . iyBase .~ HELD TORCH
+        & itType .~ HELD TORCH
         -- & itUse . heldAim . aimHandlePos .~ 5
         & itUse . heldAim . aimMuzzles . ix 0 . mzPos . _x .~ 10
 
@@ -43,7 +43,7 @@ forceFieldGun =
 --        & itUse . heldMods .~ ForceFieldMod -- this is slightly different
         -- than the list below
         --[ hammerCheckI , ammoCheckI , useAmmoAmount 1]
-        & itType . iyBase .~ HELD FORCEFIELDGUN
+        & itType .~ HELD FORCEFIELDGUN
         & itUse . heldAmmoTypes .~ singleAmmo ElectricalAmmo
         & itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleForceField
 
@@ -54,10 +54,7 @@ clickDetector :: Detector -> Item
 clickDetector dt =
     defaultHeldItem
         & itUse . heldDelay . rateMax .~ 20
---        & 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)
+        & itType .~ HELD (HELDDETECTOR dt)
         & itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleDetector