Tweak equipment draw

src/Dodge/Item/Weapon/BatteryGuns.hs

@@ -59,7 +59,6 @@ teslaGun = defaultGun
     , _itAimingSpeed = 0.4
     , _itZoom = defaultItZoom
     , _itAimingRange = 0
-    , _itEquipPict = pictureWeaponOnAim teslaGunPic
     }
 teslaGunPic :: Item -> SPic
 teslaGunPic _ = 
@@ -95,7 +94,6 @@ lasGun = defaultAutoGun
     , _itFloorPict = lasGunPic
     , _itAimingSpeed = 0.4
     , _itAimingRange = 1
-    , _itEquipPict = pictureWeaponOnAim lasGunPic
     , _itAttachment = ItCharMode $ Seq.fromList "/VZ"
     , _itScroll   = scrollCharMode
     , _itInvDisplay = basicWeaponDisplay
@@ -132,7 +130,6 @@ tractorGun = defaultAutoGun
     , _itFloorPict = tractorGunSPic
     , _itAimingSpeed = 0.4
     , _itAimingRange = 0.5
-    , _itEquipPict = pictureWeaponOnAim tractorGunSPic
     }
 -- TODO own picture for tractor gun
 tractorGunSPic :: Item -> SPic

src/Dodge/Item/Weapon/Bezier.hs

@@ -35,7 +35,6 @@ bezierGun = defaultGun
         . torqueBefore 0.05
         ]
     , _itFloorPict = bezierGunSPic
-    , _itEquipPict = pictureWeaponOnAim bezierGunSPic
     , _itAttachment = NoItAttachment
     , _itScroll   = \_ _ -> removeItTarget
     , _itHammer = HammerUp

src/Dodge/Item/Weapon/BulletGuns.hs

@@ -66,7 +66,7 @@ autoGun = defaultAutoGun
     , _itAimingRange = 1
     , _itZoom = defaultItZoom 
     , _itAimZoom = defaultItZoom {_itZoomFac = 1.5}
-    , _itEquipPict = pictureWeaponOnAim autoGunPic
+    , _itEquipPict = pictureWeaponOnAim
     , _itAttachment = ItCharMode $ Seq.fromList "MS"
     , _itScroll   = scrollCharMode
     , _itInvDisplay = basicWeaponDisplay
@@ -118,14 +118,11 @@ pistol = defaultGun
     , _wpAmmo = basicBullet
     }
 pistolPic :: Item -> SPic
-pistolPic it = 
-    ( colorSH green (prismPoly 
+pistolPic it = noPic $ colorSH green (prismPoly 
         (map (addZ 3) $ rectNESW 3 3 (-3) (-3))
         (map (addZ 0) $ rectNESW 5 3 (-5) (-7))
     )
     <> translateSH (V3 (-4) 5.5 4) (rotateSH pi $ bulletClip am)
-    , mempty
-    )
   where
     am = loadedAmmo it
 
@@ -156,7 +153,6 @@ hvAutoGun = defaultAutoGun
     , _itFloorPict = hvAutoGunPic
     , _itAimingSpeed = 0.2
     , _itAimingRange = 1
-    , _itEquipPict = pictureWeaponOnAim hvAutoGunPic
     , _wpAmmo = hvBullet
     }
 hvAutoGunPic :: Item -> SPic
@@ -197,7 +193,6 @@ ltAutoGun = defaultAutoGun
     , _itAimingSpeed = 1
     , _itAimingRange = 0
     , _itZoom = defaultItZoom
-    , _itEquipPict = pictureWeaponOnAim ltAutoGunPic    
     , _itAimStance = OneHand
     , _wpAmmo = ltBullet
     }
@@ -330,7 +325,6 @@ spreadGun = defaultGun
     , _itFloorPict = spreadGunPic
     , _itAimingSpeed = 1
     , _itAimingRange = 0
-    , _itEquipPict = pictureWeaponOnAim spreadGunPic
     , _wpAmmo = basicBullet
     , _wpNumBarrels = 50
     }
@@ -370,7 +364,6 @@ multGun = defaultGun
     , _itAimingRange = 1
     , _itZoom       = defaultItZoom
     , _itAimZoom    = defaultItZoom {_itZoomFac = 1.5}
-    , _itEquipPict = pictureWeaponOnAim multGunSPic
     , _itAimStance = TwoHandTwist
     , _wpAmmo = basicBullet
     , _wpNumBarrels = 5
@@ -418,7 +411,6 @@ longGun = defaultGun
     , _itAimingRange = 1
     , _itZoom       = defaultItZoom 
     , _itAimZoom    = defaultItZoom {_itZoomMax = 0.5, _itZoomMin = 0.5}
-    , _itEquipPict = pictureWeaponOnAim longGunSPic
     , _itScroll = zoomLongGun
     , _itAttachment = ItScope (V2 0 0) 0 1 False
     , _itEffect = itemLaserScopeEffect

src/Dodge/Item/Weapon/Grenade.hs

@@ -39,7 +39,7 @@ grenade = Throwable
     , _itAimingRange = 0
     , _itZoom       = defaultItZoom
     , _itAimZoom    = defaultItZoom {_itZoomMax = f fuseTime, _itZoomMin = f fuseTime}
-    , _itEquipPict = pictureWeaponOnAim $ \_ -> grenadePic fuseTime
+    , _itEquipPict = pictureWeaponOnAim' $ \_ -> grenadePic fuseTime
     , _itID = Nothing
     , _itUseRate = 25 
     , _itUseTime = 0
@@ -131,7 +131,7 @@ throwArmReset x = ItInvEffect {_itInvEffect = f ,_itEffectCounter = x }
     counterDown it 
         | _itEffectCounter (_itEffect it) == 0 = it 
             & itHammer .~ HammerUp 
-            & itEquipPict .~ pictureWeaponOnAim (\_ -> grenadePic 50)
+            & itEquipPict .~ pictureWeaponOnAim' (\_ -> grenadePic 50)
         | otherwise = it & itEffect . itEffectCounter -~ 1
 
 --flameGrenade :: Item

src/Dodge/Item/Weapon/Launcher.hs

@@ -56,7 +56,6 @@ launcher = defaultGun
     , _itFloorPict = launcherPic
     , _itAimingSpeed = 0.2
     , _itAimingRange = 0.5
-    , _itEquipPict = pictureWeaponOnAim launcherPic
     , _itHammer = NoHammer
     , _itEffect = NoItEffect
     , _wpAmmo = defaultShellAmmo 
@@ -256,7 +255,6 @@ remoteLauncher = defaultGun
     , _itFloorPict = launcherPic
     , _itAimingSpeed = 0.2
     , _itAimingRange = 0.5
-    , _itEquipPict = pictureWeaponOnAim launcherPic
     , _itAttachment = ItScope (V2 0 0) 0 1 True
     , _itAimStance = TwoHandTwist
     }

src/Dodge/Item/Weapon/SprayGuns.hs

@@ -54,7 +54,6 @@ poisonSprayer = defaultAutoGun
     , _itAimingSpeed = 0.2
     , _itAimingRange = 0
     , _itZoom = defaultItZoom
-    , _itEquipPict = pictureWeaponOnAim flamerPic
     , _wpSpread = 0.1
     , _wpNumBarrels = 3
     }
@@ -82,7 +81,6 @@ flamer = defaultAutoGun
     , _itAimingRange = 0
     , _itZoom       = defaultItZoom
     , _itAimZoom    = defaultItZoom {_itZoomMax = 5, _itZoomMin = 1.5}
-    , _itEquipPict = pictureWeaponOnAim flamerPic
     , _itAttachment = NoItAttachment
     }
 flamerPic :: Item -> SPic