Remove unnecessary item held/worn field type

src/Dodge/Default/AimParams.hs

@@ -0,0 +1,12 @@
+module Dodge.Default.AimParams where
+import Dodge.Item.Data
+
+defaultAimParams :: AimParams
+defaultAimParams = AimParams
+    { _aimWeight = 0
+    , _aimRange = 0
+    , _aimZoom = ItZoom 20 0.2 1
+    , _aimStance = OneHand
+    , _aimHandlePos = 10
+    , _aimMuzPos = 20
+    }

src/Dodge/Default/Item.hs

@@ -16,7 +16,7 @@ defaultItem = Item
     , _itInvColor = yellow
     , _itInvSize = 1
     , _itPos = VoidItm
-    , _itDimension = ItemDimension 0 0 NoPortage (const mempty)
+    , _itDimension = ItemDimension 0 0 (const mempty)
     , _itConsumption = NoConsumption
     , _itUse = NoUse
     , _itAttachment = NoItAttachment

src/Dodge/Default/Weapon.hs

@@ -5,6 +5,7 @@ import Dodge.Item.Weapon.AmmoParams
 import Dodge.Reloading.Action
 import Dodge.Item.Weapon.Bullet
 import Dodge.Default.Item
+import Dodge.Default.AimParams
 --import Dodge.Item.Draw
 import Picture
 import ShapePicture
@@ -92,13 +93,6 @@ luseInstantNoH :: (Item -> Creature -> World -> World) -> ItemUse
 luseInstantNoH f = defaultlUse 
     & lUse .~ f
     & useDelay .~ NoDelay
-defaultAimParams :: AimParams
-defaultAimParams = AimParams
-    { _aimWeight = 0
-    , _aimRange = 0
-    , _aimZoom = ItZoom 20 0.2 1
-    , _aimStance = OneHand
-    }
 
 -- TODO change this
 defaultLeftItem :: Item
@@ -134,20 +128,12 @@ 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
     }
 defBulletShooter :: ItemParams