Implement telescoping inventory selection
This commit is contained in:
+20
-8
@@ -21,7 +21,6 @@ import Dodge.Data.SelectionList
|
||||
import Dodge.Data.World
|
||||
import Dodge.Inventory
|
||||
--import Dodge.Inventory.ItemSpace
|
||||
import Dodge.Inventory.SelectionList
|
||||
--import Dodge.Item.Display
|
||||
import Dodge.Item.Info
|
||||
import Dodge.Render.Connectors
|
||||
@@ -79,13 +78,26 @@ inventoryDisplay sss w cfig = listPicturesAtScaleOff
|
||||
(_ldpPosX ldps)
|
||||
(_ldpPosY ldps)
|
||||
cfig
|
||||
0 -- offset
|
||||
--undefined
|
||||
0
|
||||
pics
|
||||
<> color thecolor thecursor
|
||||
where
|
||||
thecolor = fromMaybe white $ do
|
||||
spos <- _sssSelPos sss
|
||||
sss ^? sssSections . ix spos . ssSelColor . _Just
|
||||
thecursor = fromMaybe mempty $ do
|
||||
sectype <- you w ^? crInvSel . isel
|
||||
let secnum = case sectype of
|
||||
SelItem{} -> 0
|
||||
SelNothing{} -> 1
|
||||
SelCloseObject{} -> 2
|
||||
xint <- sss ^? sssSections . ix secnum . ssIndent
|
||||
spos <- _sssSelPos sss
|
||||
let y = sum . fmap (length . _ssShownItems) . fst . IM.split spos $ _sssSections sss
|
||||
yint <- sss ^? sssSections . ix spos . ssSelPos . _Just
|
||||
csize <- sss ^? sssSections . ix spos . ssSelSize . _Just
|
||||
return $ listCursorDisplayParams ldps [North,South,West] cfig (yint + y) xint white 15 csize
|
||||
ldps = invDisplayParams w
|
||||
-- pics' = take (_sssMaxSize sss) pics
|
||||
-- totallength = length pics'
|
||||
pics = foldMap (_ssShownItems) (_sssSections sss)
|
||||
|
||||
drawSubInventory :: SubInventory -> Configuration -> World -> Picture
|
||||
@@ -187,7 +199,7 @@ examineInventoryExtra mtweaki mitm cfig =
|
||||
tweaki <- mtweaki
|
||||
-- consider moving this functionality out into a tweaks module
|
||||
tparam <- mitm ^? _Just . itTweaks . tweakParams . ix tweaki
|
||||
return $ listCursorNSW subInvX 60 cfig tweaki white (length $ showTweak tparam) 15
|
||||
return $ listCursorNSW subInvX 60 cfig tweaki 0 white (length $ showTweak tparam) 15
|
||||
-- , drawSelectionList thirdColumnParams cfig (thirdColumnPara (itmInfo mitm))
|
||||
]
|
||||
|
||||
@@ -327,14 +339,14 @@ lnkMidPosInvSelsCol cfig w i col =
|
||||
hw = halfWidth cfig
|
||||
|
||||
topCursorTypeWidth ::
|
||||
(Float -> Float -> Configuration -> Int -> Color -> Int -> Int -> Picture) ->
|
||||
(Float -> Float -> Configuration -> Int -> Int -> Color -> Int -> Int -> Picture) ->
|
||||
Int ->
|
||||
Configuration ->
|
||||
World ->
|
||||
Int ->
|
||||
Picture
|
||||
topCursorTypeWidth ctype width cfig w i =
|
||||
ctype 0 0 cfig (selNumPos i w) (selNumCol i w) width (invSelSize i w)
|
||||
ctype 0 0 cfig (selNumPos i w) 0 (selNumCol i w) width (invSelSize i w)
|
||||
|
||||
determineInvSelCursorWidth :: World -> Int
|
||||
determineInvSelCursorWidth w = case _rbOptions w of
|
||||
|
||||
Reference in New Issue
Block a user