Cleanup

2022-02-21 22:42:19 +00:00
parent f626fce105
commit ff84363a13
11 changed files with 79 additions and 99 deletions
@@ -356,28 +356,27 @@ data ItemConsumption
        { _itAmount   :: Int
        }
    | NoConsumption
-data Item
-    = Item
-        { _itName           :: String
-        , _itConsumption    :: ItemConsumption
-        , _itUse        :: ItemUse
-        , _itEquipPict :: Creature -> Int -> SPic
-        , _itScroll     :: Float -> Creature -> Item -> Item
-        , _itType       :: CombineType
-        , _itAttachment :: ItAttachment
-        , _itID         :: Maybe Int
-        , _itEffect     :: ItEffect
-        , _itInvSize    :: Float
-        , _itInvDisplay :: Item -> [String]
-        , _itInvColor   :: Color
-        , _itTargeting :: Maybe (World -> Maybe Point2, Int -> Item -> Creature -> World -> Picture)
-        , _itDimension  :: ItemDimension
-        , _itCurseStatus :: CurseStatus
-        , _itParams     :: ItemParams
-        , _itTweaks     :: ItemTweaks
-        , _itModules    :: M.Map ModuleSlot ItemModule
-        }
-
+data Item = Item
+    { _itName           :: String
+    , _itConsumption    :: ItemConsumption
+    , _itUse        :: ItemUse
+    , _itEquipPict :: Creature -> Int -> SPic
+    , _itScroll     :: Float -> Creature -> Item -> Item
+    , _itType       :: CombineType
+    , _itAttachment :: ItAttachment
+    , _itID         :: Maybe Int
+    , _itEffect     :: ItEffect
+    , _itInvSize    :: Float
+    , _itInvDisplay :: Item -> [String]
+    , _itInvColor   :: Color
+    , _itTargeting :: Maybe (World -> Maybe Point2, Int -> Item -> Creature -> World -> Picture)
+    , _itDimension  :: ItemDimension
+    , _itCurseStatus :: CurseStatus
+    , _itParams     :: ItemParams
+    , _itTweaks     :: ItemTweaks
+    , _itModules    :: M.Map ModuleSlot ItemModule
+    , _itScope      :: Scope
+    }
 data ModuleSlot
    = ModBullet
    | ModRifleMag