Allow for stacking of items and combining sensibly

2021-12-03 17:18:06 +00:00
parent b2a9192fe4
commit b41e3e3637
24 changed files with 166 additions and 159 deletions
@@ -327,8 +327,7 @@ data ItemConsumption
        , _wpCharge     :: Int
        }
    | ItemItselfConsumable
-        { _itMaxStack' :: Int
-        , _itAmount'   :: Int
+        { _itAmount'   :: Int
        }
    | NoConsumption
 data Item
@@ -343,7 +342,7 @@ data Item
        , _itAttachment :: ItAttachment
        , _itID         :: Maybe Int
        , _itEffect     :: ItEffect
-        , _itInvSize    :: Int
+        , _itInvSize    :: Float
        , _itInvDisplay :: Item -> [String]
        , _itInvColor   :: Color
        , _itTargeting :: Maybe (World -> Maybe Point2, Int -> Item -> Creature -> World -> Picture)
@@ -391,7 +390,7 @@ data Item
        , _itID :: Maybe Int
        , _itCombineType :: CombineType
        , _itZoom :: ItZoom
-        , _itInvSize    :: Int
+        , _itInvSize    :: Float
        , _itInvDisplay :: Item -> [String]
        , _itInvColor :: Color
        , _itCurseStatus :: CurseStatus
@@ -400,7 +399,7 @@ data Item
     | Throwable
        { _itName       :: String
        , _itMaxStack   :: Int
-        , _itAmount     :: Int
+--        , _itAmount     :: Int
        , _itFloorPict :: Item -> SPic
        , _twMaxRange   :: Float
        , _twAccuracy   :: Float
@@ -411,7 +410,7 @@ data Item
        , _itID         :: Maybe Int
        , _itAttachment :: ItAttachment
        , _itCombineType :: CombineType
-        , _itInvSize    :: Int
+        , _itInvSize    :: Float
        , _itInvDisplay :: Item -> [String]
        , _itInvColor   :: Color
        , _itEffect     :: ItEffect