Start unifying regex parts of selection sections

This commit is contained in:
2023-02-20 18:20:48 +00:00
parent c3fb94c7b5
commit 7b9b1d1799
12 changed files with 90 additions and 136 deletions
+2 -6
View File
@@ -16,20 +16,16 @@ import Data.IntMap.Strict (IntMap)
data HUDElement
= DisplayInventory
{ _subInventory :: SubInventory
, _diSections :: SelectionSections ()
, _invRegex :: Maybe String
, _closeRegex :: Maybe String
, _diSections :: FilterableSections ()
}
| DisplayCarte
-- deriving (Eq, Ord, Show, Read) --Generic, Flat)
data SubInventory
= NoSubInventory
| ExamineInventory {_subInvMSel :: Maybe Int}
-- | CombineInventory {_subInvMap :: SelectionIntMap CombinableItem}
| CombineInventory {_ciCombinations :: IntMap (SelectionItem CombinableItem)
, _ciRegex :: Maybe String
, _ciSections :: SelectionSections CombinableItem
, _ciSections :: FilterableSections CombinableItem
}
| LockedInventory
| DisplayTerminal {_termID :: Int}
-1
View File
@@ -44,7 +44,6 @@ data SelectionSections a = SelectionSections
}
data SectionCursor = SectionCursor
--{ _scurSel :: Int
{ _scurPos :: Int
, _scurSize :: Int
, _scurColor :: Color