Skip to content

Commit

Permalink
Armor modern json (#38563)
Browse files Browse the repository at this point in the history
* Volume to string, fix looks_like

* Name to object, volume to string
  • Loading branch information
ZhilkinSerg authored Mar 4, 2020
1 parent b220890 commit c8997ed
Show file tree
Hide file tree
Showing 12 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion data/json/items/armor/cloaks.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
{
"id": "cloak",
"type": "ARMOR",
"name": "cloak",
"name": { "str": "cloak" },
"description": "A heavy cloak meant to be thrown over your body.",
"weight": "1175 g",
"volume": "3 L",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/coats.json
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@
"id": "jacket_chef",
"repairs_like": "trenchcoat",
"type": "ARMOR",
"name": "chef's jacket",
"name": { "str": "chef's jacket" },
"description": "This double-breasted uniform is unusually thick to protect against the heat of the kitchen.",
"weight": "720 g",
"volume": "1750 ml",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/armor/hats.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@
{
"id": "cowboy_hat",
"type": "ARMOR",
"name": "cowboy hat",
"name": { "str": "cowboy hat" },
"description": "Whether yer hunting varmints, fixing up the ranch, or heading into the sunset, this is the hat for the job.",
"weight": "390 g",
"volume": "2 L",
"price": 9500,
"material": [ "leather" ],
"symbol": "[",
"looks_like": "bowlhat",
"looks_like": "bowhat",
"color": "brown",
"covers": [ "HEAD" ],
"coverage": 50,
Expand Down Expand Up @@ -201,7 +201,7 @@
{
"id": "hat_cotton",
"type": "ARMOR",
"name": "cotton hat",
"name": { "str": "cotton hat" },
"description": "A snug-fitting cotton hat. Quite warm.",
"weight": "78 g",
"volume": "250 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/armor/helmets.json
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
"id": "helmet_chitin",
"type": "ARMOR",
"category": "armor",
"name": "chitinous helmet",
"name": { "str": "chitinous helmet" },
"description": "A helmet made from the exoskeletons of insects. Covers the entire head; very light and durable.",
"weight": "1447 g",
"volume": "2500 ml",
Expand All @@ -235,7 +235,7 @@
"id": "helmet_conical",
"type": "ARMOR",
"category": "armor",
"name": "conical helm",
"name": { "str": "conical helm" },
"description": "A conical iron helm with additional protection for the neck, associated with the Mongol Empire.",
"weight": "1425 g",
"volume": "3500 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/hoods.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"id": "chainmail_hood",
"type": "ARMOR",
"category": "armor",
"name": "chainmail coif",
"name": { "str": "chainmail coif" },
"description": "A customized chainmail hood. Can be worn comfortably under helmets.",
"weight": "2006 g",
"volume": "500 ml",
Expand Down
30 changes: 15 additions & 15 deletions data/json/items/armor/jewelry.json
Original file line number Diff line number Diff line change
Expand Up @@ -242,10 +242,10 @@
{
"id": "collarpin",
"type": "ARMOR",
"name": "collar pin",
"name": { "str": "collar pin" },
"description": "A staple accessory for gentlemen. Keeps your shirt collar in place and provides a more aesthetically pleasing arc to your necktie. You can wear it if you like, but it won't provide any effects.",
"weight": "10 g",
"volume": 0,
"volume": "2 ml",
"price": 25000,
"price_postapoc": 200,
"material": [ "silver" ],
Expand All @@ -257,15 +257,15 @@
{
"id": "copper_bracelet",
"type": "ARMOR",
"name": "copper bracelet",
"name": { "str": "copper bracelet" },
"description": "An old-fashioned, copper bracelet. You can wear it if you like, but it won't provide any effects.",
"weight": "86 g",
"volume": 0,
"volume": "5 ml",
"price": 2500,
"price_postapoc": 100,
"material": [ "copper" ],
"symbol": "[",
"looks_like": "bracelet",
"looks_like": "silver_bracelet",
"color": "brown"
},
{
Expand All @@ -285,10 +285,10 @@
{
"id": "copper_hairpin",
"type": "ARMOR",
"name": "copper hairpin",
"name": { "str": "copper hairpin" },
"description": "A hairpin made from copper. You can wear it if you like, but it won't provide any effects.",
"weight": "2 g",
"volume": 0,
"volume": "2 ml",
"price": 500,
"price_postapoc": 500,
"material": [ "copper" ],
Expand All @@ -299,38 +299,38 @@
{
"id": "copper_locket",
"type": "ARMOR",
"name": "copper locket",
"name": { "str": "copper locket" },
"description": "A circular, copper locket. It's been tarnished with use, and has gained some dull green spots. You can wear it if you like, but it won't provide any effects.",
"weight": "45 g",
"volume": 0,
"volume": "10 ml",
"price": 1000,
"price_postapoc": 1000,
"material": [ "copper" ],
"symbol": "[",
"looks_like": "necklace",
"looks_like": "silver_necklace",
"color": "brown"
},
{
"id": "copper_necklace",
"type": "ARMOR",
"name": "copper necklace",
"name": { "str": "copper necklace" },
"description": "A simple chain of copper, with a clasp in the middle to create a necklace. You can wear it if you like, but it won't provide any effects.",
"weight": "30 g",
"volume": 0,
"volume": "10 ml",
"price": 3000,
"price_postapoc": 1000,
"material": [ "copper" ],
"symbol": "[",
"looks_like": "necklace",
"looks_like": "silver_necklace",
"color": "brown"
},
{
"id": "copper_ring",
"type": "ARMOR",
"name": "copper ring",
"name": { "str": "copper ring" },
"description": "A plain, copper ring. Not very shiny, and not very popular. You can wear it if you like, but it won't provide any effects.",
"weight": "50 g",
"volume": 0,
"volume": "2 ml",
"price": 2000,
"price_postapoc": 500,
"material": [ "copper" ],
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/armor/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "clown_wig",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "clown wig",
"name": { "str": "clown wig" },
"description": "A colorful and ridiculous wig fit for a clown.",
"weight": "125 g",
"volume": "1 L",
Expand All @@ -23,7 +23,7 @@
{
"id": "clown_nose",
"type": "ARMOR",
"name": "clown nose",
"name": { "str": "clown nose" },
"description": "A red latex nose often seen being worn by clowns.",
"weight": "150 g",
"volume": "100 ml",
Expand Down Expand Up @@ -189,10 +189,10 @@
{
"id": "tie_clipon",
"type": "ARMOR",
"name": "clip-on tie",
"name": { "str": "clip-on tie" },
"description": "A clip-on necktie, with blue and silver stripes. It's quick and easy to put on, and much better than the necktie.",
"weight": "10 g",
"volume": 0,
"volume": "20 ml",
"price": 500,
"material": [ "cotton" ],
"symbol": "[",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/suits_clothes.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"id": "clown_suit",
"repairs_like": "trenchcoat",
"type": "ARMOR",
"name": "clown suit",
"name": { "str": "clown suit" },
"description": "A colorful and ridiculous costume fit for a clown. Provides decent storage.",
"weight": "1420 g",
"volume": "5750 ml",
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/armor/suits_protection.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"id": "armor_chitin",
"type": "ARMOR",
"category": "armor",
"name": "chitinous armor",
"name": { "str": "chitinous armor" },
"description": "Leg and body armor made from the exoskeletons of insects. Light and durable.",
"weight": "2632 g",
"volume": "17500 ml",
Expand Down Expand Up @@ -378,7 +378,7 @@
"id": "chainmail_hauberk",
"type": "ARMOR",
"category": "armor",
"name": "chainmail hauberk",
"name": { "str": "chainmail hauberk" },
"description": "A fully customized chainmail outfit, leaving the head uncovered. The shirt, arms, and leggings have been modified with straps and combined with a gambeson to deal with uneven weight distribution, cold environments and to allow them to be used separately.",
"weight": "14430 g",
"volume": "2750 ml",
Expand All @@ -399,7 +399,7 @@
"id": "chainmail_suit",
"type": "ARMOR",
"category": "armor",
"name": "chainmail armor",
"name": { "str": "chainmail armor" },
"description": "A fully customized chainmail suit. The coif, shirt, arms, and leggings have been modified with straps and combined with a gambeson to deal with uneven weight distribution, cold environments and to allow them to be used separately.",
"weight": "16436 g",
"volume": "3250 ml",
Expand Down Expand Up @@ -438,7 +438,7 @@
{
"id": "cleansuit",
"type": "ARMOR",
"name": "cleansuit",
"name": { "str": "cleansuit" },
"description": "A simple hazardous materials handling suit. Though somewhat restrictive and fragile, wearing it will provide excellent protection against ambient radiation.",
"weight": "2100 g",
"volume": "2500 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/torso_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"id": "chainmail_vest",
"type": "ARMOR",
"category": "armor",
"name": "chainmail vest",
"name": { "str": "chainmail vest" },
"description": "A customized chainmail vest. It's a sleeveless piece of chainmail with small straps designed to better distribute the weight.",
"weight": "6953 g",
"volume": "1 L",
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/armor/undergarment.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{
"id": "army_top",
"type": "ARMOR",
"name": "camo tank top",
"name": { "str": "camo tank top" },
"description": "A sleeveless cotton shirt with camouflage dye. Very easy to move in.",
"weight": "78 g",
"volume": "250 ml",
Expand Down Expand Up @@ -199,7 +199,7 @@
{
"id": "camisole",
"type": "ARMOR",
"name": "camisole",
"name": { "str": "camisole" },
"description": "A small camisole made from silk. Typically used as an undergarment, they are light and easy to wear.",
"weight": "42 g",
"volume": "500 ml",
Expand All @@ -217,7 +217,7 @@
{
"id": "chestwrap",
"type": "ARMOR",
"name": "chestwrap",
"name": { "str": "chestwrap" },
"description": "Rags wrapped around the chest. Preserves your modesty and keeps things out of the way, but not good for much else.",
"weight": "64 g",
"volume": "500 ml",
Expand Down Expand Up @@ -516,7 +516,7 @@
{
"id": "under_armor",
"type": "ARMOR",
"name": "compression top",
"name": { "str": "compression top" },
"description": "Nylon sportswear that clings to your chest and maintains body temperature.",
"weight": "92 g",
"volume": "250 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
{
"id": "welding_mask_crude",
"type": "ARMOR",
"name": "crude welding mask",
"name": { "str": "crude welding mask" },
"description": "A crude welding mask made from shaped steel. It's less dark than a proper welding mask, and therefore less difficult to see in, but also less protective when welding. Activate it to push it up your head.",
"weight": "4 kg",
"volume": "4 L",
Expand Down

0 comments on commit c8997ed

Please sign in to comment.