From e50c4a9061238f3006740fd6c584998a3ca1ec3c Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Wed, 12 Feb 2020 20:28:41 +0100 Subject: [PATCH] Tool_armor gun monster name to object --- data/json/items/gun/22.json | 3 +-- data/json/items/gun/223.json | 3 +-- data/json/items/gun/3006.json | 3 +-- data/json/items/gun/38.json | 3 +-- data/json/items/gun/40.json | 3 +-- data/json/items/gun/44.json | 3 +-- data/json/items/gun/45.json | 3 +-- data/json/items/gun/9mm.json | 3 +-- data/json/items/tool_armor.json | 4 +--- data/json/monsters/mammal.json | 3 +-- 10 files changed, 10 insertions(+), 21 deletions(-) diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index 33fbddc1db1f6..e49bf8f71a347 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -117,8 +117,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "pipe rifle: .22", - "name_plural": "pipe rifles: .22", + "name": { "str": "pipe rifle: .22", "str_pl": "pipe rifles: .22" }, "description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "weight": "1953 g", "volume": "1750 ml", diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json index 9344ae5e6382a..699cfc541f985 100644 --- a/data/json/items/gun/223.json +++ b/data/json/items/gun/223.json @@ -330,8 +330,7 @@ "copy-from": "gun_base", "looks_like": "ar15", "type": "GUN", - "name": "pipe rifle: .223", - "name_plural": "pipe rifles: .223", + "name": { "str": "pipe rifle: .223", "str_pl": "pipe rifles: .223" }, "description": "A homemade rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "weight": "4080 g", "volume": "3 L", diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json index 36c2a38674466..8e4984359e596 100644 --- a/data/json/items/gun/3006.json +++ b/data/json/items/gun/3006.json @@ -180,8 +180,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "pipe rifle: .30-06", - "name_plural": "pipe rifles: .30-06", + "name": { "str": "pipe rifle: .30-06", "str_pl": "pipe rifles: .30-06" }, "//": "It's the same size as the others, but it's still a scrap weapon.", "description": "A homemade rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "weight": "4080 g", diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json index c6c40900fc291..e9c57907d2d8a 100644 --- a/data/json/items/gun/38.json +++ b/data/json/items/gun/38.json @@ -92,8 +92,7 @@ "copy-from": "gun_base", "looks_like": "ar15", "type": "GUN", - "name": "pipe rifle: .38 Special", - "name_plural": "pipe rifles: .38 Special", + "name": { "str": "pipe rifle: .38 Special", "str_pl": "pipe rifles: .38 Special" }, "description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "weight": "2114 g", "volume": "2 L", diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json index 6718490967521..dc3cc59fe9b52 100644 --- a/data/json/items/gun/40.json +++ b/data/json/items/gun/40.json @@ -43,8 +43,7 @@ "copy-from": "gun_base", "looks_like": "ar15", "type": "GUN", - "name": "pipe rifle: .40 S&W", - "name_plural": "pipe rifles: .40 S&W", + "name": { "str": "pipe rifle: .40 S&W", "str_pl": "pipe rifles: .40 S&W" }, "description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "weight": "2114 g", "volume": "2 L", diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json index 32ddf4d89ee87..e0ec172bc77d3 100644 --- a/data/json/items/gun/44.json +++ b/data/json/items/gun/44.json @@ -77,8 +77,7 @@ "copy-from": "gun_base", "looks_like": "ar15", "type": "GUN", - "name": "pipe rifle: .44 Magnum", - "name_plural": "pipe rifles: .44 Magnum", + "name": { "str": "pipe rifle: .44 Magnum", "str_pl": "pipe rifles: .44 Magnum" }, "description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "weight": "2114 g", "volume": "2 L", diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json index be1351421502a..e0bce89c5b81b 100644 --- a/data/json/items/gun/45.json +++ b/data/json/items/gun/45.json @@ -159,8 +159,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "pipe rifle: .45", - "name_plural": "pipe rifles: .45", + "name": { "str": "pipe rifle: .45", "str_pl": "pipe rifles: .45" }, "description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "weight": "2114 g", "volume": "2 L", diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json index 68b48334f9f60..3e68a8773b9d1 100644 --- a/data/json/items/gun/9mm.json +++ b/data/json/items/gun/9mm.json @@ -366,8 +366,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "pipe rifle: 9x19mm", - "name_plural": "pipe rifles: 9x19mm", + "name": { "str": "pipe rifle: 9x19mm", "str_pl": "pipe rifles: 9x19mm" }, "//": "Despite its quality, it IS a small rifle, although not as effective as a genuine pistol carbine.", "description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "weight": "2114 g", diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index 1a2ec51bfdc1a..95e23d8114209 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -915,8 +915,7 @@ "copy-from": "phase_immersion_suit", "repairs_like": "phase_immersion_suit", "type": "TOOL_ARMOR", - "name": "phase immersion suit (on)", - "name_plural": "phase immersion suits (on)", + "name": { "str": "phase immersion suit (on)", "str_pl": "phase immersion suits (on)" }, "looks_like": "phase_immersion_suit", "description": "Covered in interlocking plates of reflective metal, this advanced suit resembles both plate armor and an astronaut's spacesuit. It is turned on, and continually draining power. Use it to turn it off.", "turns_per_charge": 25, @@ -936,7 +935,6 @@ "ALARMCLOCK", "SWIM_GOGGLES", "SUN_GLASSES", - "STURDY", "ELECTRIC_IMMUNE", "PARTIAL_DEAF", "GAS_PROOF", diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json index ac9b287c3a2ae..5ec16e3864846 100644 --- a/data/json/monsters/mammal.json +++ b/data/json/monsters/mammal.json @@ -1825,8 +1825,7 @@ { "id": "mon_sheep_lamb", "type": "MONSTER", - "name": "lamb", - "name_plural": "lambs", + "name": { "str": "lamb" }, "description": "A timid, hooved grazing mammal, and one of the first animals ever domesticated. Its body is covered in a thick layer of wool, and the males have long, spiraling horns.", "default_faction": "herbivore", "bodytype": "dog",