Medical Menu Implementation #54763

redrosedialtone · 2022-01-25T05:54:31Z

Summary

Interface "Adds Medical Menu"

Purpose of change

Implements the initial steps for a new Medical Menu, acting (for now) as a more detailed extension of the Player Info ('@') Menu.

Hoping to open up pathways for further content development to do with the medical system, granting a larger (and expandable) interface to represent things that may be confining within the Player Info menu.

Singularly this PR will not add much to the game other than a nicer display of already represented content, and is made to preliminary to further content.

Describe the solution

Opens a new menu under the 'N' hotkey, or via the interaction menu. Functions effectively the same as the @ Menu but in a slightly easier to read format.

Describe alternatives you've considered

The Player Info Menu serves better as a light-weight menu, making a more dedicated interface necessary for when further details are needed.

Testing

I only tested different status modifiers to make sure that everything can be displayed neatly and within the bounds of the screen without appearing congested.

Additional context

To make this more expandable, I've tried to use JSON data wherever possible however there is still a couple descriptions that I've had to hard type. A likely follow up would be to change those to also use JSON.

Implements the initial steps for the Medical Menu, changes including; ~keybindings.json - Adds 'View Medical' hotkey under 'N' ~action.cpp / ~action.h / ~avatar.h / handle_action.cpp / game.cpp - Adds the corresponding action to 'View Medical' +medical_ui.cpp - Menu implementation ~display.h / display.cpp - Exposes bodypart_status_colors

src/medical_ui.cpp

nexusmrsep · 2022-01-25T07:00:21Z

Perhaps it can be extension/branch of @ menu in keybinding also? I mean: one tap @ opens the existing character / player info menu, second tap within @ opens up medical menu. This might potentially save some keys and keep important info in one branch of menus.

redrosedialtone · 2022-01-25T07:20:42Z

Perhaps it can be extension/branch of @ menu in keybinding also? I mean: one tap @ opens the existing character / player info menu, second tap within @ opens up medical menu. This might potentially save some keys and keep important info in one branch of menus.

I was actually planning on this, just keeping the starting implementation to having as minimal an impact on any other parts of the game as possible. Don't want to meddle too much with a codebase I'm unfamiliar with for a first commit lol.

Removal of a couple variables left behind from previous implementation, correct character casting.

Venera3 · 2022-01-25T07:29:44Z

Can you include the limb scores (especially those that are HP-scaled) in the right-side readout for the relevant limb? It would help emphasise the point that not only the last hp is important.

PatrikLundell · 2022-01-25T10:37:57Z

Have you tested it with weird anatomies (such as e.g. mutated characters with extra limbs)?

Maleclypse · 2022-01-25T15:40:00Z

This is pretty cool! :)

-Access from Player Info ('@') Menu -Info Menu -Scrolling Text -Formatting -Astyle & Clang Tidy

redrosedialtone · 2022-02-03T03:06:35Z

Perhaps it can be extension/branch of @ menu in keybinding also? I mean: one tap @ opens the existing character / player info menu, second tap within @ opens up medical menu. This might potentially save some keys and keep important info in one branch of menus.

Done, don't know why I was trying to limit the scope of the pull request when it's just another key binding.

Can you include the limb scores (especially those that are HP-scaled) in the right-side readout for the relevant limb? It would help emphasise the point that not only the last hp is important.

Done.

Maleclypse · 2022-02-04T06:08:07Z

Merge conflicts cropped up. Hopefully just a rebase.

redrosedialtone · 2022-02-04T08:15:49Z

Merge conflicts cropped up. Hopefully just a rebase.

I was using the widget functions in [#54531] to display the bodypart_status which has now been replaced in [#54693]. Up to this point the codebase has been easy to understand with precedence, but widgets are a little lost to me as they're never directly referenced in the C++ side of things. I honestly can't tell how to access the equivalent to the removed code in #54693 lol.

dseguin · 2022-02-04T15:34:54Z

Sorry about that, didn't realize that was being referenced here. Try display::limb_color, as that's what the hardcoded sidebar panels use.

Cataclysm-DDA/src/display.cpp

Lines 841 to 842 in 9fb7080

    
           nc_color display::limb_color( const Character &u, const bodypart_id &bp, bool bleed, bool bite, 
        
                                         bool infect )

src/medical_ui.cpp

Removed temporarily until the widget implementation is less in-progress; Code cleanup.

Maleclypse · 2022-03-12T18:32:10Z

@redrosedialtone can you check your account to see if there’s anything you need to verify in order to unflag your account with GitHub so we can run tests on your PR?

data/raw/keybindings.json

Maleclypse · 2022-03-16T03:39:13Z

@Venera3 Suggestions on how to make this successful with limbs?

…into medical_menu

# Explain why this change is being made # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes CleverRaven#1234, closes CleverRaven#2345, resolves CleverRaven#3456, references CleverRaven#4567

# |<-- Using around 50, Maximum 72 Characters -->| # Explain why this change is being made # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes CleverRaven#1234, closes CleverRaven#2345, resolves CleverRaven#3456, references CleverRaven#4567

Night-Pryanik · 2022-03-20T07:28:03Z

Could you please post a screenshot with Near starving, Very thirsty, Dead Tired, and in Unmanageable pain character? I want to see all top-right indicators with largest descriptions simultaneously.

Also I want to tell you not to be stingy on dimensions of your UI. In particular, please consider making width of your menu larger, like that of Bionics, Mutations, or Missions menus.

redrosedialtone · 2022-03-22T07:45:20Z

Could you please post a screenshot with Near starving, Very thirsty, Dead Tired, and in Unmanageable pain character? I want to see all top-right indicators with largest descriptions simultaneously.

Also I want to tell you not to be stingy on dimensions of your UI. In particular, please consider making width of your menu larger, like that of Bionics, Mutations, or Missions menus.

This'll definitely be necessary to include any further information.

# |<-- Using around 50, Maximum 72 Characters -->| # Explain why this change is being made # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes CleverRaven#1234, closes CleverRaven#2345, resolves CleverRaven#3456, references CleverRaven#4567

src/medical_ui.cpp

# |<-- Using around 50, Maximum 72 Characters -->| # Explain why this change is being made # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes CleverRaven#1234, closes CleverRaven#2345, resolves CleverRaven#3456, references CleverRaven#4567

dseguin · 2022-04-18T16:55:13Z

Merged & tested locally, looks good to go. Great work!

mqrause reviewed Jan 25, 2022

View reviewed changes

src/medical_ui.cpp Outdated Show resolved Hide resolved

github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jan 25, 2022

[Medical Menu] Basic Build and Test (GCC 9, Curses, LTO) Styling

7ff75ee

Removal of a couple variables left behind from previous implementation, correct character casting.

github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 25, 2022

Maleclypse added Controls / Input Keyboard, mouse, keybindings, input UI, etc. [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON labels Jan 25, 2022

[Medical Menu] Extended Implementation

0b76a43

-Access from Player Info ('@') Menu -Info Menu -Scrolling Text -Formatting -Astyle & Clang Tidy

github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Feb 4, 2022

Merge branch 'master' into medical_menu

a7493d7

BrettDong reviewed Feb 7, 2022

View reviewed changes

src/medical_ui.cpp Outdated Show resolved Hide resolved

BrettDong reviewed Feb 7, 2022

View reviewed changes

src/medical_ui.cpp Outdated Show resolved Hide resolved

BrettDong reviewed Feb 7, 2022

View reviewed changes

src/medical_ui.cpp Outdated Show resolved Hide resolved

BrettDong reviewed Feb 7, 2022

View reviewed changes

src/medical_ui.cpp Outdated Show resolved Hide resolved

BrettDong reviewed Feb 7, 2022

View reviewed changes

src/medical_ui.cpp Show resolved Hide resolved

redrosedialtone added 2 commits February 9, 2022 11:23

Merge branch 'master' into medical_menu

5977c0c

[Medical Menu] Removal of widget dependency

0601451

Removed temporarily until the widget implementation is less in-progress; Code cleanup.

Maleclypse reviewed Mar 16, 2022

View reviewed changes

data/raw/keybindings.json Outdated Show resolved Hide resolved

Update data/raw/keybindings.json

3d4ab9c

github-actions bot added the astyled astyled PR, label is assigned by github actions label Mar 16, 2022

redrosedialtone added 3 commits March 20, 2022 15:51

Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA …

43e5fb3

…into medical_menu

github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 20, 2022

kevingranade reviewed Mar 25, 2022

View reviewed changes

src/medical_ui.cpp Outdated Show resolved Hide resolved

kevingranade and others added 2 commits March 24, 2022 17:43

Update src/medical_ui.cpp

512c38d

dseguin merged commit cf799ab into CleverRaven:master Apr 18, 2022

dseguin mentioned this pull request Apr 19, 2022

Fix medical UI / addictions compile error #56910

Merged

perryprog mentioned this pull request Apr 29, 2022

Body Graph UI #57222

Merged

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Medical Menu Implementation #54763

Medical Menu Implementation #54763

redrosedialtone commented Jan 25, 2022 •

edited

Loading

nexusmrsep commented Jan 25, 2022

redrosedialtone commented Jan 25, 2022

Venera3 commented Jan 25, 2022

PatrikLundell commented Jan 25, 2022

Maleclypse commented Jan 25, 2022

redrosedialtone commented Feb 3, 2022

Maleclypse commented Feb 4, 2022

redrosedialtone commented Feb 4, 2022

dseguin commented Feb 4, 2022

Maleclypse commented Mar 12, 2022

Maleclypse commented Mar 16, 2022

Night-Pryanik commented Mar 20, 2022

redrosedialtone commented Mar 22, 2022

dseguin commented Apr 18, 2022

Medical Menu Implementation #54763

Medical Menu Implementation #54763

Conversation

redrosedialtone commented Jan 25, 2022 • edited Loading

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

nexusmrsep commented Jan 25, 2022

redrosedialtone commented Jan 25, 2022

Venera3 commented Jan 25, 2022

PatrikLundell commented Jan 25, 2022

Maleclypse commented Jan 25, 2022

redrosedialtone commented Feb 3, 2022

Maleclypse commented Feb 4, 2022

redrosedialtone commented Feb 4, 2022

dseguin commented Feb 4, 2022

Maleclypse commented Mar 12, 2022

Maleclypse commented Mar 16, 2022

Night-Pryanik commented Mar 20, 2022

redrosedialtone commented Mar 22, 2022

dseguin commented Apr 18, 2022

redrosedialtone commented Jan 25, 2022 •

edited

Loading