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

Clean up and organize item info panel #38030

Merged
merged 63 commits into from
Apr 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
b0aee96
Standardize unformatted colon after headings
wapcaplet Feb 11, 2020
ada7797
Add item::armor_protection_info, item::armor_fit_info
wapcaplet Feb 11, 2020
6ed87ae
Factor out `item::bionic_info`
wapcaplet Feb 11, 2020
0385b06
Fix spelling of INCENDIARY
wapcaplet Feb 11, 2020
a5ec129
Adjust iteminfo tests to put colon after heading
wapcaplet Feb 13, 2020
b0c1822
Factor out item::repair_info
wapcaplet Feb 13, 2020
b6d8aeb
Fix repair_info backwards logic
wapcaplet Feb 13, 2020
1b7be85
Regroup qualities, repair, and diassembly
wapcaplet Feb 14, 2020
8aba396
Move separator above conductivity
wapcaplet Feb 15, 2020
7c603a3
Un-bold 'Volume' in item description
wapcaplet Feb 15, 2020
8acd907
Add quality test for scissor jack
wapcaplet Feb 15, 2020
aa5c368
Move Material under Volume/Weight/Rigidity
wapcaplet Feb 15, 2020
4d09927
Include rigidity for rigid items; rephrase & test
wapcaplet Feb 15, 2020
27cd5fe
Do NOT indicate rigidity for rigid items
wapcaplet Feb 15, 2020
b34cf1a
Un-bold repair/disassembly headings; cleanup
wapcaplet Feb 15, 2020
daf2a84
Improve translation for repair indicators
wapcaplet Feb 15, 2020
4765b67
Move item description below more basic info
wapcaplet Feb 15, 2020
566ee28
Group Owner/Price/Barter value
wapcaplet Feb 15, 2020
98224e5
Embolden Repair and Disassembly keywords
wapcaplet Feb 15, 2020
149ee9c
Factor out item::combat_info
wapcaplet Feb 15, 2020
303dbae
Add Damage heading to items with melee damage
wapcaplet Feb 15, 2020
f720e30
Add tests for item damage section
wapcaplet Feb 15, 2020
500cb26
Shorten and standardize item flag indicators
wapcaplet Feb 15, 2020
7edb698
Replace a few more 'this item' with 'it'
wapcaplet Feb 15, 2020
acf644c
Factor out item::contents_info
wapcaplet Feb 15, 2020
c6cca50
Re-use variables declared earlier
wapcaplet Feb 15, 2020
05d2f14
Move techniques to end of combat info
wapcaplet Feb 15, 2020
b384915
Fix test case (this item -> it)
wapcaplet Feb 15, 2020
dabcf41
Move container_info near contents_info
wapcaplet Feb 15, 2020
d4dfede
Ammunition/ammunition type heading
wapcaplet Feb 15, 2020
17ed7c8
Move Owner/Price/Barter value to bottom of info
wapcaplet Feb 16, 2020
5397f39
Revert 'this item' changes made in earlier commits
wapcaplet Feb 16, 2020
e1aa79d
Minor gun info cleanup
wapcaplet Feb 16, 2020
7a98a04
Add data/json/TEST with jsons for iteminfo tests
wapcaplet Feb 16, 2020
a22f442
Reduce boldness in uses info for consistency
wapcaplet Feb 17, 2020
35134e3
Move item uses section above repair/disassembly
wapcaplet Feb 17, 2020
ac6e1c8
Move techniques above average melee damage
wapcaplet Feb 17, 2020
eae8cdf
Bold 'Covers'; add separation before qualities
wapcaplet Feb 17, 2020
d76a5d9
Merge branch 'master' into iteminfo-cleanup
wapcaplet Feb 17, 2020
853601c
Move data/json/TEST to data/mods/TEST_DATA
wapcaplet Feb 17, 2020
463e31b
Mark TEST_DATA mod as obsolete (not really tho)
wapcaplet Feb 17, 2020
49f50d5
Move most iteminfo test items to TEST_DATA
wapcaplet Feb 17, 2020
9eb2895
Attempt workaround for apple compiler
wapcaplet Feb 17, 2020
c409d0d
Flesh out test data mod readme
wapcaplet Feb 17, 2020
691af73
Distinguish melee from ranged ramage; formatting
wapcaplet Feb 17, 2020
53043e9
Rearrange ranged weapon ratings; use color
wapcaplet Feb 17, 2020
3ccd72a
Move maximum range up (just below damage line)
wapcaplet Feb 17, 2020
4c47140
Merge branch 'master' into iteminfo-cleanup
wapcaplet Feb 18, 2020
61465ab
Fix astyle check
wapcaplet Feb 18, 2020
06af1f3
Rephrase/move "not rigid" indicator; add tests
wapcaplet Feb 18, 2020
6ea8196
Material, Category, Volume, Weight, Owner
wapcaplet Feb 19, 2020
69849d4
No, Material/Volume/Weight/Owner/Category
wapcaplet Feb 19, 2020
bbc8909
Wrap iteminfo_query constructor
wapcaplet Feb 20, 2020
4d9d9ff
Merge branch 'master' into iteminfo-cleanup
wapcaplet Feb 20, 2020
d0999c8
Merge branch 'master' into iteminfo-cleanup
wapcaplet Feb 24, 2020
4476ed6
Merge branch 'master' into iteminfo-cleanup
wapcaplet Feb 27, 2020
455b894
Merge branch 'master' into iteminfo-cleanup
wapcaplet Mar 3, 2020
0e574e4
Merge branch 'master' into iteminfo-cleanup
wapcaplet Mar 7, 2020
6660efa
Merge branch 'master' into iteminfo-cleanup
wapcaplet Mar 8, 2020
5b8fbc4
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA…
wapcaplet Mar 28, 2020
0f6e470
Merge branch 'master' into iteminfo-cleanup
wapcaplet Apr 3, 2020
61abbef
Merge branch 'master' into iteminfo-cleanup
wapcaplet Apr 3, 2020
b2507af
Merge branch 'master' into iteminfo-cleanup
wapcaplet Apr 4, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions data/json/flags.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@
"id": "CLIMATE_CONTROL",
"type": "json_flag",
"context": [ "ARMOR", "TOOL_ARMOR" ],
"info": "This piece of clothing has <info>built-in or attached climate control</info>, keeping you at a <good>comfortable temperature</good>."
"info": "This clothing has <info>built-in or attached climate control</info>, keeping you at a <good>comfortable temperature</good>."
},
{
"id": "COLLAR",
"type": "json_flag",
"context": [ "ARMOR", "TOOL_ARMOR" ],
"info": "This piece of clothing has a <info>wide collar</info> that can keep your mouth warm if it is unencumbered."
"info": "This clothing has a <info>wide collar</info> that can keep your mouth warm if it is unencumbered."
},
{
"id": "DEAF",
Expand Down Expand Up @@ -160,7 +160,7 @@
"type": "json_flag",
"context": [ "ARMOR", "TOOL_ARMOR" ],
"//": "Wearing this clothing gives a morale bonus if the player has the Stylish trait.",
"info": "This piece of clothing is <info>fancy</info>.",
"info": "This clothing is <info>fancy</info>.",
"conflicts": [ "SUPER_FANCY" ]
},
{
Expand Down Expand Up @@ -237,7 +237,7 @@
"id": "HOOD",
"type": "json_flag",
"context": [ "ARMOR", "TOOL_ARMOR" ],
"info": "This piece of clothing has a <info>hood</info> to keep your head warm if your head is unencumbered."
"info": "This clothing has a <info>hood</info> to keep your head warm if your head is unencumbered."
},
{
"id": "HYGROMETER",
Expand Down Expand Up @@ -308,7 +308,7 @@
"id": "UNDERSIZE",
"type": "json_flag",
"context": [ "ARMOR", "TOOL_ARMOR" ],
"//": "Can be worn comfortably by mutants with Tiny or Unassuming. Too small for anyone else."
"//": "This clothing can be worn comfortably by mutants with Tiny or Unassuming. Too small for anyone else."
},
{
"id": "PARTIAL_DEAF",
Expand Down Expand Up @@ -376,7 +376,7 @@
"type": "json_flag",
"context": [ "ARMOR", "TOOL_ARMOR" ],
"//": "Prevents the covered body-part(s) from getting wet in the rain.",
"info": "This piece of clothing is designed to keep you <info>dry</info> in the rain."
"info": "This clothing is designed to keep you <info>dry</info> in the rain."
},
{
"id": "RESTRICT_HANDS",
Expand Down
Loading