Skip to content

Commit

Permalink
Merge pull request #37720 from snipercup/armor-modern-json-name-to-ob…
Browse files Browse the repository at this point in the history
…ject

armor modern json name to object
  • Loading branch information
ZhilkinSerg authored Feb 5, 2020
2 parents 67ccc91 + e391f5a commit 078763e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 22 deletions.
6 changes: 2 additions & 4 deletions data/json/items/armor/boots.json
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,7 @@
"id": "boots_lsurvivor",
"type": "ARMOR",
"category": "armor",
"name": "pair of light survivor boots",
"name_plural": "pairs of light survivor boots",
"name": { "str": "pair of light survivor boots", "str_pl": "pairs of light survivor boots" },
"description": "A pair of customized, kevlar armored cloth boots, modified to provide maximum protection from harm, even when knee-deep in the dead.",
"weight": "1120 g",
"volume": "2 L",
Expand Down Expand Up @@ -564,8 +563,7 @@
"id": "golf_shoes",
"repairs_like": "boots",
"type": "ARMOR",
"name": "pair of golf shoes",
"name_plural": "pairs of golf shoes",
"name": { "str": "pair of golf shoes", "str_pl": "pairs of golf shoes" },
"description": "Snug fit sport shoes with hard ridges on the bottom.",
"weight": "820 g",
"volume": "1500 ml",
Expand Down
6 changes: 2 additions & 4 deletions data/json/items/armor/gloves.json
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,7 @@
{
"id": "gloves_liner",
"type": "ARMOR",
"name": "pair of glove liners",
"name_plural": "pairs of glove liners",
"name": { "str": "pair of glove liners", "str_pl": "pairs of glove liners" },
"description": "A pair of thin cotton gloves. Often used as a liner beneath other gloves.",
"weight": "63 g",
"volume": "250 ml",
Expand All @@ -407,8 +406,7 @@
"id": "gloves_lsurvivor",
"type": "ARMOR",
"category": "armor",
"name": "pair of light survivor gloves",
"name_plural": "pairs of light survivor gloves",
"name": { "str": "pair of light survivor gloves", "str_pl": "pairs of light survivor gloves" },
"description": "A pair of customized, Kevlar armored cloth gloves, modified to be easy to wear while providing maximum protection under extreme conditions.",
"weight": "190 g",
"volume": "750 ml",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/armor/legs_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,7 @@
"id": "pants_survivor",
"type": "ARMOR",
"category": "armor",
"name": "survivor cargo pants",
"name_plural": "survivor cargo pants",
"name": { "str": "survivor cargo pants", "str_pl": "survivor cargo pants" },
"description": "A pair of Kevlar armored pants covered with pouches and pockets. Custom built to be durable, comfortable, and easy to wear.",
"weight": "2100 g",
"volume": "3 L",
Expand Down
15 changes: 5 additions & 10 deletions data/json/items/armor/legs_clothes.json
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,7 @@
"id": "pants",
"repairs_like": "jeans",
"type": "ARMOR",
"name": "pants",
"name_plural": "pants",
"name": { "str": "pants", "str_pl": "pants" },
"description": "A pair of khaki pants. Slightly warmer than jeans.",
"weight": "560 g",
"volume": "2 L",
Expand Down Expand Up @@ -359,8 +358,7 @@
{
"id": "pants_cargo",
"type": "ARMOR",
"name": "cargo pants",
"name_plural": "cargo pants",
"name": { "str": "cargo pants", "str_pl": "cargo pants" },
"description": "A pair of pants lined with pockets, offering lots of storage.",
"weight": "670 g",
"volume": "2250 ml",
Expand All @@ -381,8 +379,7 @@
"id": "pants_checkered",
"repairs_like": "jeans",
"type": "ARMOR",
"name": "checkered pants",
"name_plural": "checkered pants",
"name": { "str": "checkered pants", "str_pl": "checkered pants" },
"description": "In a pinch, these pants can be used for an impromptu game of checkers.",
"weight": "630 g",
"volume": "1250 ml",
Expand Down Expand Up @@ -611,8 +608,7 @@
"id": "striped_pants",
"repairs_like": "jeans",
"type": "ARMOR",
"name": "striped pants",
"name_plural": "striped pants",
"name": { "str": "striped pants", "str_pl": "striped pants" },
"description": "A pair of pants with horizontal black and white stripes.",
"weight": "560 g",
"volume": "2 L",
Expand All @@ -634,8 +630,7 @@
"id": "technician_pants_gray",
"repairs_like": "jeans",
"type": "ARMOR",
"name": "work pants",
"name_plural": "pairs of work pants",
"name": { "str": "work pants", "str_pl": "pairs of work pants" },
"description": "A pair of gray work pants.",
"weight": "520 g",
"volume": "2 L",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/armor/torso_clothes.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@
"id": "dress",
"repairs_like": "jeans",
"type": "ARMOR",
"name": "dress",
"name_plural": "dresses",
"name": { "str": "dress", "str_pl": "dresses" },
"description": "A long cotton dress. Though comfortable to wear, it lacks any storage space.",
"weight": "680 g",
"volume": "3500 ml",
Expand Down

0 comments on commit 078763e

Please sign in to comment.