Skip to content

Commit

Permalink
Clean up and organize item info panel (CleverRaven#38030)
Browse files Browse the repository at this point in the history
(cherry picked from commit ea2c098)
  • Loading branch information
wapcaplet authored and tung committed Jun 23, 2020
1 parent 77a657b commit 24920c8
Show file tree
Hide file tree
Showing 9 changed files with 1,507 additions and 788 deletions.
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

0 comments on commit 24920c8

Please sign in to comment.