From 5f3fa0e0463f66862f428ac5992a5db62415d8a0 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Sat, 15 Feb 2020 09:54:35 +0100 Subject: [PATCH] Armor name to object, fix looks_like, volume to string --- data/json/items/armor/arms_armor.json | 5 ++--- data/json/items/armor/boots.json | 27 +++++++++---------------- data/json/items/armor/eyewear.json | 9 +++------ data/json/items/armor/gloves.json | 20 +++++++----------- data/json/items/armor/jewelry.json | 5 ++--- data/json/items/armor/legs_clothes.json | 3 +-- 6 files changed, 24 insertions(+), 45 deletions(-) diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json index 3749802e590c4..8d4a75573e4c1 100644 --- a/data/json/items/armor/arms_armor.json +++ b/data/json/items/armor/arms_armor.json @@ -237,8 +237,7 @@ "id": "elbow_pads", "type": "ARMOR", "category": "armor", - "name": "pair of elbow pads", - "name_plural": "pairs of elbow pads", + "name": { "str": "pair of elbow pads", "str_pl": "pairs of elbow pads" }, "description": "A pair of elbow pads made of stout plastic and cloth.", "weight": "110 g", "volume": "750 ml", @@ -246,7 +245,7 @@ "to_hit": 1, "material": [ "plastic", "cotton" ], "symbol": "[", - "looks_like": "armguards_hard", + "looks_like": "armguard_hard", "color": "dark_gray", "covers": [ "ARMS" ], "coverage": 30, diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index adebe41a4677e..7f503ec80b4fc 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -2,8 +2,7 @@ { "id": "bastsandals", "type": "ARMOR", - "name": "pair of cord sandals", - "name_plural": "pairs of cord sandals", + "name": { "str": "pair of cord sandals", "str_pl": "pairs of cord sandals" }, "description": "Lightweight sandals made from wound cord. They offer little in the way of protection, but keep you cool during warmer months.", "weight": "68 g", "volume": "250 ml", @@ -131,8 +130,7 @@ "repairs_like": "boots_survivor", "type": "ARMOR", "category": "armor", - "name": "pair of combat boots", - "name_plural": "pairs of combat boots", + "name": { "str": "pair of combat boots", "str_pl": "pairs of combat boots" }, "description": "Modern reinforced tactical combat boots. Very durable.", "weight": "1060 g", "volume": "2 L", @@ -535,8 +533,7 @@ "id": "cleats", "repairs_like": "boots_larmor", "type": "ARMOR", - "name": "pair of cleats", - "name_plural": "pairs of cleats", + "name": { "str": "pair of cleats", "str_pl": "pairs of cleats" }, "description": "Sport shoes with hard undersides, and studs on the bottom designed to dig into the grass.", "weight": "860 g", "volume": "1500 ml", @@ -604,8 +601,7 @@ "id": "clownshoes", "repairs_like": "boots", "type": "ARMOR", - "name": "pair of clown shoes", - "name_plural": "pairs of clown shoes", + "name": { "str": "pair of clown shoes", "str_pl": "pairs of clown shoes" }, "description": "Gigantic shoes fit for a clown. Incredibly difficult to walk in.", "weight": "1140 g", "volume": "3500 ml", @@ -628,8 +624,7 @@ { "id": "dance_shoes", "type": "ARMOR", - "name": "pair of dance shoes", - "name_plural": "pairs of dance shoes", + "name": { "str": "pair of dance shoes", "str_pl": "pairs of dance shoes" }, "description": "Expensive black dance shoes with large heels.", "weight": "870 g", "volume": "1500 ml", @@ -652,8 +647,7 @@ "id": "dress_shoes", "repairs_like": "boots", "type": "ARMOR", - "name": "pair of dress shoes", - "name_plural": "pairs of dress shoes", + "name": { "str": "pair of dress shoes", "str_pl": "pairs of dress shoes" }, "description": "Fancy patent leather shoes. Not designed for running in.", "weight": "870 g", "volume": "1500 ml", @@ -1228,8 +1222,7 @@ { "id": "leg_warmers_xlf", "type": "ARMOR", - "name": "pair of fetlock furs", - "name_plural": "pairs of fetlock furs", + "name": { "str": "pair of fetlock furs", "str_pl": "pairs of fetlock furs" }, "description": "Snug fur sleeves to keep your fetlocks warm.", "weight": "66 g", "volume": "750 ml", @@ -1248,8 +1241,7 @@ { "id": "nomex_socks", "type": "ARMOR", - "name": "pair of flame-resistant socks", - "name_plural": "pairs of flame-resistant socks", + "name": { "str": "pair of flame-resistant socks", "str_pl": "pairs of flame-resistant socks" }, "description": "A snug fitting pair of stockings made from thin and lightweight Nomex fire-resistant fabric. Tough yet breathable, they are light and comfortable to wear under clothing.", "weight": "200 g", "volume": "750 ml", @@ -1325,8 +1317,7 @@ "id": "socks_bowling", "repairs_like": "boots", "type": "ARMOR", - "name": "pair of disposable bowling socks", - "name_plural": "pairs of disposable bowling socks", + "name": { "str": "pair of disposable bowling socks", "str_pl": "pairs of disposable bowling socks" }, "description": "Cheap one time socks. Can keep your feet clean, but too thin to give any protection.", "weight": "20 g", "volume": "250 ml", diff --git a/data/json/items/armor/eyewear.json b/data/json/items/armor/eyewear.json index a1ffcd3c91df8..f0ae80ca7154a 100644 --- a/data/json/items/armor/eyewear.json +++ b/data/json/items/armor/eyewear.json @@ -2,8 +2,7 @@ { "id": "eclipse_glasses", "type": "ARMOR", - "name": "pair of eclipse glasses", - "name_plural": "pairs of eclipse glasses", + "name": { "str": "pair of eclipse glasses", "str_pl": "pairs of eclipse glasses" }, "description": "A pair of cardboard-framed glasses with UV and IR-filtered lenses topped with a layer of aluminum coating. They allow safe viewing of extremely bright and harmful sources of light, like the sun during a solar eclipse.", "weight": "27 g", "volume": "250 ml", @@ -46,8 +45,7 @@ { "id": "fitover_sunglasses", "type": "ARMOR", - "name": "pair of fit-over sunglasses", - "name_plural": "pairs of fit-over sunglasses", + "name": { "str": "pair of fit-over sunglasses", "str_pl": "pairs of fit-over sunglasses" }, "description": "A pair of fit-over sunglasses designed to be worn over a pair of corrective glasses. Good for keeping the glare out of your eyes.", "weight": "45 g", "volume": "250 ml", @@ -111,8 +109,7 @@ { "id": "glasses_eye", "type": "ARMOR", - "name": "pair of eyeglasses", - "name_plural": "pairs of eyeglasses", + "name": { "str": "pair of eyeglasses", "str_pl": "pairs of eyeglasses" }, "description": "A pair of glasses for the near-sighted. The concave lenses diffuse the sunlight, rendering them useless for starting fires.", "weight": "30 g", "volume": "250 ml", diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json index 0d78e35c98b8a..f4ab820f0b365 100644 --- a/data/json/items/armor/gloves.json +++ b/data/json/items/armor/gloves.json @@ -67,8 +67,7 @@ "repairs_like": "gauntlets_larmor", "type": "ARMOR", "category": "armor", - "name": "pair of fire gauntlets", - "name_plural": "pairs of fire gauntlets", + "name": { "str": "pair of fire gauntlets", "str_pl": "pairs of fire gauntlets" }, "description": "A heavy pair of gloves, used by firefighters and metalworkers for heat protection. Highly resistant to heat and flame, they provide excellent protection from injury.", "weight": "572 g", "volume": "1 L", @@ -208,8 +207,7 @@ { "id": "gloves_fingerless", "type": "ARMOR", - "name": "pair of fingerless gloves", - "name_plural": "pairs of fingerless gloves", + "name": { "str": "pair of fingerless gloves", "str_pl": "pairs of fingerless gloves" }, "description": "A pair of leather gloves with no fingers, allowing greater manual dexterity.", "weight": "100 g", "volume": "250 ml", @@ -423,8 +421,7 @@ "type": "ARMOR", "looks_like": "gloves_lsurvivor", "category": "armor", - "name": "pair of fingerless survivor gloves", - "name_plural": "pairs of fingerless survivor gloves", + "name": { "str": "pair of fingerless survivor gloves", "str_pl": "pairs of fingerless survivor gloves" }, "description": "A pair of customized, Kevlar armored cloth gloves with no fingers, modified to be easy to wear while providing maximum protection under extreme conditions.", "weight": "160 g", "volume": "700 ml", @@ -622,8 +619,7 @@ "id": "gloves_cut_resistant", "repairs_like": "gloves_plate", "type": "ARMOR", - "name": "pair of cut resistant gloves", - "name_plural": "pairs of cut resistant gloves", + "name": { "str": "pair of cut resistant gloves", "str_pl": "pairs of cut resistant gloves" }, "description": "A pair of cut resistant gloves, useful when rapidly breaking down carcasses.", "weight": "240 g", "volume": "250 ml", @@ -773,8 +769,7 @@ "id": "long_glove_white", "repairs_like": "arm_warmers", "type": "ARMOR", - "name": "pair of extra long white gloves", - "name_plural": "pairs of extra long white gloves", + "name": { "str": "pair of extra long white gloves", "str_pl": "pairs of extra long white gloves" }, "description": "Long white costume gloves.", "weight": "400 g", "volume": "1 L", @@ -782,7 +777,7 @@ "to_hit": 1, "material": [ "cotton" ], "symbol": "[", - "looks_like": "glove_light", + "looks_like": "gloves_light", "color": "light_blue", "covers": [ "HANDS", "ARMS" ], "coverage": 60, @@ -814,8 +809,7 @@ { "id": "nomex_gloves", "type": "ARMOR", - "name": "pair of flame-resistant gloves", - "name_plural": "pairs of flame-resistant gloves", + "name": { "str": "pair of flame-resistant gloves", "str_pl": "pairs of flame-resistant gloves" }, "description": "A snug fitting pair of gloves made from thin and lightweight Nomex fire-resistant fabric. Tough yet breathable, they are light and comfortable to wear under clothing.", "weight": "190 g", "volume": "500 ml", diff --git a/data/json/items/armor/jewelry.json b/data/json/items/armor/jewelry.json index 1fa95c1e47f8c..aff086d4992f5 100644 --- a/data/json/items/armor/jewelry.json +++ b/data/json/items/armor/jewelry.json @@ -271,11 +271,10 @@ { "id": "copper_ear", "type": "ARMOR", - "name": "pair of copper earrings", - "name_plural": "pairs of copper earrings", + "name": { "str": "pair of copper earrings", "str_pl": "pairs of copper earrings" }, "description": "A pair of copper earrings. It's pretty heavy. You can wear it if you like, but it won't provide any effects.", "weight": "50 g", - "volume": 0, + "volume": "1 ml", "price": 2900, "price_postapoc": 50, "material": [ "copper" ], diff --git a/data/json/items/armor/legs_clothes.json b/data/json/items/armor/legs_clothes.json index 828dd2858dd09..4710dd37082e4 100644 --- a/data/json/items/armor/legs_clothes.json +++ b/data/json/items/armor/legs_clothes.json @@ -44,8 +44,7 @@ "id": "fishing_waders", "repairs_like": "boots_larmor", "type": "ARMOR", - "name": "pair of fishing waders", - "name_plural": "pairs of fishing waders", + "name": { "str": "pair of fishing waders", "str_pl": "pairs of fishing waders" }, "description": "Waterproof plastic fishing waders with a single large front pocket.", "weight": "1360 g", "volume": "9500 ml",