Add demon chitin armor & repairing dragon armor

data/json/items/armor/ammo_pouch.json

@@ -443,7 +443,7 @@
   {
     "id": "quiver",
     "type": "ARMOR",
-    "name": "quiver",
+    "name": { "str": "quiver" },
     "description": "A leather quiver worn at the waist that can hold 20 arrows.  Activate to store arrows.",
     "weight": "260 g",
     "volume": "500 ml",

data/json/items/armor/bandolier.json

@@ -2,15 +2,15 @@
   {
     "id": "bandolier_pistol",
     "type": "ARMOR",
-    "name": "pistol bandolier",
+    "name": { "str": "pistol bandolier" },
     "description": "An embroidered leather bandolier for keeping pistol cartridges close to hand.  If this doesn't make you feel like a cowboy, nothing will.",
     "weight": "140 g",
     "volume": "250 ml",
     "price": 1900,
     "price_postapoc": 2900,
     "material": "leather",
     "symbol": "[",
-    "looks_like": "belt",
+    "looks_like": "leather_belt",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 10,

data/json/items/armor/belts.json

@@ -141,7 +141,7 @@
   {
     "id": "police_belt",
     "type": "ARMOR",
-    "name": "police duty belt",
+    "name": { "str": "police duty belt" },
     "description": "Black leather belt used by police officers.  It has several pouches and a holder for a baton.",
     "weight": "250 g",
     "volume": "2 L",

data/json/items/armor/coats.json

@@ -748,7 +748,7 @@
   {
     "id": "peacoat",
     "type": "ARMOR",
-    "name": "peacoat",
+    "name": { "str": "peacoat" },
     "description": "A heavy wool coat.  Cumbersome, but warm and with deep pockets.",
     "weight": "1800 g",
     "volume": "3 L",

data/json/items/armor/hats.json

@@ -450,7 +450,7 @@
     "id": "porkpie",
     "repairs_like": "balclava",
     "type": "ARMOR",
-    "name": "porkpie hat",
+    "name": { "str": "porkpie hat" },
     "description": "A flat-topped hat with circular indent and a narrow brim.  Most popular in the 40s and 50s, still common among those in the mod scene, hipsters, and people named Heisenberg.",
     "weight": "213 g",
     "volume": "1250 ml",

data/json/items/armor/helmets.json

@@ -3,7 +3,7 @@
     "id": "pot_helmet",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pot helmet",
+    "name": { "str": "pot helmet" },
     "description": "A helmet made from a soup pot.  It's not very good protection, but it's better than nothing.",
     "weight": "760 g",
     "volume": "2 L",

data/json/items/armor/jewelry.json

@@ -724,10 +724,10 @@
   {
     "id": "ear_spool",
     "type": "ARMOR",
-    "name": "plug",
+    "name": { "str": "plug" },
     "description": "Those round things people plug into their earlobes as earrings, also called \"ear plug\" or \"ear spool.\"  You can wear it if you like, but it won't provide any effects.",
     "weight": "10 g",
-    "volume": 0,
+    "volume": "5 ml",
     "price": 1200,
     "price_postapoc": 10,
     "material": [ "plastic" ],
@@ -1003,7 +1003,7 @@
   {
     "id": "pearl_collar",
     "type": "ARMOR",
-    "name": "pearl collar",
+    "name": { "str": "pearl collar" },
     "description": "A collar made from round and lustrous pearls, its former owner must be a wealthy individual.",
     "weight": "30 g",
     "volume": "300 ml",
@@ -1035,10 +1035,10 @@
   {
     "id": "platinum_bracelet",
     "type": "ARMOR",
-    "name": "platinum bracelet",
+    "name": { "str": "platinum bracelet" },
     "description": "A flawless platinum bracelet.  You can wear it if you like, but it won't provide any effects.",
     "weight": "50 g",
-    "volume": 0,
+    "volume": "25 ml",
     "price": 38000,
     "price_postapoc": 9900,
     "material": [ "platinum" ],
@@ -1049,10 +1049,10 @@
   {
     "id": "platinum_dental_grill",
     "type": "ARMOR",
-    "name": "platinum dental grill",
+    "name": { "str": "platinum dental grill" },
     "description": "Fake platinum-and-silver teeth.  They may be cheaper than fake gold teeth, but they're much more rare.  Fits horribly, but looks very shiny.",
     "weight": "15 g",
-    "volume": 0,
+    "volume": "25 ml",
     "price": 15000,
     "price_postapoc": 1900,
     "bashing": 2,
@@ -1080,10 +1080,10 @@
   {
     "id": "platinum_hairpin",
     "type": "ARMOR",
-    "name": "platinum hairpin",
+    "name": { "str": "platinum hairpin" },
     "description": "The ultimate in esoteric, metal hair accessories, this hairpin is made from pure platinum.  You can wear it if you like, but it won't provide any effects.",
     "weight": "7 g",
-    "volume": 0,
+    "volume": "5 ml",
     "price": 3500,
     "price_postapoc": 1200,
     "material": [ "platinum" ],
@@ -1094,10 +1094,10 @@
   {
     "id": "platinum_locket",
     "type": "ARMOR",
-    "name": "platinum locket",
+    "name": { "str": "platinum locket" },
     "description": "A small, platinum locket for storing photographs or other small objects.  You can wear it if you like, but it won't provide any effects.",
     "weight": "65 g",
-    "volume": 0,
+    "volume": "40 ml",
     "price": 16000,
     "price_postapoc": 3900,
     "material": [ "platinum" ],
@@ -1108,10 +1108,10 @@
   {
     "id": "platinum_necklace",
     "type": "ARMOR",
-    "name": "platinum necklace",
+    "name": { "str": "platinum necklace" },
     "description": "A platinum necklace, with a small, empty heart frame hanging from a chain.  You can wear it if you like, but it won't provide any effects.",
     "weight": "47 g",
-    "volume": 0,
+    "volume": "50 ml",
     "price": 50000,
     "price_postapoc": 2900,
     "material": [ "platinum" ],
@@ -1122,10 +1122,10 @@
   {
     "id": "platinum_ring",
     "type": "ARMOR",
-    "name": "platinum ring",
+    "name": { "str": "platinum ring" },
     "description": "A platinum ring, engraved with all manner of swirls and spirals.  You can wear it if you like, but it won't provide any effects.",
     "weight": "13 g",
-    "volume": 0,
+    "volume": "5 ml",
     "price": 24000,
     "price_postapoc": 6500,
     "material": [ "platinum" ],
@@ -1150,10 +1150,10 @@
   {
     "id": "ring_purity",
     "type": "ARMOR",
-    "name": "purity ring",
+    "name": { "str": "purity ring" },
     "description": "Also known as a promise ring, this ring is worn as a sign of chastity.  This one bears the inscription, \"Love is patient.\"",
     "weight": "6 g",
-    "volume": 0,
+    "volume": "5 ml",
     "price": 1700,
     "price_postapoc": 900,
     "material": [ "silver" ],

data/json/items/armor/misc.json

@@ -74,7 +74,7 @@
     "repairs_like": "goggles_swim",
     "type": "ARMOR",
     "category": "armor",
-    "name": "protective mouthpiece",
+    "name": { "str": "protective mouthpiece" },
     "description": "A protective piece of equipment commonly used by athletes, which is worn inside the mouth to protect your teeth.",
     "weight": "20 g",
     "volume": "430 ml",

data/json/items/armor/power_armor.json

@@ -91,7 +91,7 @@
     "bashing": 1,
     "material": [ "steel" ],
     "symbol": "[",
-    "looks_like": "bigpack",
+    "looks_like": "backpack_tactical_large",
     "color": "light_gray",
     "coverage": 100,
     "encumbrance": 40,

data/json/items/armor/storage.json

@@ -615,7 +615,7 @@
   {
     "id": "petpack",
     "type": "ARMOR",
-    "name": "petpack",
+    "name": { "str": "petpack" },
     "description": "Before the Cataclysm this would allow your four-legged friend to see the world, now it's used to shield them from the world.",
     "weight": "1316 g",
     "volume": "10 L",
@@ -638,7 +638,7 @@
   {
     "id": "plastic_shopping_bag",
     "type": "ARMOR",
-    "name": "plastic shopping bag",
+    "name": { "str": "plastic shopping bag" },
     "description": "A bag used to carry groceries home.",
     "weight": "2 g",
     "volume": "250 ml",
@@ -658,7 +658,7 @@
     "id": "purse",
     "repairs_like": "backpack",
     "type": "ARMOR",
-    "name": "purse",
+    "name": { "str": "purse" },
     "description": "A bit cumbersome to wear, but provides some storage.",
     "weight": "297 g",
     "volume": "1 L",

data/json/items/armor/suits_protection.json

@@ -151,7 +151,7 @@
     "id": "armor_lightplate",
     "type": "ARMOR",
     "category": "armor",
-    "name": "plate armor",
+    "name": { "str": "plate armor" },
     "description": "A suit of Gothic plate armor.",
     "weight": "11000 g",
     "volume": "17500 ml",
@@ -219,7 +219,7 @@
     "id": "armor_plarmor",
     "type": "ARMOR",
     "category": "armor",
-    "name": "plated leather armor",
+    "name": { "str": "plated leather armor" },
     "description": "Thick leather body armor that has been reinforced with strategically-placed metal plates.  Strong and comfortable.",
     "weight": "4280 g",
     "volume": "9 L",

data/json/items/armor/torso_armor.json

@@ -361,7 +361,7 @@
   {
     "id": "plastron_plastic",
     "type": "ARMOR",
-    "name": "plastic chest protector",
+    "name": { "str": "plastic chest protector" },
     "description": "A rigid plastic plastron with molded cups to be worn by female fencers for protection while fencing.",
     "weight": "194 g",
     "volume": "850 ml",

data/json/items/armor/torso_clothes.json

@@ -398,7 +398,7 @@
   {
     "id": "polo_shirt",
     "type": "ARMOR",
-    "name": "polo shirt",
+    "name": { "str": "polo shirt" },
     "description": "A short-sleeved cotton shirt, slightly thicker than a t-shirt.",
     "weight": "136 g",
     "volume": "750 ml",

data/json/items/book/maps.json

@@ -43,7 +43,7 @@
     "id": "survivormap",
     "copy-from": "abstractmap",
     "type": "GENERIC",
-    "name": "survivor's map",
+    "name": { "str": "survivor's map" },
     "description": "This is a hand-drawn map of the local area.  Whoever created it has marked down the locations of nearby supply sources including gun stores and gas stations.  Using it will add points of interest to your map.",
     "color": "white",
     "use_action": {

data/json/items/chemicals_and_resources.json

@@ -1299,7 +1299,7 @@
     "id": "steel_grille",
     "type": "GENERIC",
     "category": "other",
-    "name": "steel grille",
+    "name": { "str": "steel grille" },
     "description": "This is a metal grille.  It can be used as a framework for making a chemical catalyst.",
     "weight": "600 g",
     "volume": "250 ml",

data/json/items/comestibles/bread.json

@@ -69,7 +69,7 @@
     "id": "sourdough_starter",
     "type": "GENERIC",
     "category": "food",
-    "name": "sourdough starter",
+    "name": { "str": "sourdough starter" },
     "description": "This jar contains a precious mix of flour, water, molds and bacteria from the air.  When you add flour and water to it, after a few hours it froths and rises.",
     "weight": "52 g",
     "looks_like": "jar_glass",

data/json/items/comestibles/carnivore.json

@@ -24,7 +24,7 @@
     "spoils_in": "12 hours",
     "flags": [ "SMOKABLE", "RAW" ],
     "smoking_result": "fish_smoked",
-    "vitamins": [ [ "vitA", 2 ], [ "vitC", 2 ], [ "calcium", 2 ], [ "iron", 3 ], [ "vitB", 9 ] ],
+    "vitamins": [ [ "vitA", 2 ], [ "vitC", 2 ], [ "calcium", 6 ], [ "iron", 14 ], [ "vitB", 154 ] ],
     "calories": 260
   },
   {
@@ -354,12 +354,10 @@
     "container": "bag_plastic",
     "color": "light_gray",
     "spoils_in": "24 days",
-    "stack_size": 4,
     "parasites": 0,
     "quench": -5,
     "fun": 4,
-    "vitamins": [ [ "vitA", 7 ], [ "vitC", 7 ], [ "calcium", 25 ], [ "iron", 21 ], [ "vitB", 617 ] ],
-    "proportional": { "price": 2.0, "volume": 0.28, "weight": 0.28 },
+    "proportional": { "price": 2.0, "volume": 0.345, "weight": 0.345 },
     "delete": { "flags": [ "RAW" ] }
   },
   {

data/json/items/generic.json

@@ -243,7 +243,7 @@
     "category": "spare_parts",
     "symbol": ",",
     "color": "white",
-    "name": "superglue",
+    "name": { "str": "superglue", "str_pl": "superglue" },
     "description": "A tube of strong glue.  Used in many crafting recipes.",
     "price": 1800,
     "material": "plastic",
@@ -280,7 +280,7 @@
     "type": "GENERIC",
     "id": "chain",
     "category": "spare_parts",
-    "name": "steel chain",
+    "name": { "str": "steel chain" },
     "description": "A heavy steel chain.  Useful as a weapon, or for crafting.  It has a chance to wrap around your target, allowing for a bonus unarmed attack.",
     "weight": "3628 g",
     "color": "dark_gray",
@@ -436,7 +436,7 @@
     "id": "spiral_stone",
     "symbol": "*",
     "color": "light_gray",
-    "name": "spiral stone",
+    "name": { "str": "spiral stone" },
     "category": "artifacts",
     "description": "A rock the size of your fist.  It is covered with intricate spirals; it is impossible to tell whether they are carved, naturally formed, or some kind of fossil.",
     "price": 20000,
@@ -696,7 +696,7 @@
     "id": "spring",
     "symbol": ",",
     "color": "light_gray",
-    "name": "spring",
+    "name": { "str": "spring" },
     "category": "spare_parts",
     "description": "A large, heavy-duty spring.  Expands with significant force when compressed.",
     "price": 1000,
@@ -1724,7 +1724,7 @@
   {
     "type": "GENERIC",
     "id": "sunflower",
-    "name": "sunflower",
+    "name": { "str": "sunflower" },
     "description": "The top of a sunflower, with yellow pedals and some seeds that have yet to be eaten by animals.",
     "weight": "450 g",
     "to_hit": -2,
@@ -2633,7 +2633,7 @@
     "category": "spare_parts",
     "symbol": ",",
     "color": "light_cyan",
-    "name": "steel plate",
+    "name": { "str": "steel plate" },
     "description": "A steel armor plate, specifically engineered for use in a bullet resistant vest.",
     "price": 9000,
     "material": "steel",
@@ -2674,7 +2674,7 @@
     "category": "spare_parts",
     "symbol": "t",
     "color": "dark_gray",
-    "name": "spare tire carrier",
+    "name": { "str": "spare tire carrier" },
     "description": "A bumper mounted rig for attaching and storing a spare tire on the back of a vehicle.  Combine it with a wheel to get a mountable piece.",
     "price": 3500,
     "material": "steel",
@@ -2825,7 +2825,7 @@
     "id": "survival_kit",
     "type": "GENERIC",
     "category": "tools",
-    "name": "survival kit",
+    "name": { "str": "survival kit" },
     "description": "A small box filled with tools and items to help you survive in case of an emergency.  Disassemble to get its content.",
     "weight": "1612 g",
     "volume": "1 L",

data/json/items/melee/spears_and_polearms.json

@@ -186,7 +186,7 @@
   {
     "type": "GENERIC",
     "id": "spear_steel",
-    "name": "steel spear",
+    "name": { "str": "steel spear" },
     "description": "A stout wooden pole with a hand-forged steel spearhead.",
     "weight": "1498 g",
     "to_hit": 2,
@@ -536,7 +536,7 @@
   {
     "id": "spear_stone",
     "type": "GENERIC",
-    "name": "stone spear",
+    "name": { "str": "stone spear" },
     "description": "A stout wooden pole with a sharp stone spearhead.",
     "weight": "1098 g",
     "volume": "1250 ml",