diff --git a/data/charMaps/cMap16x32.CodePage437.png b/data/charMaps/cMap16x32.CodePage437.png index 716bf2c64..8fcc818a9 100644 Binary files a/data/charMaps/cMap16x32.CodePage437.png and b/data/charMaps/cMap16x32.CodePage437.png differ diff --git a/data/charMaps/cMap16x32.Custom.png b/data/charMaps/cMap16x32.Custom.png new file mode 100644 index 000000000..d4e39546d Binary files /dev/null and b/data/charMaps/cMap16x32.Custom.png differ diff --git a/ghcidOutput b/ghcidOutput index bece4b4e1..c4e89a3f6 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1 +1 @@ -All good (594 modules, at 02:32:29) +All good (594 modules, at 21:55:11) diff --git a/src/Dodge/DisplayInventory.hs b/src/Dodge/DisplayInventory.hs index 8a13742d2..48e41ba3c 100644 --- a/src/Dodge/DisplayInventory.hs +++ b/src/Dodge/DisplayInventory.hs @@ -47,8 +47,12 @@ updateCombineSections w cfig = (getAvailableListLines secondColumnParams cfig) [(0, sclose), (-1, sfclose)] where + filtcurs = case w ^? hud . hudElement . subInventory . ciSelection . _Just . _1 of + Just (-1) -> [toEnum 219] -- filled rect + _ -> [toEnum 128] -- wire rect (sfclose, sclose) = filterSectionsPair + filtcurs (flip . andOrRegex $ regexCombs invitms) (IM.fromDistinctAscList . zip [0 ..] $ combineList w) "COMBINATIONS" @@ -106,12 +110,18 @@ updateDisplaySections w cfig = Just (2, _) -> reverse [filtinv, filtclose, closex, invx, youx] Just (3, _) -> reverse [filtinv, filtclose, closex, invx, youx] _ -> reverse [filtinv, filtclose, invx, closex, youx] + invfiltcurs = case mselpos ^? _Just . _1 of + Just (-1) -> [toEnum 219] -- filled rect + _ -> [toEnum 128] -- wire rect (sfinv, sinv) = - filterSectionsPair plainRegex invitems "INVENTORY" $ + filterSectionsPair invfiltcurs plainRegex invitems "INVENTORY" $ w ^? hud . hudElement . diInvFilter . _Just (filtinv, invx) = ((-1, sfinv), (0, sinv)) + closefiltcurs = case mselpos ^? _Just . _1 of + Just (2) -> [toEnum 219] -- filled rect + _ -> [toEnum 128] -- wire rect (sfclose, sclose) = - filterSectionsPair plainRegex closeitms "NEARBY" $ + filterSectionsPair closefiltcurs plainRegex closeitms "NEARBY" $ w ^? hud . hudElement . diCloseFilter . _Just (filtclose, closex) = ((2, sfclose), (3, sclose)) youx = (1, youitems) @@ -143,12 +153,13 @@ updateDisplaySections w cfig = -- numfiltitems = " " ++ show (length itms - length itms') ++ " FILTERED" filterSectionsPair :: + String -> -- string at the end of the input (String -> SelectionItem a -> Bool) -> IM.IntMap (SelectionItem a) -> String -> Maybe String -> (IM.IntMap (SelectionItem a), IM.IntMap (SelectionItem a)) -filterSectionsPair filtfn itms filtdescription mfilt = +filterSectionsPair endstr filtfn itms filtdescription mfilt = ( filtsis , itms' ) @@ -159,7 +170,7 @@ filterSectionsPair filtfn itms filtdescription mfilt = IM.singleton 0 $ SelectionInfo - [filtdescription ++ " FILTER: " ++ str, numfiltitems] + [filtdescription ++ " FILTER:" ++ str ++ endstr, numfiltitems] 2 True white diff --git a/src/Dodge/TestString.hs b/src/Dodge/TestString.hs index 7e1ea1807..088607938 100644 --- a/src/Dodge/TestString.hs +++ b/src/Dodge/TestString.hs @@ -24,6 +24,7 @@ testStringInit :: Universe -> [String] testStringInit u = [show $ u ^? uvWorld . hud . hudElement . diSelection . _Just , show $ u ^? uvWorld . cWorld . lWorld . creatures . ix 0 . crManipulation . manObject ] +-- <> [[toEnum (i+j * 32) | i <- [0..31]] | j <- [0..7]] -- <> map show (IM.elems (L.postscan (L.premap _siHeight L.sum) -- $ fromMaybe mempty $ u ^? uvWorld . hud . hudElement . diSections . sssSections . ix 0 . ssItems) -- ) diff --git a/src/Preload/Render.hs b/src/Preload/Render.hs index 3a2c7865d..09289457d 100644 --- a/src/Preload/Render.hs +++ b/src/Preload/Render.hs @@ -95,7 +95,7 @@ preloadRender = do -- initTexture2DArray 50 "data/texture/charMapVertBig.png" 2 32 64 95 GL_NEAREST_MIPMAP_LINEAR GL_LINEAR --initTexture2DArray 50 "data/texture/charMapVert16Block.png" 2 16 32 95 GL_NEAREST GL_NEAREST --initTexture2DArray 50 "data/charMaps/charMapVert16Tall.png" 2 16 32 95 GL_NEAREST GL_NEAREST - initTexture2DArray 50 "data/charMaps/cMap16x32.CodePage437.png" 2 16 32 255 GL_NEAREST GL_NEAREST + initTexture2DArray 50 "data/charMaps/cMap16x32.Custom.png" 2 16 32 256 GL_NEAREST GL_NEAREST --initTexture2DArray 50 "data/texture/charMapVert8Block.png" 2 8 16 95 GL_NEAREST GL_NEAREST --initTexture2DArray 50 "data/texture/charMapVertBig.png" 2 32 64 95 GL_LINEAR_MIPMAP_LINEAR GL_LINEAR --initTexture2DArray 50 "data/texture/charMapVertBig.png" 2 32 64 95 GL_LINEAR_MIPMAP_NEAREST GL_LINEAR