Cleanup

src/Dodge/Item/Weapon/Drone.hs

@@ -17,7 +17,7 @@ droneLauncher =
         & itUse . heldAim . aimRange .~ 0.5
         & itUse . heldAim . aimStance .~ TwoHandOver
         & itUse . heldAmmoTypes .~ singleAmmo DroneAmmo
-        & itType . iyBase .~ HELD DRONELAUNCHER
+        & itType .~ HELD DRONELAUNCHER
 
 lasDronesPic :: Item -> SPic
 lasDronesPic _ =

src/Dodge/Item/Weapon/Radar.hs

@@ -12,7 +12,7 @@ autoDetector dt =
         & itUse . equipEffect . eeUse .~ EDetector dt --autoEffect (detectorEffect dt) 100 click1S
         & itUse . equipEffect . eeParams .~ EquipCounter 0
         & itUse . equipEffect . eeViewDist ?~ 350
-        & itType . iyBase .~ EQUIP (AUTODETECTOR dt)
+        & itType .~ EQUIP (AUTODETECTOR dt)
 
 --    , _itEffect = autoRadarEffect
 

src/Dodge/Item/Weapon/Spawn.hs

@@ -15,7 +15,7 @@ spawnGun _ =
         & itUse . heldDelay . rateMax .~ 100
 --        & itUse . heldUse .~ HeldDoNothing --(\_ -> spawnCrNextTo cr)
 --        & itUse . heldMods .~ DoNothingMod
-        & itType . iyBase .~ LEFT SPAWNER
+        & itType .~ LEFT SPAWNER
 
 spawnCrNextTo ::
     -- | Creature to spawn

src/Dodge/Item/Weapon/Utility.hs

@@ -21,7 +21,7 @@ stopWatch =
                )
         & itEffect . ieInv .~ ChargeIfEquipped
         & itEffect . ieOnDrop .~ SetCharge 0
-        & itType . iyBase .~ LEFT STOPWATCH
+        & itType .~ LEFT STOPWATCH
         & itUse . leftConsumption
             .~ ChargeableAmmo
                 { _wpMaxCharge = 100
@@ -32,13 +32,13 @@ scrollWatch :: Item
 scrollWatch =
     stopWatch
         & itUse . leftUse .~ LTimeScroll
-        & itType . iyBase .~ LEFT SCROLLWATCH
+        & itType .~ LEFT SCROLLWATCH
 
 rewindWatch :: Item
 rewindWatch =
     stopWatch
         & itUse . leftUse .~ LRewind --useRewindGun
-        & itType . iyBase .~ LEFT REWINDWATCH
+        & itType .~ LEFT REWINDWATCH
 
 -- needs to shift this item to the current inventory slot
 shrinkGun :: Item
@@ -46,7 +46,7 @@ shrinkGun =
     defaultLeftItem
         & itUse .~ (defaultLeftUse & leftUse .~ LShrink)
         & itParams .~ ShrinkGunParams FullSize
-        & itType . iyBase .~ LEFT SHRINKER
+        & itType .~ LEFT SHRINKER
 
 blinkGun :: Item
 blinkGun =
@@ -57,12 +57,12 @@ blinkGun =
                 & equipEffect . eeSite .~ GoesOnWrist
                 --    , _itFloorPict = const . noPic . colorSH chartreuse $ upperPrismPoly 2 $ square 2
         }
-        & itType . iyBase .~ LEFT BLINKER
+        & itType .~ LEFT BLINKER
 
 unsafeBlinkGun :: Item
 unsafeBlinkGun =
     blinkGun
-        & itType . iyBase .~ LEFT BLINKERUNSAFE
+        & itType .~ LEFT BLINKERUNSAFE
         & itUse . leftUse .~ LUnsafeBlink --hammerCheckL (shootL $ const unsafeBlinkAction)
         & itUse . equipEffect . eeViewDist ?~ 400