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

Adjust seasonal colors of certain flower furnitures to improve visibility #35168

Merged
merged 2 commits into from
Nov 7, 2019

Conversation

miso-nikomi-nasu
Copy link
Contributor

Since I can't speak English, this sentence has been translated through google.
I'm sorry if there is something strange in the text.
I am sorry if there is something strange because this is my first pull request.

How to use

It is terrain data.
Correction of inadequate adjustments and errors in the console display.

Summary

SUMMARY: Bugfixes "Terrain adjustment'"

Purpose of change

Most of the correction and adjustment of the terrain setting mistakes that are often seen mainly in forest areas.
In addition, by changing the color of the furniture, such as flowers, it improves visual intelligibility.

Describe the solution

Current terrain(Animated gif)
https://i.imgur.com/aS8T4ic.gif

"t_tree_mulberry",
"t_tree_elderberry",
"t_tree_juniper",
When it can actually be harvested,
The color settings that indicate harvestable are not engaged.

"t_tree_pine",
"t_tree_pine_harvested",
"t_tree_blackjack",
"t_tree_blackjack_harvested",
"t_shrub_blackberry",
"t_shrub_blackberry_harvested",
"t_shrub_peanut",
"t_shrub_peanut_harvested",
Color change is not set before and after harvesting, so it is indistinguishable.

"t_fern",
"t_fern_harvested",
However, it is set to reach the fruitful season in spring.
It is set to become a color that can be harvested in summer.
Color change is not set before and after harvesting, so it is indistinguishable.
Since the color and symbol are the same as "t_shrub", they cannot be distinguished.
A tactic that guides zombies over "t_shrub" (movement cost 400) and fights,
"t_fern" (movement cost 150) is a visual hindrance to the player.

"t_tree_birch",
Color setting is indistinguishable from general fruit trees.
In the past, there were few types of trees, and "light_green" was fine.
Now that various trees have increased, it has become difficult to understand visually.

"t_tree",
"t_tree_chestnut",
"t_tree_walnut",
"t_tree_beech",
"t_tree_hazelnut",
("t_tree_cottonwood",) I can't harvest anything
("t_tree_elm",) I can't harvest anything
Will be harvestable in the fall.
The color is "brown_green" and is indistinguishable.
It is a personal opinion, but is it better to color code?

"t_tree_cottonwood",
"t_tree_elm",
An ordinary tree with no harvest set,
It is set to a color that can be harvested in the fall.

"t_tree_hickory_dead",
If the color is "green" it will still appear alive,
Should be fixed.

In ornamental plants
"t_shrub_hydrangea",
"t_shrub_lilac",
The color setting of is indistinguishable from other plants that produce fruits, or is a color that seems to be mistaken.

"t_grass_tall",
This is a personal opinion.
Thanks to the color settings, it is difficult to distinguish from plants that produce fruits.

"f_black_eyed_susan",
This is a personal opinion.
The color setting is the same as "f_dandelion", so it's hard to see.
I think that it is "f_dandelion" and go to picking, and I am disappointed when it is different.
It is not necessary to change it forcibly. Should I change it?

"f_flower_tulip",
"f_lily",
"f_dahlia",
This is a personal opinion.
All are "magenta" and are indistinguishable.
It is not necessary to change it forcibly. Should I change it?

Describe alternatives you've considered

Proposed terrain(Animated gif)
https://i.imgur.com/hQfXrif.gif

Summarize only the parts that should be reported

"t_fern",
"t_fern_harvested",
Considering the same movement cost as "t_grass_long" (movement cost 150),
Change the symbol to ",".

The color settings have been greatly changed to prioritize sensory clarity.

"t_fern_harvested" changed "looks_like" to "t_grass_long".

"t_grass_tall",
Change the symbol to "'"
By making the color "green", it looks like "t_grass_long" has grown as it is.

I think it ’s easier to see than before.

Testing

Adapt the modified json,
A startup test was performed using "0.D-8891-gb0ce923".

It is terrain data.
Correction of inadequate adjustments and errors in the console display.
"looks_like": "t_underbrush",
"color": [ "green", "brown_green", "brown", "brown" ],
"color": [ "brown_green", "green", "green", "green" ],
Copy link
Contributor

Choose a reason for hiding this comment

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

The pull request checker dislikes the additional space here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was at a loss as to what was wrong.
Wasn't there extra space?
Thank you very much.

@fungusakafungus
Copy link
Contributor

Great work! Unfortunately, I do not play console version, but this pull request looks very well researched and documented.

@KorGgenT
Copy link
Member

for the .json files you changed, you need to paste the contents onto this webpage and then copy it back into the file. it will format the data so it will pass the JSON validation test.

@ifreund ifreund added <Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. labels Oct 30, 2019
The point indicated was corrected.

In addition, "t_tree_hickory" stayed the same color as "t_tree"
Fixed the problem.
@miso-nikomi-nasu
Copy link
Contributor Author

@KorGgenT
Thank you for the helpful information.

@mlangsdorf mlangsdorf changed the title Terrain adjustment Adjust seasonal colors of certain flower furnitures to improve visibility Nov 2, 2019
@ZhilkinSerg ZhilkinSerg merged commit 8291e8d into CleverRaven:master Nov 7, 2019
AMurkin pushed a commit to AMurkin/Cataclysm-DDA that referenced this pull request Nov 13, 2019
…lity (CleverRaven#35168)

* Terrain adjustment

It is terrain data.
Correction of inadequate adjustments and errors in the console display.

* Update terrain-flora.json

The point indicated was corrected.

In addition, "t_tree_hickory" stayed the same color as "t_tree"
Fixed the problem.
AMurkin added a commit to AMurkin/Cataclysm-DDA that referenced this pull request Nov 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants