Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show robot IDs #1482

Merged
merged 2 commits into from
Aug 30, 2023
Merged

Show robot IDs #1482

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a9c7f0
Use standard coordinate rendering function
kostmo Aug 30, 2023
632149a
Show Robot ID column when cheating
kostmo Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 28 additions & 26 deletions src/Swarm/TUI/View.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,27 +621,30 @@ robotsListWidget s = hCenter table
. BT.alignRight 4
. BT.table
$ map (padLeftRight 1) <$> (headers : robotsTable)
headers =
withAttr robotAttr
<$> [ txt "Name"
, txt "Age"
, txt "Position"
, txt "Inventory"
, txt "Status"
, txt "Log"
]
headings =
[ "Name"
, "Age"
, "Position"
, "Inventory"
, "Status"
, "Log"
]
headers = withAttr robotAttr . txt <$> applyWhen cheat ("ID" :) headings
robotsTable = mkRobotRow <$> robots
mkRobotRow robot =
[ nameWidget
, txt $ from ageStr
, locWidget
, padRight (Pad 1) (txt $ from $ show rInvCount)
, statusWidget
, txt rLog
]
applyWhen cheat (idWidget :) cells
where
nameWidget = hBox [renderDisplay (robot ^. robotDisplay), higlightSystem . txt $ " " <> robot ^. robotName]
higlightSystem = if robot ^. systemRobot then withAttr highlightAttr else id
cells =
[ nameWidget
, txt $ from ageStr
, locWidget
, padRight (Pad 1) (txt $ from $ show rInvCount)
, statusWidget
, txt rLog
]
idWidget = str $ show $ robot ^. robotID
nameWidget = hBox [renderDisplay (robot ^. robotDisplay), highlightSystem . txt $ " " <> robot ^. robotName]
highlightSystem = if robot ^. systemRobot then withAttr highlightAttr else id

ageStr
| age < 60 = show age <> "sec"
Expand Down Expand Up @@ -1028,16 +1031,15 @@ drawRobotPanel s
-- away and a robot that does not exist.
| Just r <- s ^. gameState . to focusedRobot
, Just (_, lst) <- s ^. uiState . uiInventory =
let Cosmic _subworldName (Location x y) = r ^. robotLocation
drawClickableItem pos selb = clickable (InventoryListItem pos) . drawItem (lst ^. BL.listSelectedL) pos selb
let drawClickableItem pos selb = clickable (InventoryListItem pos) . drawItem (lst ^. BL.listSelectedL) pos selb
row =
[ txt (r ^. robotName)
, padLeft (Pad 2) . str . renderCoordsString $ r ^. robotLocation
, padLeft (Pad 2) $ renderDisplay (r ^. robotDisplay)
]
in padBottom Max $
vBox
[ hCenter $
hBox
[ txt (r ^. robotName)
, padLeft (Pad 2) $ str (printf "(%d, %d)" x y)
, padLeft (Pad 2) $ renderDisplay (r ^. robotDisplay)
]
[ hCenter $ hBox row
, padAll 1 (BL.renderListWithIndex drawClickableItem True lst)
]
| otherwise = blank
Expand Down
Loading