From c26d3bb9f18744aa73867dff2a41fdafe021d65f Mon Sep 17 00:00:00 2001 From: Qrox Date: Mon, 20 Apr 2020 17:03:05 +0800 Subject: [PATCH 1/3] Use str_sp for cufflinks --- data/json/items/armor/jewelry.json | 84 +++++++++++++++--------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/data/json/items/armor/jewelry.json b/data/json/items/armor/jewelry.json index 844cfe0d507d6..06b1cc2123313 100644 --- a/data/json/items/armor/jewelry.json +++ b/data/json/items/armor/jewelry.json @@ -370,7 +370,7 @@ { "id": "garnet_gold_cufflinks", "type": "ARMOR", - "name": { "str": "garnet and gold cufflinks" }, + "name": { "str_sp": "garnet and gold cufflinks" }, "description": "A pair of cufflinks with inset garnets.", "weight": "15 g", "volume": 0, @@ -386,7 +386,7 @@ "id": "diamond_gold_cufflinks", "copy-from": "garnet_gold_cufflinks", "type": "ARMOR", - "name": { "str": "diamond and gold cufflinks" }, + "name": { "str_sp": "diamond and gold cufflinks" }, "description": "A pair of cufflinks with inset diamonds.", "material": [ "gold", "diamond" ], "color": "white" @@ -395,7 +395,7 @@ "id": "amethyst_gold_cufflinks", "copy-from": "garnet_gold_cufflinks", "type": "ARMOR", - "name": { "str": "amethyst and gold cufflinks" }, + "name": { "str_sp": "amethyst and gold cufflinks" }, "description": "A pair of cufflinks with inset amethysts.", "color": "blue" }, @@ -403,7 +403,7 @@ "id": "aquamarine_gold_cufflinks", "copy-from": "garnet_gold_cufflinks", "type": "ARMOR", - "name": { "str": "aquamarine and gold cufflinks" }, + "name": { "str_sp": "aquamarine and gold cufflinks" }, "description": "A pair of cufflinks with inset aquamarines.", "color": "light_blue" }, @@ -411,7 +411,7 @@ "id": "emerald_gold_cufflinks", "copy-from": "garnet_gold_cufflinks", "type": "ARMOR", - "name": { "str": "emerald and gold cufflinks" }, + "name": { "str_sp": "emerald and gold cufflinks" }, "description": "A pair of cufflinks with inset emeralds.", "color": "green" }, @@ -419,7 +419,7 @@ "id": "alexandrite_gold_cufflinks", "copy-from": "garnet_gold_cufflinks", "type": "ARMOR", - "name": { "str": "alexandrite and gold cufflinks" }, + "name": { "str_sp": "alexandrite and gold cufflinks" }, "description": "A pair of cufflinks with inset alexandrites.", "color": "green" }, @@ -427,14 +427,14 @@ "id": "ruby_gold_cufflinks", "copy-from": "garnet_gold_cufflinks", "type": "ARMOR", - "name": { "str": "ruby and gold cufflinks" }, + "name": { "str_sp": "ruby and gold cufflinks" }, "description": "A pair of cufflinks with inset rubies." }, { "id": "peridot_gold_cufflinks", "copy-from": "garnet_gold_cufflinks", "type": "ARMOR", - "name": { "str": "peridot and gold cufflinks" }, + "name": { "str_sp": "peridot and gold cufflinks" }, "description": "A pair of cufflinks with inset peridots.", "color": "light_green" }, @@ -442,7 +442,7 @@ "id": "sapphire_gold_cufflinks", "copy-from": "garnet_gold_cufflinks", "type": "ARMOR", - "name": { "str": "sapphire and gold cufflinks" }, + "name": { "str_sp": "sapphire and gold cufflinks" }, "description": "A pair of cufflinks with inset sapphires.", "color": "blue" }, @@ -450,7 +450,7 @@ "id": "tourmaline_gold_cufflinks", "copy-from": "garnet_gold_cufflinks", "type": "ARMOR", - "name": { "str": "tourmaline and gold cufflinks" }, + "name": { "str_sp": "tourmaline and gold cufflinks" }, "description": "A pair of cufflinks with inset tourmalines.", "color": "light_red" }, @@ -458,7 +458,7 @@ "id": "citrine_gold_cufflinks", "copy-from": "garnet_gold_cufflinks", "type": "ARMOR", - "name": { "str": "citrine and gold cufflinks" }, + "name": { "str_sp": "citrine and gold cufflinks" }, "description": "A pair of cufflinks with inset citrines.", "color": "yellow" }, @@ -466,7 +466,7 @@ "id": "blue_topaz_gold_cufflinks", "copy-from": "garnet_gold_cufflinks", "type": "ARMOR", - "name": { "str": "blue topaz and gold cufflinks" }, + "name": { "str_sp": "blue topaz and gold cufflinks" }, "description": "A pair of cufflinks with inset blue topaz.", "color": "light_blue" }, @@ -474,7 +474,7 @@ "id": "opal_gold_cufflinks", "copy-from": "garnet_gold_cufflinks", "type": "ARMOR", - "name": { "str": "opal and gold cufflinks" }, + "name": { "str_sp": "opal and gold cufflinks" }, "description": "A pair of cufflinks with inset opals.", "color": "white" }, @@ -482,14 +482,14 @@ "id": "pearl_gold_cufflinks", "copy-from": "garnet_gold_cufflinks", "type": "ARMOR", - "name": { "str": "pearl and gold cufflinks" }, + "name": { "str_sp": "pearl and gold cufflinks" }, "description": "A pair of cufflinks with inset pearls.", "color": "white" }, { "id": "garnet_silver_cufflinks", "type": "ARMOR", - "name": { "str": "garnet and silver cufflinks" }, + "name": { "str_sp": "garnet and silver cufflinks" }, "description": "A pair of cufflinks with inset garnets.", "weight": "15 g", "volume": 0, @@ -505,7 +505,7 @@ "id": "diamond_silver_cufflinks", "copy-from": "garnet_silver_cufflinks", "type": "ARMOR", - "name": { "str": "diamond and silver cufflinks" }, + "name": { "str_sp": "diamond and silver cufflinks" }, "description": "A pair of cufflinks with inset diamonds.", "material": [ "silver", "diamond" ], "color": "white" @@ -514,7 +514,7 @@ "id": "amethyst_silver_cufflinks", "copy-from": "garnet_silver_cufflinks", "type": "ARMOR", - "name": { "str": "amethyst and silver cufflinks" }, + "name": { "str_sp": "amethyst and silver cufflinks" }, "description": "A pair of cufflinks with inset amethysts.", "color": "blue" }, @@ -522,7 +522,7 @@ "id": "aquamarine_silver_cufflinks", "copy-from": "garnet_silver_cufflinks", "type": "ARMOR", - "name": { "str": "aquamarine and silver cufflinks" }, + "name": { "str_sp": "aquamarine and silver cufflinks" }, "description": "A pair of cufflinks with inset aquamarines.", "color": "light_blue" }, @@ -530,7 +530,7 @@ "id": "emerald_silver_cufflinks", "copy-from": "garnet_silver_cufflinks", "type": "ARMOR", - "name": { "str": "emerald and silver cufflinks" }, + "name": { "str_sp": "emerald and silver cufflinks" }, "description": "A pair of cufflinks with inset emeralds.", "color": "green" }, @@ -538,7 +538,7 @@ "id": "alexandrite_silver_cufflinks", "copy-from": "garnet_silver_cufflinks", "type": "ARMOR", - "name": { "str": "alexandrite and silver cufflinks" }, + "name": { "str_sp": "alexandrite and silver cufflinks" }, "description": "A pair of cufflinks with inset alexandrites.", "color": "green" }, @@ -546,14 +546,14 @@ "id": "ruby_silver_cufflinks", "copy-from": "garnet_silver_cufflinks", "type": "ARMOR", - "name": { "str": "ruby and silver cufflinks" }, + "name": { "str_sp": "ruby and silver cufflinks" }, "description": "A pair of cufflinks with inset rubies." }, { "id": "peridot_silver_cufflinks", "copy-from": "garnet_silver_cufflinks", "type": "ARMOR", - "name": { "str": "peridot and silver cufflinks" }, + "name": { "str_sp": "peridot and silver cufflinks" }, "description": "A pair of cufflinks with inset peridots.", "color": "light_green" }, @@ -561,7 +561,7 @@ "id": "sapphire_silver_cufflinks", "copy-from": "garnet_silver_cufflinks", "type": "ARMOR", - "name": { "str": "sapphire and silver cufflinks" }, + "name": { "str_sp": "sapphire and silver cufflinks" }, "description": "A pair of cufflinks with inset sapphires.", "color": "blue" }, @@ -569,7 +569,7 @@ "id": "tourmaline_silver_cufflinks", "copy-from": "garnet_silver_cufflinks", "type": "ARMOR", - "name": { "str": "tourmaline and silver cufflinks" }, + "name": { "str_sp": "tourmaline and silver cufflinks" }, "description": "A pair of cufflinks with inset tourmalines.", "color": "light_red" }, @@ -577,7 +577,7 @@ "id": "citrine_silver_cufflinks", "copy-from": "garnet_silver_cufflinks", "type": "ARMOR", - "name": { "str": "citrine and silver cufflinks" }, + "name": { "str_sp": "citrine and silver cufflinks" }, "description": "A pair of cufflinks with inset citrines.", "color": "yellow" }, @@ -585,7 +585,7 @@ "id": "blue_topaz_silver_cufflinks", "copy-from": "garnet_silver_cufflinks", "type": "ARMOR", - "name": { "str": "blue topaz and silver cufflinks" }, + "name": { "str_sp": "blue topaz and silver cufflinks" }, "description": "A pair of cufflinks with inset blue topaz.", "color": "light_blue" }, @@ -593,7 +593,7 @@ "id": "opal_silver_cufflinks", "copy-from": "garnet_silver_cufflinks", "type": "ARMOR", - "name": { "str": "opal and silver cufflinks" }, + "name": { "str_sp": "opal and silver cufflinks" }, "description": "A pair of cufflinks with inset opals.", "color": "white" }, @@ -601,14 +601,14 @@ "id": "pearl_silver_cufflinks", "copy-from": "garnet_silver_cufflinks", "type": "ARMOR", - "name": { "str": "pearl and silver cufflinks" }, + "name": { "str_sp": "pearl and silver cufflinks" }, "description": "A pair of cufflinks with inset pearls.", "color": "white" }, { "id": "garnet_platinum_cufflinks", "type": "ARMOR", - "name": { "str": "garnet and platinum cufflinks" }, + "name": { "str_sp": "garnet and platinum cufflinks" }, "description": "A pair of cufflinks with inset garnets.", "weight": "15 g", "volume": 0, @@ -624,7 +624,7 @@ "id": "diamond_platinum_cufflinks", "copy-from": "garnet_platinum_cufflinks", "type": "ARMOR", - "name": { "str": "diamond and platinum cufflinks" }, + "name": { "str_sp": "diamond and platinum cufflinks" }, "description": "A pair of cufflinks with inset diamonds.", "material": [ "platinum", "diamond" ], "color": "white" @@ -633,7 +633,7 @@ "id": "amethyst_platinum_cufflinks", "copy-from": "garnet_platinum_cufflinks", "type": "ARMOR", - "name": { "str": "amethyst and platinum cufflinks" }, + "name": { "str_sp": "amethyst and platinum cufflinks" }, "description": "A pair of cufflinks with inset amethysts.", "color": "blue" }, @@ -641,7 +641,7 @@ "id": "aquamarine_platinum_cufflinks", "copy-from": "garnet_platinum_cufflinks", "type": "ARMOR", - "name": { "str": "aquamarine and platinum cufflinks" }, + "name": { "str_sp": "aquamarine and platinum cufflinks" }, "description": "A pair of cufflinks with inset aquamarines.", "color": "light_blue" }, @@ -649,7 +649,7 @@ "id": "emerald_platinum_cufflinks", "copy-from": "garnet_platinum_cufflinks", "type": "ARMOR", - "name": { "str": "emerald and platinum cufflinks" }, + "name": { "str_sp": "emerald and platinum cufflinks" }, "description": "A pair of cufflinks with inset emeralds.", "color": "green" }, @@ -657,7 +657,7 @@ "id": "alexandrite_platinum_cufflinks", "copy-from": "garnet_platinum_cufflinks", "type": "ARMOR", - "name": { "str": "alexandrite and platinum cufflinks" }, + "name": { "str_sp": "alexandrite and platinum cufflinks" }, "description": "A pair of cufflinks with inset alexandrites.", "color": "green" }, @@ -665,14 +665,14 @@ "id": "ruby_platinum_cufflinks", "copy-from": "garnet_platinum_cufflinks", "type": "ARMOR", - "name": { "str": "ruby and platinum cufflinks" }, + "name": { "str_sp": "ruby and platinum cufflinks" }, "description": "A pair of cufflinks with inset rubies." }, { "id": "peridot_platinum_cufflinks", "copy-from": "garnet_platinum_cufflinks", "type": "ARMOR", - "name": { "str": "peridot and platinum cufflinks" }, + "name": { "str_sp": "peridot and platinum cufflinks" }, "description": "A pair of cufflinks with inset peridots.", "color": "light_green" }, @@ -680,7 +680,7 @@ "id": "sapphire_platinum_cufflinks", "copy-from": "garnet_platinum_cufflinks", "type": "ARMOR", - "name": { "str": "sapphire and platinum cufflinks" }, + "name": { "str_sp": "sapphire and platinum cufflinks" }, "description": "A pair of cufflinks with inset sapphires.", "color": "blue" }, @@ -688,7 +688,7 @@ "id": "tourmaline_platinum_cufflinks", "copy-from": "garnet_platinum_cufflinks", "type": "ARMOR", - "name": { "str": "tourmaline and platinum cufflinks" }, + "name": { "str_sp": "tourmaline and platinum cufflinks" }, "description": "A pair of cufflinks with inset tourmalines.", "color": "light_red" }, @@ -696,7 +696,7 @@ "id": "citrine_platinum_cufflinks", "copy-from": "garnet_platinum_cufflinks", "type": "ARMOR", - "name": { "str": "citrine and platinum cufflinks" }, + "name": { "str_sp": "citrine and platinum cufflinks" }, "description": "A pair of cufflinks with inset citrines.", "color": "yellow" }, @@ -704,7 +704,7 @@ "id": "blue_topaz_platinum_cufflinks", "copy-from": "garnet_platinum_cufflinks", "type": "ARMOR", - "name": { "str": "blue topaz and platinum cufflinks" }, + "name": { "str_sp": "blue topaz and platinum cufflinks" }, "description": "A pair of cufflinks with inset blue topaz.", "color": "light_blue" }, @@ -712,7 +712,7 @@ "id": "opal_platinum_cufflinks", "copy-from": "garnet_platinum_cufflinks", "type": "ARMOR", - "name": { "str": "opal and platinum cufflinks" }, + "name": { "str_sp": "opal and platinum cufflinks" }, "description": "A pair of cufflinks with inset opals.", "color": "white" }, @@ -720,7 +720,7 @@ "id": "pearl_platinum_cufflinks", "copy-from": "garnet_platinum_cufflinks", "type": "ARMOR", - "name": { "str": "pearl and platinum cufflinks" }, + "name": { "str_sp": "pearl and platinum cufflinks" }, "description": "A pair of cufflinks with inset pearls.", "color": "white" }, From 39b39f741c442ca43d5d6e72e88c7c73a4f060b3 Mon Sep 17 00:00:00 2001 From: Qrox Date: Mon, 20 Apr 2020 17:03:35 +0800 Subject: [PATCH 2/3] Misc plurals --- data/json/items/ammo.json | 2 +- data/json/items/ammo/20x66mm.json | 2 +- data/json/items/ammo/50.json | 2 +- data/json/items/ammo/8x40mm.json | 2 +- data/json/items/armor/pets_horse_armor.json | 2 +- data/json/items/comestibles/alcohol.json | 6 +++--- data/json/items/comestibles/carnivore.json | 2 +- data/json/items/comestibles/meat_dishes.json | 6 +++--- data/json/items/comestibles/seed.json | 2 +- data/json/items/comestibles/veggy_dishes.json | 4 ++-- data/json/items/generic/music.json | 2 +- data/json/items/obsolete.json | 2 +- data/json/items/resources/metal.json | 4 ++-- .../items/crafting_scrap/biomaterial_scrap.json | 6 +++--- .../items/crafting_scrap/circuity_scrap.json | 6 +++--- .../items/crafting_scrap/energy_storage_scrap.json | 2 +- .../items/crafting_scrap/neural_io_scrap.json | 2 +- data/mods/CrazyCataclysm/crazy_comestibles.json | 2 +- data/mods/Dark-Skies-Above/items/electronics.json | 6 +++--- .../monsters/wild_aliens/strays.json | 10 +++++----- data/mods/Magiclysm/items/cast_spell_items.json | 12 ++++++------ data/mods/Magiclysm/items/ethereal_items.json | 2 +- data/mods/Magiclysm/items/metals.json | 6 +++--- 23 files changed, 46 insertions(+), 46 deletions(-) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index 37cc7a7f594c9..12d408e73aa9f 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -240,7 +240,7 @@ "category": "spare_parts", "price": 250, "price_postapoc": 0, - "name": { "str": "plutonium slurry" }, + "name": { "str_sp": "plutonium slurry" }, "symbol": "=", "color": "green", "description": "Highly radioactive slurry. It is probably best to get far away from this.", diff --git a/data/json/items/ammo/20x66mm.json b/data/json/items/ammo/20x66mm.json index 744052c252310..ea2966d3b5254 100644 --- a/data/json/items/ammo/20x66mm.json +++ b/data/json/items/ammo/20x66mm.json @@ -102,7 +102,7 @@ "id": "20x66_inc", "copy-from": "20x66_shot", "type": "AMMO", - "name": { "str": "20x66mm incendiary" }, + "name": { "str": "20x66mm incendiary", "str_pl": "20x66mm incendiaries" }, "description": "20x66mm caseless shotgun rounds, incendiary type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", "price": 10500, "price_postapoc": 5000, diff --git a/data/json/items/ammo/50.json b/data/json/items/ammo/50.json index 45da21f0d04bc..5a9f944d361fb 100644 --- a/data/json/items/ammo/50.json +++ b/data/json/items/ammo/50.json @@ -36,7 +36,7 @@ "id": "50match", "copy-from": "50bmg", "type": "AMMO", - "name": { "str": ".50 BMG Match" }, + "name": { "str": ".50 BMG Match", "str_pl": ".50 BMG Matches" }, "description": ".50 BMG FMJ lead core ammunition manufactured with tighter tolerances for long-range competition shooting or other precision rifle use.", "count": 10, "relative": { "damage": { "damage_type": "stab", "amount": 2, "armor_penetration": -4 } }, diff --git a/data/json/items/ammo/8x40mm.json b/data/json/items/ammo/8x40mm.json index 963d3b8703230..e4200edb049aa 100644 --- a/data/json/items/ammo/8x40mm.json +++ b/data/json/items/ammo/8x40mm.json @@ -12,7 +12,7 @@ { "id": "8mm_caseless", "type": "AMMO", - "name": { "str": "8x40mm caseless" }, + "name": { "str": "8x40mm caseless", "str_pl": "8x40mm caselesses" }, "//": "Cased ammo tends to be roughly $1/shot, more or less. Rivtech ammo, being New and Proprietary and Expensive, $2-2.50 or so.", "description": "8x40mm caseless rounds. Proprietary ammunition for Rivtech firearms. Being caseless rounds, these cannot be disassembled or reloaded.", "weight": "12 g", diff --git a/data/json/items/armor/pets_horse_armor.json b/data/json/items/armor/pets_horse_armor.json index 372ac4ba882b6..8101abec65a0d 100644 --- a/data/json/items/armor/pets_horse_armor.json +++ b/data/json/items/armor/pets_horse_armor.json @@ -72,7 +72,7 @@ "id": "leather_armor_horse", "copy-from": "horse_armor", "color": "green", - "name": { "str": "boiled leather horse barding with caprison" }, + "name": { "str": "boiled leather horse barding with caprison", "str_pl": "boiled leather horse bardings with caprison" }, "description": "A full barding for horses consisting of boiled leather and cloth undercovering. This caparison is depicting a battle between a monstrous dragon and regal griffin. You could put this on a friendly horse.", "price": 30000, "price_postapoc": 3000, diff --git a/data/json/items/comestibles/alcohol.json b/data/json/items/comestibles/alcohol.json index 08191ca447041..8a483edbad1fa 100644 --- a/data/json/items/comestibles/alcohol.json +++ b/data/json/items/comestibles/alcohol.json @@ -1178,7 +1178,7 @@ { "type": "COMESTIBLE", "id": "drink_hobo", - "name": "fancy hobo", + "name": { "str_sp": "fancy hobo" }, "weight": "50 g", "color": "yellow", "addiction_type": "alcohol", @@ -1206,7 +1206,7 @@ { "type": "COMESTIBLE", "id": "drink_kalimotxo", - "name": "kalimotxo", + "name": { "str_sp": "kalimotxo" }, "weight": "250 g", "color": "red", "addiction_type": "alcohol", @@ -1234,7 +1234,7 @@ { "type": "COMESTIBLE", "id": "drink_beeknees", - "name": { "str": "bee's knees" }, + "name": { "str_sp": "bee's knees" }, "weight": "248 g", "color": "yellow", "addiction_type": "alcohol", diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index bdbbcbc852bfe..c11ced48f89de 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -3,7 +3,7 @@ "abstract": "flesh", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "meat/fish", + "name": { "str_sp": "meat/fish" }, "material": "flesh", "symbol": "%", "color": "red", diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json index 54b43145f3934..7421cae980224 100644 --- a/data/json/items/comestibles/meat_dishes.json +++ b/data/json/items/comestibles/meat_dishes.json @@ -108,7 +108,7 @@ { "type": "COMESTIBLE", "id": "royal_beef", - "name": "royal beef", + "name": { "str_sp": "royal beef" }, "weight": "446 g", "color": "white", "spoils_in": "3 days 8 hours", @@ -197,7 +197,7 @@ { "type": "COMESTIBLE", "id": "glazed_tenderloin", - "name": "glazed tenderloins", + "name": { "str_sp": "glazed tenderloins" }, "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "grisly %s" } } ], "weight": "205 g", "color": "brown", @@ -437,7 +437,7 @@ "type": "COMESTIBLE", "id": "debug_nutrition", "copy-from": "can_spam", - "name": "holy SPAM of debugging", + "name": { "str": "holy SPAM of debugging", "str_pl": "holy SPAMs of debugging" }, "calories": 2100, "description": "A mysterious lump of SPAM that contains just enough calories and vitamins to feed you for a day. For debug use only.", "//": "This is used for the all_nutrient_starve_test.", diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index 825a9b5cee95e..18505e1cb9030 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -21,7 +21,7 @@ "abstract": "seed_fruit", "type": "COMESTIBLE", "copy-from": "seed", - "name": "fruit seeds", + "name": { "str_sp": "fruit seeds" }, "primary_material": "dried_vegetable", "material": "fruit" }, diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json index a4651d467e3d4..6219a761d0be6 100644 --- a/data/json/items/comestibles/veggy_dishes.json +++ b/data/json/items/comestibles/veggy_dishes.json @@ -470,7 +470,7 @@ { "type": "COMESTIBLE", "id": "sauce_pesto", - "name": "pesto", + "name": { "str_sp": "pesto" }, "weight": "65 g", "color": "light_green", "spoils_in": 144, @@ -694,7 +694,7 @@ { "type": "COMESTIBLE", "id": "salsify_baked", - "name": "roasted salsify", + "name": { "str": "roasted salsify", "str_pl": "roasted salsifies" }, "copy-from": "salsify_raw", "spoils_in": "2 days", "healthy": 2, diff --git a/data/json/items/generic/music.json b/data/json/items/generic/music.json index cfaf28be20f5b..de36fcb0c9251 100644 --- a/data/json/items/generic/music.json +++ b/data/json/items/generic/music.json @@ -29,7 +29,7 @@ { "type": "GENERIC", "id": "headphones_circumaural", - "name": { "str": "headphones" }, + "name": { "str_sp": "headphones" }, "description": "Typical headphones that cover your ears. A well-known brand that is very high quality, with a detachable 1/8\" cable. Comes with a 1/8\" to 1/4\" adaptor.", "symbol": "Ω", "volume": "400 ml", diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json index 088833accecb5..2c53e1eab5ba8 100644 --- a/data/json/items/obsolete.json +++ b/data/json/items/obsolete.json @@ -933,7 +933,7 @@ "id": "40mm_flashbang", "copy-from": "40x46mm_grenade", "type": "AMMO", - "name": { "str": "40x46mm " }, + "name": { "str": "40x46mm" }, "description": "A 40mm grenade with a flashbang load. It will detonate with a blast of light and sound, designed to blind, deafen, and disorient anyone nearby.", "extend": { "effects": [ "FLASHBANG" ] } }, diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json index c9d46782c9d80..2cfeac00b4353 100644 --- a/data/json/items/resources/metal.json +++ b/data/json/items/resources/metal.json @@ -236,7 +236,7 @@ "id": "steel_chunk", "type": "AMMO", "category": "spare_parts", - "name": { "str": "chunk of steel" }, + "name": { "str": "chunk of steel", "str_pl": "chunks of steel" }, "description": "A misshapen chunk of steel. Makes a decent weapon in a pinch, and is also useful for some crafting recipes.", "weight": "250 g", "volume": "250 ml", @@ -256,7 +256,7 @@ "id": "steel_lump", "type": "AMMO", "category": "spare_parts", - "name": { "str": "lump of steel" }, + "name": { "str": "lump of steel", "str_pl": "lumps of steel" }, "description": "A heavy formed piece of steel. Useful for some crafting recipes.", "weight": "1000 g", "volume": "250 ml", diff --git a/data/mods/Aftershock/items/crafting_scrap/biomaterial_scrap.json b/data/mods/Aftershock/items/crafting_scrap/biomaterial_scrap.json index 55bb5e2a45fd7..8dc0759196ed4 100644 --- a/data/mods/Aftershock/items/crafting_scrap/biomaterial_scrap.json +++ b/data/mods/Aftershock/items/crafting_scrap/biomaterial_scrap.json @@ -3,7 +3,7 @@ "type": "GENERIC", "id": "afs_biomaterial_1", "copy-from": "afs_scrap_1", - "name": { "str": "monomeric slurry" }, + "name": { "str_sp": "monomeric slurry" }, "description": "A collection of the building blocks of polymers. With this and a whole lot of know how you can create proteins and other building blocks of life.", "looks_like": "scrap" }, @@ -19,7 +19,7 @@ "type": "GENERIC", "id": "afs_biomaterial_3", "copy-from": "afs_scrap_1", - "name": { "str": "artificial muscle fibers" }, + "name": { "str_sp": "artificial muscle fibers" }, "description": "Lab grown or bioprinted muscle fibers, much denser and with higher performance ratios than baseline human muscles.", "looks_like": "scrap" }, @@ -27,7 +27,7 @@ "type": "GENERIC", "id": "afs_biomaterial_4", "copy-from": "afs_scrap_4", - "name": { "str": "self healing polymers" }, + "name": { "str_sp": "self healing polymers" }, "description": "Materials capable of taking environmental chemicals and utilizing them for self repair, be careful you don't make grey goo.", "looks_like": "scrap" }, diff --git a/data/mods/Aftershock/items/crafting_scrap/circuity_scrap.json b/data/mods/Aftershock/items/crafting_scrap/circuity_scrap.json index 1968618eeff09..cba9945bcabff 100644 --- a/data/mods/Aftershock/items/crafting_scrap/circuity_scrap.json +++ b/data/mods/Aftershock/items/crafting_scrap/circuity_scrap.json @@ -3,7 +3,7 @@ "type": "GENERIC", "id": "afs_circuitry_1", "copy-from": "afs_scrap_1", - "name": { "str": "scrap photonics" }, + "name": { "str_sp": "scrap photonics" }, "description": "Small circuits blue and gold, transmitting signals through light.", "looks_like": "scrap" }, @@ -11,7 +11,7 @@ "type": "GENERIC", "id": "afs_circuitry_2", "copy-from": "afs_scrap_2", - "name": { "str": "photonic circuitry" }, + "name": { "str": "photonic circuitry", "str_pl": "photonic circuitries" }, "description": "A resplendent golden grid inlaid on dark blue substrate.", "looks_like": "scrap" }, @@ -27,7 +27,7 @@ "type": "GENERIC", "id": "afs_circuitry_4", "copy-from": "afs_scrap_4", - "name": { "str": "hypergeometric photonics" }, + "name": { "str_sp": "hypergeometric photonics" }, "description": "In your hands lies a self-contained digital universe. Its programs glowing like stars fixed on computational shells infinitely layered.", "looks_like": "scrap" }, diff --git a/data/mods/Aftershock/items/crafting_scrap/energy_storage_scrap.json b/data/mods/Aftershock/items/crafting_scrap/energy_storage_scrap.json index 71e55af3b07e6..de1ef1fe91e6a 100644 --- a/data/mods/Aftershock/items/crafting_scrap/energy_storage_scrap.json +++ b/data/mods/Aftershock/items/crafting_scrap/energy_storage_scrap.json @@ -3,7 +3,7 @@ "type": "GENERIC", "id": "afs_energy_storage_1", "copy-from": "afs_scrap_1", - "name": { "str": "nanowire battery" }, + "name": { "str": "nanowire battery", "str_pl": "nanowire batteries" }, "description": "A small battery component with a very high energy density.", "looks_like": "scrap" }, diff --git a/data/mods/Aftershock/items/crafting_scrap/neural_io_scrap.json b/data/mods/Aftershock/items/crafting_scrap/neural_io_scrap.json index 0278bef0758af..cb2935a240929 100644 --- a/data/mods/Aftershock/items/crafting_scrap/neural_io_scrap.json +++ b/data/mods/Aftershock/items/crafting_scrap/neural_io_scrap.json @@ -35,7 +35,7 @@ "type": "GENERIC", "id": "afs_neural_io_5", "copy-from": "afs_scrap_5", - "name": { "str": "neurosynaptic interface matrix" }, + "name": { "str": "neurosynaptic interface matrix", "str_pl": "neurosynaptic interface matrices" }, "description": "A membrane of artificial neurons envelops the cerebral cortex, melding machine and human intellect into a gestalt much greater than its individual parts.", "looks_like": "scrap" } diff --git a/data/mods/CrazyCataclysm/crazy_comestibles.json b/data/mods/CrazyCataclysm/crazy_comestibles.json index b68acd1742247..8484f2026d12a 100644 --- a/data/mods/CrazyCataclysm/crazy_comestibles.json +++ b/data/mods/CrazyCataclysm/crazy_comestibles.json @@ -3,7 +3,7 @@ "copy-from": "cookies", "type": "COMESTIBLE", "id": "sporeos", - "name": "SpOreos", + "name": { "str_sp": "SpOreos" }, "color": "dark_gray", "spoils_in": 0, "symbol": "%", diff --git a/data/mods/Dark-Skies-Above/items/electronics.json b/data/mods/Dark-Skies-Above/items/electronics.json index ec07c8ac5ca45..baffaf3a265eb 100644 --- a/data/mods/Dark-Skies-Above/items/electronics.json +++ b/data/mods/Dark-Skies-Above/items/electronics.json @@ -4,7 +4,7 @@ "id": "broken_dks_emissary", "symbol": ",", "color": "green", - "name": "broken emissary", + "name": { "str": "broken emissary", "str_pl": "broken emissaries" }, "category": "other", "description": "The massive body of a collapsed emissary. Still a bit intimidating, perhaps knowing the damage it can cause. Could be gutted for parts.", "price": 1000, @@ -18,7 +18,7 @@ "id": "broken_dks_emissary_war", "symbol": ",", "color": "green", - "name": "broken emissary of war", + "name": { "str": "broken emissary of war", "str_pl": "broken emissaries of war" }, "category": "other", "description": "The massive body of a collapsed emissary of war. Still a bit intimidating, perhaps knowing the damage it can cause. Could be gutted for parts.", "price": 1000, @@ -32,7 +32,7 @@ "id": "broken_dks_emissary_flame", "symbol": ",", "color": "green", - "name": "broken emissary of flame", + "name": { "str": "broken emissary of flame", "str_pl": "broken emissaries of flame" }, "category": "other", "description": "The massive body of a collapsed emissary of flame. Still a bit intimidating, perhaps knowing the damage it can cause. Could be gutted for parts.", "price": 1000, diff --git a/data/mods/Dark-Skies-Above/monsters/wild_aliens/strays.json b/data/mods/Dark-Skies-Above/monsters/wild_aliens/strays.json index 31ef0afa0d4ac..4d0ec46ab741e 100644 --- a/data/mods/Dark-Skies-Above/monsters/wild_aliens/strays.json +++ b/data/mods/Dark-Skies-Above/monsters/wild_aliens/strays.json @@ -513,7 +513,7 @@ { "id": "dks_mon_stray_wretch", "type": "MONSTER", - "name": { "str": "stray wretch" }, + "name": { "str": "stray wretch", "str_pl": "stray wretches" }, "description": "This blur of jagged, crystal-fused limbs and hair might have been a housepet at some point, but now it leaps and skitters around like something out of a nightmare. It is likely that one day the very crystal that arms it will weigh overtake its body and weigh it to the ground, given its slow expansion across its body.", "default_faction": "stray", "looks_like": "mon_dog_skeleton", @@ -567,7 +567,7 @@ { "id": "dks_mon_crystal_baby", "type": "MONSTER", - "name": { "str": "germinating crystal mass" }, + "name": { "str": "germinating crystal mass", "str_pl": "germinating crystal masses" }, "description": "A human-sized mound of shimmering blue-purple crystals growing on the base of what looks like a mound of foul smelling garbage and organic leftovers. Long, thin tendrils appear to grow out of the mound, and are subtly rooting down into the ground below it, boring through dirt and concrete alike. It crackles weakly with electrical energy. If you look closely, it almost looks like something wet and meaty is squirming just inside the inner shell of crystals…", "default_faction": "stray", "bodytype": "blob", @@ -594,7 +594,7 @@ { "id": "dks_mon_crystal_shriek", "type": "MONSTER", - "name": { "str": "resonant crystal mass" }, + "name": { "str": "resonant crystal mass", "str_pl": "resonant crystal masses" }, "description": "A set of rail thin crystals growing haphazardly from a mound of rock and composted organic matter, fastened in place by thick strands of bizzare alien material. The buzzing of natural energy playing among the tines seems culminate into an almost musical sound. While pleasant at a distance, this can devolve to a deafening high pitched whine when it feels threatened.", "default_faction": "stray", "bodytype": "blob", @@ -623,7 +623,7 @@ { "id": "dks_mon_crystal_whip", "type": "MONSTER", - "name": { "str": "flailing crystal mass" }, + "name": { "str": "flailing crystal mass", "str_pl": "flailing crystal masses" }, "description": "A tall, singular crystal, growing out of a sizable pile of debris that has sprouted a multitude of thin, whiplike tendrils that constantly snake around it like feelers. It frequently grabs nearby objects and drags them into the pile beneath it, as if hoarding.", "default_faction": "stray", "bodytype": "blob", @@ -655,7 +655,7 @@ { "id": "dks_mon_crystal_zap", "type": "MONSTER", - "name": { "str": "energized crystal mass" }, + "name": { "str": "energized crystal mass", "str_pl": "energized crystal masses" }, "description": "A crooked, fiercely glowing blue-purple crystal that visibly discharges electricity into the surrounding environment without any particular intent.", "default_faction": "stray", "bodytype": "blob", diff --git a/data/mods/Magiclysm/items/cast_spell_items.json b/data/mods/Magiclysm/items/cast_spell_items.json index e471f5d688140..33d18f1d23130 100644 --- a/data/mods/Magiclysm/items/cast_spell_items.json +++ b/data/mods/Magiclysm/items/cast_spell_items.json @@ -39,7 +39,7 @@ }, { "id": "cats_grace_potion", - "name": "Potion of Cat's Grace", + "name": { "str": "Potion of Cat's Grace", "str_pl": "Potions of Cat's Grace" }, "description": "This is a potion of Cat's Grace. It will increase your dexterity for 10 minutes.", "use_action": { "type": "cast_spell", "spell_id": "cats_grace", "no_fail": true, "level": 9 }, "type": "COMESTIBLE", @@ -60,7 +60,7 @@ }, { "id": "ogres_strength_potion", - "name": "Potion of Ogre's Strength", + "name": { "str": "Potion of Ogre's Strength", "str_pl": "Potions of Ogre's Strength" }, "description": "This is a potion of Ogre's Strength. It will increase your strength for 10 minutes.", "use_action": { "type": "cast_spell", "spell_id": "ogres_strength", "no_fail": true, "level": 9 }, "type": "COMESTIBLE", @@ -68,7 +68,7 @@ }, { "id": "eagles_sight_potion", - "name": "Potion of Eagle's Sight", + "name": { "str": "Potion of Eagle's Sight", "str_pl": "Potions of Eagle's Sight" }, "description": "This is a potion of Eagle's Sight. It will increase your perception for 10 minutes.", "use_action": { "type": "cast_spell", "spell_id": "eagles_sight", "no_fail": true, "level": 9 }, "type": "COMESTIBLE", @@ -76,7 +76,7 @@ }, { "id": "foxs_cunning_potion", - "name": "Potion of Fox's Cunning", + "name": { "str": "Potion of Fox's Cunning", "str_pl": "Potions of Fox's Cunning" }, "description": "This is a potion of Fox's Cunning. It will increase your intelligence for 10 minutes.", "use_action": { "type": "cast_spell", "spell_id": "foxs_cunning", "no_fail": true, "level": 9 }, "type": "COMESTIBLE", @@ -120,7 +120,7 @@ }, { "id": "twisted_restore_potion", - "name": "potion of Twisted Restoration", + "name": { "str": "potion of Twisted Restoration", "str_pl": "potions of Twisted Restoration" }, "description": "This foul-smelling liquid simulates undead regeneration by accelerating your heart to dangerous levels. Drinking this in danger or at critical condition may be lethal.", "use_action": { "type": "cast_spell", "spell_id": "twisted_restore", "no_fail": true, "level": 1 }, "type": "COMESTIBLE", @@ -143,7 +143,7 @@ }, { "id": "twisted_restore_potion_improved", - "name": "potion of Improved Twisted Restoration", + "name": { "str": "potion of Improved Twisted Restoration", "str_pl": "potions of Improved Twisted Restoration" }, "description": "This foul-smelling liquid simulates undead regeneration by accelerating your heart to dangerous levels. Drinking this in danger or at critical condition may be lethal. Improved infusion techniques lessen the strain of the process.", "use_action": { "type": "cast_spell", "spell_id": "twisted_restore_improved", "no_fail": true, "level": 1 }, "type": "COMESTIBLE", diff --git a/data/mods/Magiclysm/items/ethereal_items.json b/data/mods/Magiclysm/items/ethereal_items.json index d83d971db81af..cfa9ba5711987 100644 --- a/data/mods/Magiclysm/items/ethereal_items.json +++ b/data/mods/Magiclysm/items/ethereal_items.json @@ -427,7 +427,7 @@ { "id": "protect_env", "type": "ARMOR", - "name": "aura of protection", + "name": { "str": "aura of protection", "str_pl": "auras of protection" }, "description": "An all-encompassing, invisible layer of magical aura that protects you from the environment.", "weight": "1 g", "volume": "1 ml", diff --git a/data/mods/Magiclysm/items/metals.json b/data/mods/Magiclysm/items/metals.json index 6ac4fa635ba4d..90d7cc06d1edd 100644 --- a/data/mods/Magiclysm/items/metals.json +++ b/data/mods/Magiclysm/items/metals.json @@ -3,7 +3,7 @@ "id": "orichalcum_lump", "type": "AMMO", "category": "spare_parts", - "name": "lump of orichalcum", + "name": { "str": "lump of orichalcum", "str_pl": "lumps of orichalcum" }, "description": "A lump of raw orichalcum. Needs to be reformed into an ingot to be useful.", "weight": "1000 g", "volume": "250 ml", @@ -22,7 +22,7 @@ "id": "orichalcum_sliver", "type": "AMMO", "category": "spare_parts", - "name": "sliver of orichalcum", + "name": { "str": "sliver of orichalcum", "str_pl": "slivers of orichalcum" }, "description": "A sliver of orichalcum broken from a larger piece. Needs to be reformed into an ingot to be useful.", "weight": "250 g", "volume": "250 ml", @@ -57,7 +57,7 @@ "id": "mercury", "type": "AMMO", "category": "spare_parts", - "name": "liquid mercury", + "name": { "str_sp": "liquid mercury" }, "ammo_type": "mercury", "description": "Elemental liquid mercury. Known for its use in thermometers.", "volume": "1 ml", From 454df6d83cb6345ffd0c1cefd907f3776d381d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jianxiang=20Wang=20=28=E7=8E=8B=E5=81=A5=E7=BF=94=29?= Date: Tue, 21 Apr 2020 00:14:29 +0800 Subject: [PATCH 3/3] Update data/json/items/ammo/8x40mm.json --- data/json/items/ammo/8x40mm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo/8x40mm.json b/data/json/items/ammo/8x40mm.json index e4200edb049aa..27e885d1e9a83 100644 --- a/data/json/items/ammo/8x40mm.json +++ b/data/json/items/ammo/8x40mm.json @@ -12,7 +12,7 @@ { "id": "8mm_caseless", "type": "AMMO", - "name": { "str": "8x40mm caseless", "str_pl": "8x40mm caselesses" }, + "name": { "str_sp": "8x40mm caseless" }, "//": "Cased ammo tends to be roughly $1/shot, more or less. Rivtech ammo, being New and Proprietary and Expensive, $2-2.50 or so.", "description": "8x40mm caseless rounds. Proprietary ammunition for Rivtech firearms. Being caseless rounds, these cannot be disassembled or reloaded.", "weight": "12 g",