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

Update materials section of JSON_INFO.md #36476

Merged
merged 4 commits into from
Dec 31, 2019
Merged

Conversation

Jerimee
Copy link
Contributor

@Jerimee Jerimee commented Dec 26, 2019

Summary

Summary: None

Additional Context

Added chip_resist

@ZhilkinSerg ZhilkinSerg added <Documentation> Design documents, internal info, guides and help. [Markdown] Markdown issues and PRs labels Dec 27, 2019
doc/JSON_INFO.md Outdated Show resolved Hide resolved
@Jerimee
Copy link
Contributor Author

Jerimee commented Dec 27, 2019 via email

@ZhilkinSerg
Copy link
Contributor

I'm confused. I don't understand.

On Fri, Dec 27, 2019, 3:51 AM ZhilkinSerg @.***> wrote: @ZhilkinSerg commented on this pull request. ------------------------------ In doc/JSON_INFO.md <#36476 (comment)> : > @@ -473,12 +473,13 @@ The syntax listed here is still valid. | name | In-game name displayed. | bash_resist | How well a material resists bashing damage. | cut_resist | How well a material resists cutting damage. +| acid_resist | Ability of a material to resist acid. Metal should be 0. Complete resistance is 3. +| elec_resist | Ability of a material to resist electricity. +| fire_resist | Ability of a material to resist fire. +| chip_resist | Ability of a material to resist chipping (like from a chisel?).

Cataclysm-DDA/src/item.h

Lines 949 to 954 in 582be4f

/**
* Returns resistance to being damaged by attack against the item itself.
* Calculated from item's materials.
* @param worst If this is true, the worst resistance is used. Otherwise the best one.
*/
int chip_resistance( bool worst = false ) const;
— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#36476?email_source=notifications&email_token=AAU2VNK3PI5P2H3SUP4K5GTQ2W6XTA5CNFSM4J7P57TKYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCQI4HSQ#pullrequestreview-336708554>, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAU2VNOL6VKXSI2DIIM7Q33Q2W6XTANCNFSM4J7P57TA .

Comment in the code explains what chipping resistance is.

@Jerimee
Copy link
Contributor Author

Jerimee commented Dec 28, 2019

Yeah but I don't know what

Returns resistance to being damaged by attack against the item itself.

means. Maybe it means: If bad guy attacks my backpack instead of me, then chip_resist may come into play?

Instead of "Ability of a material to resist chipping (like from a chisel?)." what should I write? I'm just going to leave it blank for the moment. Someone who knows what they are talking about can fill it in.

Also, glancing at that code seems to confirm that stab_resist is a thing. Should I add that? Presumably with note: "How well a material resists piercing damage."

@I-am-Erk
Copy link
Member

Thanks for the update!

As before please stop adding changes that aren't described in your PR. If you're doing more than just adding chip resistance then mention that you do more. Even if it's just to say "also reorganized the order a bit".

doc/JSON_INFO.md Outdated Show resolved Hide resolved
doc/JSON_INFO.md Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Documentation> Design documents, internal info, guides and help. [Markdown] Markdown issues and PRs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants