Tweak twisting when aiming

src/Dodge/Default/Weapon.hs

@@ -86,14 +86,9 @@ defaultGun = Item
     { _itName = "default"
     , _itType = NoCombineType
     , _itCurseStatus = Uncursed
---    , _itIdentity = Pistol
     , _itConsumption = defaultAmmo
     , _itUse = defaultrUse
-    , _itFloorPict = const $ noPic $ colorSH green (prismPoly 
-        (map (addZ 3) $ rectNESW 3 3 (-3) (-3))
-        (map (addZ 0) $ rectNESW 5 3 (-5) (-7))
-        )
---    , _itZoom    = ItZoom 20 0.2 1
+    , _itDimension = defItDimCol white
     , _itEquipPict = pictureWeaponOnAim
     , _itScroll = \_ _ -> id
     , _itAttachment = NoItAttachment
@@ -104,7 +99,6 @@ defaultGun = Item
     , _itInvSize  = 1
     , _itTargeting = Nothing
     , _itParams = NoParams
-    , _itDimension = defaultItemDimension
     , _itTweaks = NoTweaks
     }
 defaultCraftable :: Item
@@ -115,10 +109,6 @@ defaultCraftable = Item
 --    , _itIdentity = Generic
     , _itConsumption = NoConsumption
     , _itUse = NoUse
-    , _itFloorPict = const $ noPic $ colorSH green (prismPoly 
-        (map (addZ 3) $ rectNESW 3 3 (-3) (-3))
-        (map (addZ 0) $ rectNESW 5 3 (-5) (-7))
-        )
 --    , _itZoom    = ItZoom 20 0.2 1
     , _itEquipPict = pictureWeaponOnAim
     , _itScroll = \_ _ -> id
@@ -130,16 +120,28 @@ defaultCraftable = Item
     , _itInvSize  = 1
     , _itTargeting = Nothing
     , _itParams = NoParams
-    , _itDimension = defaultItemDimension
+    , _itDimension = defItDimCol green
     , _itTweaks = NoTweaks
     }
-defaultItemDimension :: ItemDimension
-defaultItemDimension = ItemDimension
-    { _itDim = V3 4 4 4
-    , _itRad = 10
-    , _itHandle = V3 2 2 2
-    , _itCenter = V3 2 2 2
-    , _muzzleLength = 5 -- how much the item projects out from the cr radius when aiming
+defItDim :: ItemDimension
+defItDim = ItemDimension
+    { _dimRad = 2
+    , _dimCenter = V3 0 0 0
+    , _dimPortage = HeldItem
+        { _handlePos = 0
+        , _muzPos    = 0
+        }
+    , _dimSPic = const $ noPic $ colorSH green $ upperPrismPoly 3 $ square 4
+    }
+defItDimCol :: Color -> ItemDimension
+defItDimCol col = ItemDimension
+    { _dimRad = 2
+    , _dimCenter = V3 0 0 0
+    , _dimPortage = HeldItem
+        { _handlePos = 0
+        , _muzPos    = 0
+        }
+    , _dimSPic = const $ noPic $ colorSH col $ upperPrismPoly 3 $ square 4
     }
 
 defaultAutoGun :: Item