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

Shorter item status and coloring² #11209

Merged
merged 17 commits into from Feb 14, 2015

Conversation

Projects
None yet
6 participants
@OzoneH3
Copy link
Member

commented Feb 11, 2015

Cherry picked version of #11190 after messing up a merge.

After popular demand item hp option default set to true.

Todo:

  • Find all the places where wprint has to be replaced with fold_and_print
  • fold_and_print has problems with longer item names, have to find a way to trim first without loosing coloring

Went through all the menus I could find and everything seems ok for now.

@Asmageddon

This comment has been minimized.

Copy link
Contributor

commented Feb 11, 2015

Oh god yes. Item status was always something of a pain, this looks wonderful.

@OzoneH3 OzoneH3 changed the title [WIP][CR] Shorter item status and coloring² Shorter item status and coloring² Feb 11, 2015

@KA101 KA101 self-assigned this Feb 11, 2015

OzoneH3 added some commits Feb 11, 2015

New function trim_and_print() trims at width like trim_to but keeps t…
…he coloring.

Changed all modified fold_to_print into trim_and_print.
@KA101

This comment has been minimized.

Copy link
Contributor

commented Feb 12, 2015

One major issue: when looking at the NPC window, etc, these get displayed with color tags shown rather than coloring. <color_light_green>|| </color>pair of sneakers, for example.

@KA101 KA101 removed their assignment Feb 12, 2015

@narc0tiq

This comment has been minimized.

Copy link
Contributor

commented Feb 12, 2015

Applying a damaged bandage will also show the color tags when it asks what you're using it on:
color_magenta bandage

@narc0tiq

This comment has been minimized.

Copy link
Contributor

commented Feb 12, 2015

Shows up as the wielded weapon, as well:
color_yellow baseball bat

OzoneH3 added some commits Feb 12, 2015

Wielded weapon display fix.
Use <medical> display fix.
NPC look at and trade dialog fixed.
@DavidKeaton

This comment has been minimized.

Copy link
Contributor

commented Feb 12, 2015

Agreed, this looks dope.

@KA101 KA101 self-assigned this Feb 12, 2015

@KA101

This comment has been minimized.

Copy link
Contributor

commented Feb 13, 2015

Weapons and first-aid gear fixed; NPC worn clothing not so much I'm afraid.

V-menu's got the same issue.

@KA101 KA101 removed their assignment Feb 13, 2015

OzoneH3 added some commits Feb 13, 2015

Merge branch 'master' into item_hp
Conflicts:
	src/game.cpp
@OzoneH3

This comment has been minimized.

Copy link
Member Author

commented Feb 13, 2015

Is there another npc inventory than this: http://i.imgur.com/6pOfAvV.png Can't find another.
V-menu's one of the first I changed and it's working here ?!

PS: Seems like I'm too bumb to merge with an updated master to get this thing to merge properly after resolvong a conflict ..

@narc0tiq

This comment has been minimized.

Copy link
Contributor

commented Feb 13, 2015

Trade interface, maybe?

On Fri, Feb 13, 2015 at 12:15 PM, OzoneH3 notifications@github.com wrote:

Is there another npc inventory than this: http://i.imgur.com/6pOfAvV.png
Can't find another.
V-menu's one of the first I changed and it's working here ?!

PS: Seems like I'm too bumb to merge with an updated master to get this
thing to merge properly after resolvong a conflict ..


Reply to this email directly or view it on GitHub
#11209 (comment)
.

@OzoneH3

This comment has been minimized.

Copy link
Member Author

commented Feb 13, 2015

No, got the trad interface covered as well.

@KA101

This comment has been minimized.

Copy link
Contributor

commented Feb 13, 2015

Farlook function; the x or ; keys, not the inventory.

@OzoneH3

This comment has been minimized.

Copy link
Member Author

commented Feb 13, 2015

Gotcha, fixed. Pretty hard to find all those menus :(

@KA101

This comment has been minimized.

Copy link
Contributor

commented Feb 14, 2015

Sorry for the unclarity on my part. :-(

@KA101 KA101 self-assigned this Feb 14, 2015

@KA101 KA101 merged commit 9b05036 into CleverRaven:master Feb 14, 2015

1 check failed

default Unmergeable pull request.

@OzoneH3 OzoneH3 deleted the OzoneH3:item_hp branch Feb 14, 2015

@moist-zombie

This comment has been minimized.

Copy link

commented Feb 14, 2015

Extra color schemes for a colorblind mode, or at least an optional toggle to the original setting in options? I'm not colorblind myself, but I've considered something like this before and thought about it then :>

@OzoneH3

This comment has been minimized.

Copy link
Member Author

commented Feb 14, 2015

There is an option in "Interface" -> "Show Item health bars" to switch back to the text based style.
Is there a colorblind mode? It's using the same colors as the armor sort screen atm.

OzoneH3 added a commit to OzoneH3/Cataclysm-DDA that referenced this pull request Jul 28, 2015

@OzoneH3 OzoneH3 referenced this pull request Jul 28, 2015

Merged

Bountydummy #13098

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.