Tweak twisting when aiming

src/Dodge/Data.hs

@@ -219,6 +219,7 @@ data Creature = Creature
     , _crDir            :: Float
     , _crOldDir         :: Float
     , _crMvDir          :: Float
+    , _crTwist          :: Float
     , _crID             :: Int
     , _crPict           :: Creature -> Configuration -> World -> SPic
     , _crUpdate         :: Creature -> World -> (Endo World, Maybe Creature)
@@ -329,7 +330,7 @@ data ItemConsumption
         , _wpCharge     :: Int
         }
     | ItemItselfConsumable
-        { _itAmount'   :: Int
+        { _itAmount   :: Int
         }
     | NoConsumption
 data Item
@@ -337,7 +338,6 @@ data Item
         { _itName           :: String
         , _itConsumption    :: ItemConsumption
         , _itUse        :: ItemUse
-        , _itFloorPict  :: Item -> SPic
         , _itEquipPict :: Creature -> Int -> SPic
         , _itScroll     :: Float -> Creature -> Item -> Item
         , _itType       :: CombineType
@@ -353,52 +353,57 @@ data Item
         , _itParams     :: ItemParams
         , _itTweaks     :: ItemTweaks
         }
-     | Equipment
-        { _itName :: String
-        , _itFloorPict :: Item -> SPic
-        , _itEquipPict :: Creature -> Int -> SPic
---        , _itIdentity :: ItemIdentity
-        , _itEffect :: ItEffect
-        , _itID :: Maybe Int
-        , _itType :: CombineType
-        , _itZoom :: ItZoom
-        , _itInvSize    :: Float
-        , _itInvDisplay :: Item -> [String]
-        , _itInvColor :: Color
-        , _itCurseStatus :: CurseStatus
-        , _itDimension  :: ItemDimension
-        }
-     | Throwable
-        { _itName       :: String
-        , _itMaxStack   :: Int
---        , _itAmount     :: Int
-        , _itFloorPict :: Item -> SPic
-        , _twMaxRange   :: Float
-        , _twAccuracy   :: Float
-        , _itUse        :: ItemUse
---        , _itZoom       :: ItZoom
-        , _itEquipPict :: Creature -> Int -> SPic
-        --, _itIdentity   :: ItemIdentity
-        , _itID         :: Maybe Int
-        , _itAttachment :: ItAttachment
-        , _itType :: CombineType
-        , _itInvSize    :: Float
-        , _itInvDisplay :: Item -> [String]
-        , _itInvColor   :: Color
-        , _itEffect     :: ItEffect
-        , _itScroll     :: Float -> Creature -> Item -> Item
-        , _itCurseStatus :: CurseStatus
-        , _itDimension  :: ItemDimension
-        }
+--     | Equipment
+--        { _itName :: String
+--        , _itFloorPict :: Item -> SPic
+--        , _itEquipPict :: Creature -> Int -> SPic
+----        , _itIdentity :: ItemIdentity
+--        , _itEffect :: ItEffect
+--        , _itID :: Maybe Int
+--        , _itType :: CombineType
+--        , _itZoom :: ItZoom
+--        , _itInvSize    :: Float
+--        , _itInvDisplay :: Item -> [String]
+--        , _itInvColor :: Color
+--        , _itCurseStatus :: CurseStatus
+--        , _itDimension  :: ItemDimension
+--        }
+--     | Throwable
+--        { _itName       :: String
+--        , _itMaxStack   :: Int
+----        , _itAmount     :: Int
+--        , _itFloorPict :: Item -> SPic
+--        , _twMaxRange   :: Float
+--        , _twAccuracy   :: Float
+--        , _itUse        :: ItemUse
+----        , _itZoom       :: ItZoom
+--        , _itEquipPict :: Creature -> Int -> SPic
+--        --, _itIdentity   :: ItemIdentity
+--        , _itID         :: Maybe Int
+--        , _itAttachment :: ItAttachment
+--        , _itType :: CombineType
+--        , _itInvSize    :: Float
+--        , _itInvDisplay :: Item -> [String]
+--        , _itInvColor   :: Color
+--        , _itEffect     :: ItEffect
+--        , _itScroll     :: Float -> Creature -> Item -> Item
+--        , _itCurseStatus :: CurseStatus
+--        , _itDimension  :: ItemDimension
+--        }
 --     | NoItem
 
 data ItemDimension = ItemDimension
-    { _itDim    :: Point3 -- length width height
-    , _itRad    :: Float
-    , _itHandle :: Point3
-    , _itCenter :: Point3
-    , _muzzleLength :: Float
+    { _dimRad    :: Float
+    , _dimCenter :: Point3
+    , _dimPortage :: ItemPortage
+    , _dimSPic   :: Item -> SPic
     }
+data ItemPortage 
+    = HeldItem
+        { _handlePos :: Float
+        , _muzPos    :: Float
+        }
+    | WornItem
 
 data ReloadType 
     = ActiveClear
@@ -913,3 +918,4 @@ makeLenses ''ItemParams
 makeLenses ''ItemTweaks
 makeLenses ''Maybe'
 makeLenses ''InventoryMode
+makeLenses ''ItemPortage