Merge pull request #38367 from snipercup/Ammo-name-to-object

Ammo name to object

data/json/items/ammo.json

@@ -162,7 +162,7 @@
     "id": "duct_tape",
     "category": "spare_parts",
     "price": 2000,
-    "name": "duct tape",
+    "name": { "str": "duct tape" },
     "symbol": "=",
     "color": "light_gray",
     "description": "A roll of incredibly strong tape.  Its uses are innumerable.",
@@ -195,7 +195,7 @@
     "id": "cable",
     "category": "spare_parts",
     "price": 2000,
-    "name": "copper wire",
+    "name": { "str": "copper wire" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "Plastic jacketed copper cable of the type used in small electronics.",
@@ -384,7 +384,7 @@
     "id": "feather",
     "category": "spare_parts",
     "price": 3000,
-    "name": "feather",
+    "name": { "str": "feather" },
     "symbol": "=",
     "color": "brown",
     "description": "Feathers from a bird.  Useful for fletching arrows.",
@@ -401,7 +401,7 @@
     "id": "down_feather",
     "category": "spare_parts",
     "price": 3000,
-    "name": "down feather",
+    "name": { "str": "down feather" },
     "symbol": "=",
     "color": "brown",
     "description": "Fluffy down feathers from a bird.  Useful for making cozy bedclothes.",
@@ -675,7 +675,7 @@
     "id": "copper",
     "category": "spare_parts",
     "price": 1000,
-    "name": "copper",
+    "name": { "str": "copper" },
     "symbol": "=",
     "color": "yellow",
     "description": "Copper scraps.  Could be used to craft something, for example makeshift shotgun shells.",
@@ -829,7 +829,7 @@
     "id": "coal_lump",
     "category": "spare_parts",
     "price": 200,
-    "name": "coal",
+    "name": { "str": "coal" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "Flammable black chunks of carbon-based material commonly used for cooking and heating.",
@@ -912,7 +912,7 @@
     "id": "gasfilter_s",
     "category": "spare_parts",
     "price": 2500,
-    "name": "filter mask cartridge",
+    "name": { "str": "filter mask cartridge" },
     "symbol": "=",
     "color": "light_gray",
     "description": "Small replacement filter cartridge for air filtration masks.",
@@ -969,7 +969,7 @@
     "id": "fish_bait",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "fish bait",
+    "name": { "str": "fish bait" },
     "description": "A bait used in traps to lure fish.",
     "weight": "1 g",
     "volume": "250 ml",
@@ -1018,7 +1018,7 @@
     "type": "AMMO",
     "id": "explosive_hm_rocket",
     "price": 2000,
-    "name": "explosive homemade rocket",
+    "name": { "str": "explosive homemade rocket" },
     "symbol": ",",
     "color": "dark_gray",
     "description": "A hand built rocket, consisting of a simple explosive warhead attached onto a pipe, filled with improvised rocket fuel.  Not very powerful, but can be made from scratch.",

data/json/items/ammo/nail.json

@@ -3,12 +3,12 @@
     "id": "combatnail",
     "copy-from": "nail",
     "type": "AMMO",
-    "name": "flechette",
+    "name": { "str": "flechette" },
     "description": "A tiny steel dart.  Can be fired from a nail gun or similar weapon or used when crafting ammunition",
     "material": "steel",
     "symbol": "=",
     "color": "dark_gray",
-    "proportional": { "price": 3, "damage": 3, "pierce": 3 }
+    "proportional": { "price": 3, "damage": 3.0, "pierce": 3.0 }
   },
   {
     "id": "nail",

data/json/items/ammo/shot.json

@@ -12,7 +12,7 @@
     "id": "reloaded_shot_dragon",
     "copy-from": "shot_dragon",
     "type": "AMMO",
-    "name": "dragon's breath shell, reloaded",
+    "name": { "str": "dragon's breath shell, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -30,7 +30,7 @@
     "id": "reloaded_shot_flechette",
     "copy-from": "shot_flechette",
     "type": "AMMO",
-    "name": "flechette shell, reloaded",
+    "name": { "str": "flechette shell, reloaded" },
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -57,7 +57,7 @@
     "id": "bp_shot_dragon",
     "copy-from": "shot_dragon",
     "type": "AMMO",
-    "name": "dragon's breath shell, black powder",
+    "name": { "str": "dragon's breath shell, black powder" },
     "proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -74,7 +74,7 @@
     "id": "bp_shot_flechette",
     "copy-from": "shot_flechette",
     "type": "AMMO",
-    "name": "flechette shell, black powder",
+    "name": { "str": "flechette shell, black powder" },
     "proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -137,7 +137,7 @@
     "id": "shot_dragon",
     "copy-from": "shot_00",
     "type": "AMMO",
-    "name": "dragon's breath shell",
+    "name": { "str": "dragon's breath shell" },
     "description": "A shotgun shell filled with magnesium pellets or shards, used mostly as a distress flare or pyrotechnics tool.  When the round is fired, high temperature sparks and flames shoot out of the barrel, igniting everything in their path.",
     "price": 1000,
     "price_postapoc": 14000,
@@ -148,7 +148,7 @@
     "id": "shot_flechette",
     "copy-from": "shot_00",
     "type": "AMMO",
-    "name": "flechette shell",
+    "name": { "str": "flechette shell" },
     "description": "A shotgun shell filled with tiny steel darts.  Extremely damaging, plus the spread makes it very accurate at short range.  Slices through most forms of armor with ease.",
     "price": 2000,
     "price_postapoc": 10000,
@@ -159,7 +159,7 @@
     "id": "shot_he",
     "copy-from": "shot_slug",
     "type": "AMMO",
-    "name": "explosive slug",
+    "name": { "str": "explosive slug" },
     "//": "$30/shot thanks to tight regulation, one way or another.",
     "description": "A shotgun shell shooting a small explosive.  Damaging, but rather inaccurate and short ranged.  Banned in several states.",
     "price": 3000,

data/json/items/ammo/shotcanister.json

@@ -49,7 +49,7 @@
     "id": "shotcanister_flechette",
     "price": 1000,
     "price_postapoc": 1000,
-    "name": "flechette shotcanister",
+    "name": { "str": "flechette shotcanister" },
     "symbol": "=",
     "color": "green",
     "description": "This small paper canister resembling a crude shotshell is filled to the brim with handmade flechettes, giving it some armor piercing capabilities.",

data/json/items/fuel.json

@@ -24,7 +24,7 @@
   },
   {
     "id": "denat_alcohol",
-    "name": "denatured alcohol",
+    "name": { "str": "denatured alcohol" },
     "copy-from": "chem_ethanol",
     "type": "AMMO",
     "description": "A high-strength ethanol solution mixed with methanol to make it toxic to drink, so as to avoid pre-apocalyptic regulations on ethanol.  Intended for use in alcohol-burning stoves and as a solvent.",

data/json/items/ranged/archery.json

@@ -3,7 +3,7 @@
     "type": "AMMO",
     "id": "arrow_fire_hardened_fletched",
     "price": 100,
-    "name": "crude wooden arrow",
+    "name": { "str": "crude wooden arrow" },
     "symbol": "=",
     "color": "green",
     "description": "A crude pointed wooden shaft with a notch at the back.  Stands a very low chance of remaining intact once fired.",
@@ -277,7 +277,7 @@
     "type": "AMMO",
     "id": "arrow_exploding",
     "price": 5000,
-    "name": "explosive arrow",
+    "name": { "str": "explosive arrow" },
     "symbol": "=",
     "color": "green",
     "looks_like": "arrow_fire_hardened_fletched",
@@ -313,7 +313,7 @@
     "type": "AMMO",
     "id": "arrow_flamming",
     "price": 1200,
-    "name": "flaming arrow",
+    "name": { "str": "flaming arrow" },
     "symbol": "=",
     "color": "green",
     "looks_like": "arrow_fire_hardened_fletched",

data/json/items/ranged/crossbows.json

@@ -3,7 +3,7 @@
     "type": "AMMO",
     "id": "bolt_crude",
     "price": 100,
-    "name": "crude wooden bolt",
+    "name": { "str": "crude wooden bolt" },
     "symbol": "=",
     "color": "green",
     "description": "A crude pointed wooden crossbow bolt with a notch at the back.  Stands a very low chance of remaining intact once fired.",
@@ -246,7 +246,7 @@
     "id": "bolt_explosive",
     "price": 30000,
     "//": "Resin and carbon-fiber bolts get to $10 per shot IRL, so explosives can only go higher.",
-    "name": "explosive crossbow bolt",
+    "name": { "str": "explosive crossbow bolt" },
     "symbol": "=",
     "color": "green",
     "description": "A lightweight, sharpened bolt made from some kind of metal.  It is fairly unwieldy and only provides moderate accuracy, due to being filled with explosives and fitted with an impact trigger.",

data/json/items/resources/metal.json

@@ -269,7 +269,7 @@
     "id": "hinge",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "door hinge",
+    "name": { "str": "door hinge" },
     "description": "A small metal hinge with two metal plates with screw holes.  Useful for making doors.",
     "weight": "300 g",
     "volume": "250 ml",

data/json/items/resources/tailoring.json

@@ -98,7 +98,7 @@
     "id": "sheet_cotton",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "cotton sheet",
+    "name": { "str": "cotton sheet" },
     "description": "A sheet of cotton fabric, suitable for making clothing.",
     "weight": "5 g",
     "volume": "300 ml",
@@ -124,7 +124,7 @@
     "id": "sheet_faux_fur",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "faux fur sheet",
+    "name": { "str": "faux fur sheet" },
     "description": "A sheet of fake synthetic colorful fur, suitable for making clothing.",
     "weight": "10 g",
     "volume": "4500 ml",
@@ -150,7 +150,7 @@
     "id": "sheet_felt",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "felt sheet",
+    "name": { "str": "felt sheet" },
     "description": "A sheet of felt, suitable for making clothing.",
     "weight": "8 g",
     "volume": "1800 ml",