Fix module combing

This commit is contained in:
2022-06-08 19:48:01 +01:00
parent 95ec30837a
commit dd4515a748
2 changed files with 27 additions and 10 deletions
+11 -1
View File
@@ -21,6 +21,7 @@ import qualified Data.Vector as V
--import Data.Foldable
import Data.Maybe
import qualified Data.IntMap.Strict as IM
import qualified Data.Map.Strict as M
import qualified Data.Set as S
--import qualified Data.IntSet as IS
import Control.Lens
@@ -109,7 +110,11 @@ subInventoryDisplay subinv cfig w = case subinv of
<> foldMap (topCursorTypeWidth listCursorNESW (topInvW +2) cfig w) lnks
<> combineCounts cfig w lnks
]
InspectInventory -> invHead cfig "INSPECT"
InspectInventory -> mconcat
[ selcursor' listCursorNESW
, invHead cfig "INSPECT"
, listTextPicturesAt subInvX 60 cfig $ map text (itmInfo it)
]
where
closeobjectcursor = case selectedCloseObject w of
Nothing -> mempty
@@ -133,6 +138,11 @@ subInventoryDisplay subinv cfig w = case subinv of
then drawRBOptions cfig w (_rbOptions w)
else mempty
itmInfo :: Maybe Item -> [String]
itmInfo mit = fromMaybe [] $ do
itm <- mit
return (map show . M.assocs . _iyModules $ _itType itm)
displayTerminal :: Int -> Configuration -> World -> Picture
displayTerminal tid cfig w = fromMaybe mempty $ do
tm <- w ^? terminals . ix tid