Work on cleaning up item effects/attachments etc

src/Dodge/Item/Weapon/Utility.hs

@@ -18,12 +18,12 @@ rewindGun :: Item
 rewindGun =
     defaultLeftItem
         { _itInvColor = cyan
-        , _itEffect = ItRewindEffect RewindEffect -- []
         , _itUse =
             defaultlUse
                 & lUse .~ LRewind --useRewindGun
                 & eqEq . eqSite .~ GoesOnChest
         }
+        & itEffect . ieInv .~ RewindEffect
         & itType . iyBase .~ LEFT REWINDER
         & itUse . leftConsumption
             .~ ChargeableAmmo
@@ -35,10 +35,8 @@ rewindGun =
 shrinkGun :: Item
 shrinkGun =
     defaultLeftItem
-        { _itUse = defaultlUse & lUse .~ LShrink -- hammerCheckL useShrinkGun
-        --    , _itFloorPict = shrinkGunPic
-        , _itAttachment = AttachBool True
-        }
+        & itUse .~ (defaultlUse & lUse .~ LShrink)
+        & itParams .~ ShrinkGunParams FullSize
         & itType . iyBase .~ LEFT SHRINKER
 
 shrinkGunPic :: Item -> SPic
@@ -100,7 +98,7 @@ useForceFieldGun itm cr w = fromMaybe w $ do
     return $
         w
             & cWorld . walls %~ IM.insertWith (\_ x -> x) i forceField{_wlID = i}
-            & cWorld . creatures . ix (_crID cr) . crInv . ix (_ipInvID (_itPos itm)) . itParams . paramMID ?~ i
+            & cWorld . creatures . ix (_crID cr) . crInv . ix (_ipInvID (_itLocation itm)) . itParams . paramMID ?~ i
             & moveWallIDUnsafe i wlline
   where
     i = fromMaybe (IM.newKey (_walls (_cWorld w))) $ itm ^? itParams . paramMID . _Just