From 2a53b2be3d50ccc927643b7f5725700170794b41 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Tue, 25 Feb 2020 19:49:06 +0100 Subject: [PATCH] Generic name to object --- data/json/items/generic.json | 6 ++--- data/json/items/generic/ammolink.json | 2 +- data/json/items/generic/casing.json | 28 ++++++++++---------- data/json/items/generic/currency.json | 4 +-- data/json/items/melee/swords_and_blades.json | 2 +- data/json/items/newspaper.json | 4 +-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 25b5947ceb265..c5e2694c648d8 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -123,7 +123,7 @@ "type": "GENERIC", "id": "log_immersion27", "copy-from": "file", - "name": "INCIDENT REPORT: IMMERSION-27A", + "name": { "str": "INCIDENT REPORT: IMMERSION-27A" }, "description": "A white piece of paper, with the logo of XEDRA printed on its upper left corner. It seems to be an internal report of some kind.", "snippet_category": "log_immersion27" }, @@ -131,14 +131,14 @@ "type": "GENERIC", "id": "report_t_substrate", "copy-from": "log_immersion27", - "name": "MATERIAL: T-SUBSTRATE", + "name": { "str": "MATERIAL: T-SUBSTRATE" }, "snippet_category": "t-substrate" }, { "type": "GENERIC", "id": "HAADF_t_substrate", "copy-from": "log_immersion27", - "name": "HAADF MICROGRAPH: T-SUBSTRATE", + "name": { "str": "HAADF MICROGRAPH: T-SUBSTRATE" }, "snippet_category": "HAADF_t-substrate" }, { diff --git a/data/json/items/generic/ammolink.json b/data/json/items/generic/ammolink.json index 1728e0227a6d8..4db2dcc9b2a8d 100644 --- a/data/json/items/generic/ammolink.json +++ b/data/json/items/generic/ammolink.json @@ -40,7 +40,7 @@ "id": "ammolink50", "copy-from": "ammolink", "type": "GENERIC", - "name": ".50 ammo belt linkage", + "name": { "str": ".50 ammo belt linkage" }, "use_action": { "type": "ammobelt", "belt": "belt50" } } ] diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json index d6347c0ff95cc..be2ae67c9cffe 100644 --- a/data/json/items/generic/casing.json +++ b/data/json/items/generic/casing.json @@ -3,7 +3,7 @@ "abstract": "casing", "type": "GENERIC", "category": "spare_parts", - "name": "Casing from ammunition cartridge", + "name": { "str": "Casing from ammunition cartridge" }, "stackable": true, "material": "brass", "symbol": "=", @@ -87,7 +87,7 @@ "copy-from": "casing", "looks_like": "223_casing", "type": "GENERIC", - "name": "7.62x51mm casing", + "name": { "str": "7.62x51mm casing" }, "description": "An empty casing from a 7.62x51mm M80 round.", "weight": "6 g", "volume": "9ml" @@ -137,7 +137,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": "10mm Auto casing", + "name": { "str": "10mm Auto casing" }, "description": "An empty casing from a 10mm Auto round.", "weight": "3 g", "volume": "5ml" @@ -257,7 +257,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": "4.6x30mm casing", + "name": { "str": "4.6x30mm casing" }, "description": "An empty casing from a 4.6x30mm round.", "weight": "2 g", "volume": "3ml" @@ -277,7 +277,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": "5x50mm hull", + "name": { "str": "5x50mm hull" }, "description": "An empty plastic hull from a 5x50mm flechette round.", "weight": "1 g", "volume": "5ml", @@ -289,7 +289,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": ".500 S&W Magnum casing", + "name": { "str": ".500 S&W Magnum casing" }, "description": "An empty casing from a .500 S&W Magnum round.", "weight": "7 g", "volume": "10ml" @@ -299,7 +299,7 @@ "copy-from": "casing", "looks_like": "223_casing", "type": "GENERIC", - "name": ".50 BMG casing", + "name": { "str": ".50 BMG casing" }, "description": "An empty casing from a .50 BMG round. These are rare, so you might want to hold onto these.", "weight": "18 g", "volume": "12ml" @@ -309,7 +309,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": "5.45x39mm casing", + "name": { "str": "5.45x39mm casing" }, "description": "An empty casing from a 5.45x39mm round.", "weight": "4 g", "volume": "7ml" @@ -319,7 +319,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": "5.7x28mm casing", + "name": { "str": "5.7x28mm casing" }, "description": "An empty casing from a 5.7x28mm round.", "weight": "2 g", "volume": "3ml" @@ -329,7 +329,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": ".700 NX casing", + "name": { "str": ".700 NX casing" }, "description": "An empty casing from a .700 NX round. These are rare, so you might want to hold onto these.", "weight": "18 g", "volume": "12ml" @@ -339,7 +339,7 @@ "copy-from": "casing", "looks_like": "223_casing", "type": "GENERIC", - "name": "7.62x54mmR casing", + "name": { "str": "7.62x54mmR casing" }, "description": "An empty casing from a 7.62x54mmR round.", "weight": "7 g", "volume": "10ml" @@ -349,7 +349,7 @@ "copy-from": "casing", "looks_like": "223_casing", "type": "GENERIC", - "name": "7.62x39mm casing", + "name": { "str": "7.62x39mm casing" }, "description": "An empty casing from a 7.62x39mm round.", "weight": "6 g", "volume": "9ml" @@ -359,7 +359,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": "7.62x25mm casing", + "name": { "str": "7.62x25mm casing" }, "description": "An empty casing from a 7.62x25mm round.", "weight": "4 g", "volume": "7ml" @@ -398,7 +398,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": "9x18mm casing", + "name": { "str": "9x18mm casing" }, "description": "An empty casing from a 9x18mm round.", "weight": "3 g", "volume": "5ml" diff --git a/data/json/items/generic/currency.json b/data/json/items/generic/currency.json index 4c0e6ca0696f7..7dd5d68c7cc40 100644 --- a/data/json/items/generic/currency.json +++ b/data/json/items/generic/currency.json @@ -16,7 +16,7 @@ { "type": "GENERIC", "id": "RobofacCoin", - "name": "Hub 01 Gold Coin", + "name": { "str": "Hub 01 Gold Coin" }, "description": "This is a small but surprisingly heavy gold coin. One side is etched with circuitry and the other side reads 'Hub 01 exchange currency'.", "price": 90000, "price_postapoc": 5000, @@ -31,7 +31,7 @@ { "type": "GENERIC", "id": "FlatCoin", - "name": "FlatCoin", + "name": { "str": "FlatCoin" }, "description": "This is a coin that has been flattened in a novelty coin flattening machine. The machine has been somewhat crudely altered so that the design - which appears to once have been Mickey Mouse - is overlaid with a handwritten emblem of a book. There is some text that faintly reads 'Campus Exchange Token'.", "price": 5, "price_postapoc": 320, diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index f6f0b73a43f9c..526c330e5456d 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -4,7 +4,7 @@ "id": "sword_wood", "symbol": "!", "color": "brown", - "name": "2-by-sword", + "name": { "str": "2-by-sword" }, "description": "A two by four with a cross guard and whittled down point; not much for slashing, but much better than your bare hands.", "material": "wood", "volume": "1250 ml", diff --git a/data/json/items/newspaper.json b/data/json/items/newspaper.json index a34ccf53bd6e9..5f6958f9bee89 100644 --- a/data/json/items/newspaper.json +++ b/data/json/items/newspaper.json @@ -177,7 +177,7 @@ "type": "GENERIC", "id": "evac_pamphlet", "category": "books", - "name": "FEMA evacuation pamphlet", + "name": { "str": "FEMA evacuation pamphlet" }, "description": "Welcome to your Emergency Survival Shelter. We hope your stay here will be short and comfortable. Provided are an emergency blanket, high visibility jacket, gas mask, and food and water rations for one day, as well as an emergency lighter and flashlight. There are further supplies in the communal cabinets should the facility be over its intended capacity. These resources are checked and updated by FEMA on a regular basis, but if you find some items missing, please contact a FEMA supervisor at your earliest convenience.\n\nPlease wait in the shelter until an official evacuation transport arrives to take you to your homes or, in the event of a major disaster, to the nearest evacuation gathering point.\n\nIn the event that you have been evacuated under violent circumstances, FEMA recommends taking cover in the shelter's basement until help arrives. Remember: if you leave the shelter, we cannot find you to take you to safety.", "weight": "5 g", "volume": "15 ml", @@ -185,6 +185,6 @@ "looks_like": "newest_newspaper", "color": "white", "symbol": "?", - "flags": "TRADER_AVOID" + "flags": [ "TRADER_AVOID" ] } ]