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.

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

new bionics menu #34061

Closed
wants to merge 230 commits into from
Closed

new bionics menu #34061

wants to merge 230 commits into from

Conversation

akozhevn
Copy link
Contributor

Summary

SUMMARY: Interface "Improveing bionics menu UX"

Purpose of change

Hard to find desired bionic in the menu.

Describe the solution

Add more tabs for different bionics categories
CBM description is always on the screen
Data is tabulated

Describe alternatives you've considered

There might be better ways to categorize. I was conservative, so if CBM can fit into multiple it just goes into 'other'.
Faulty can be put as passive with different color

Additional context

Categories are controlled by .json, so it's easy to modify.
Sensory - how you percieve the world (eyes, ears, sonar...)
Internal - internal body functions (blood, brain, muscles...)

bionics2
bionics3
bionics1

src/init.cpp Show resolved Hide resolved
src/bionics_ui.cpp Outdated Show resolved Hide resolved
src/bionics_ui.cpp Outdated Show resolved Hide resolved
src/bionics_ui.cpp Outdated Show resolved Hide resolved
src/bionics_ui.cpp Outdated Show resolved Hide resolved
Also added reset for SkillDisplayType
Copy link
Contributor

@AMurkin AMurkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double sentence spacing after periods.

src/bionics_ui.cpp Outdated Show resolved Hide resolved
src/bionics_ui.cpp Outdated Show resolved Hide resolved
src/bionics_ui.cpp Outdated Show resolved Hide resolved
src/bionics_ui.cpp Outdated Show resolved Hide resolved
src/bionics_ui.cpp Outdated Show resolved Hide resolved
src/bionics_ui.cpp Show resolved Hide resolved
@AMurkin
Copy link
Contributor

AMurkin commented Sep 17, 2019

Tabs with passive/inactivatable CBMs have columns too. Not sure if this is a problem, but they take up space.

src/bionics.h Outdated Show resolved Hide resolved
@ZhilkinSerg ZhilkinSerg added [C++] Changes (can be) made in C++. Previously named `Code` Bionics CBM (Compact Bionic Modules) Info / User Interface Game - player communication, menus, etc. labels Sep 17, 2019
@akozhevn
Copy link
Contributor Author

Tabs with passive/inactivatable CBMs have columns too. Not sure if this is a problem, but they take up space.

Added a field in json to hide those

@AMurkin
Copy link
Contributor

AMurkin commented Sep 18, 2019

It shows No bionics installed. when I have no CBMs in the Weapon tab probably.
Tab and backtab in this case do nothing, but invlets do.
UI

src/bionics_ui.cpp Outdated Show resolved Hide resolved
cleaning up code a little
fixing help keybinding
fixing Return crashing with empty list
@ZhilkinSerg ZhilkinSerg self-assigned this Sep 19, 2019
@Fris0uman
Copy link
Contributor

Can you add documentation for "display_type" and for the new jsonbionicsDisplayType.json ?

@ZhilkinSerg ZhilkinSerg removed their assignment Oct 13, 2019
Merge branch 'master' into bionics_ui

# Conflicts:
#	data/json/bionics.json
#	src/bionics_ui.cpp
#	src/skill.cpp
@ZhilkinSerg ZhilkinSerg changed the base branch from dev to master April 2, 2020 19:59
@kevingranade
Copy link
Member

I'm afraid this was bad timing, this was large but I don't think it was originally as large as the eat menu changes, but it has horrific conflicts now, feel free to reopen if you feel like working on it again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bionics CBM (Compact Bionic Modules) [C++] Changes (can be) made in C++. Previously named `Code` Info / User Interface Game - player communication, menus, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.