diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json index c9bd632092ddd..e1e0e314a0187 100644 --- a/data/json/itemgroups/clothing.json +++ b/data/json/itemgroups/clothing.json @@ -522,6 +522,68 @@ { "group": "earrings_platinum", "prob": 10 } ] }, + { + "id": "cufflinks_silver", + "type": "item_group", + "items": [ + [ "cufflinks", 50 ], + [ "cufflinks_intricate", 50 ], + [ "citrine_silver_cufflinks", 50 ], + [ "diamond_silver_cufflinks", 50 ], + [ "emerald_silver_cufflinks", 50 ], + [ "peridot_silver_cufflinks", 50 ], + [ "amethyst_silver_cufflinks", 50 ], + [ "sapphire_silver_cufflinks", 50 ], + [ "aquamarine_silver_cufflinks", 50 ], + [ "blue_topaz_silver_cufflinks", 50 ], + [ "tourmaline_silver_cufflinks", 50 ], + [ "alexandrite_silver_cufflinks", 50 ], + [ "pearl_silver_cufflinks", 50 ], + [ "opal_silver_cufflinks", 50 ], + [ "ruby_silver_cufflinks", 50 ], + [ "garnet_silver_cufflinks", 50 ] + ] + }, + { + "id": "cufflinks_gold", + "type": "item_group", + "items": [ + [ "citrine_gold_cufflinks", 50 ], + [ "diamond_gold_cufflinks", 50 ], + [ "emerald_gold_cufflinks", 50 ], + [ "peridot_gold_cufflinks", 50 ], + [ "amethyst_gold_cufflinks", 50 ], + [ "sapphire_gold_cufflinks", 50 ], + [ "aquamarine_gold_cufflinks", 50 ], + [ "blue_topaz_gold_cufflinks", 50 ], + [ "tourmaline_gold_cufflinks", 50 ], + [ "alexandrite_gold_cufflinks", 50 ], + [ "pearl_gold_cufflinks", 50 ], + [ "opal_gold_cufflinks", 50 ], + [ "ruby_gold_cufflinks", 50 ], + [ "garnet_gold_cufflinks", 50 ] + ] + }, + { + "id": "cufflinks_platinum", + "type": "item_group", + "items": [ + [ "citrine_platinum_cufflinks", 50 ], + [ "diamond_platinum_cufflinks", 50 ], + [ "emerald_platinum_cufflinks", 50 ], + [ "peridot_platinum_cufflinks", 50 ], + [ "amethyst_platinum_cufflinks", 50 ], + [ "sapphire_platinum_cufflinks", 50 ], + [ "aquamarine_platinum_cufflinks", 50 ], + [ "blue_topaz_platinum_cufflinks", 50 ], + [ "tourmaline_platinum_cufflinks", 50 ], + [ "alexandrite_platinum_cufflinks", 50 ], + [ "pearl_platinum_cufflinks", 50 ], + [ "opal_platinum_cufflinks", 50 ], + [ "ruby_platinum_cufflinks", 50 ], + [ "garnet_platinum_cufflinks", 50 ] + ] + }, { "id": "dental_grills", "type": "item_group", diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json index 98e30a2f5d352..821569189d947 100644 --- a/data/json/itemgroups/item_groups.json +++ b/data/json/itemgroups/item_groups.json @@ -3178,6 +3178,9 @@ { "group": "rings_gold", "prob": 10 }, { "group": "rings_platinum", "prob": 5 }, { "group": "dental_grills", "prob": 10 }, + { "group": "cufflinks_silver", "prob": 30, "count": [ 1, 3 ] }, + { "group": "cufflinks_gold", "prob": 10, "count": [ 1, 3 ] }, + { "group": "cufflinks_platinum", "prob": 5, "count": [ 1, 3 ] }, { "group": "gemstones", "prob": 30 }, [ "gold_ring", 30 ], [ "gold_ear", 30 ], diff --git a/data/json/items/armor/jewelry.json b/data/json/items/armor/jewelry.json index 497202ad2be79..e7092a58101a6 100644 --- a/data/json/items/armor/jewelry.json +++ b/data/json/items/armor/jewelry.json @@ -354,6 +354,363 @@ "symbol": "[", "color": "light_gray" }, + { + "id": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "garnet and gold cufflinks" }, + "description": "A pair of cufflinks with inset garnets.", + "weight": "15 g", + "volume": 0, + "price": 3500, + "price_postapoc": 100, + "material": [ "gold", "gemstone" ], + "looks_like": "cufflinks", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "diamond_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "diamond and gold cufflinks" }, + "description": "A pair of cufflinks with inset diamonds.", + "material": [ "gold", "diamond" ], + "color": "white" + }, + { + "id": "amethyst_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "amethyst and gold cufflinks" }, + "description": "A pair of cufflinks with inset amethysts.", + "color": "blue" + }, + { + "id": "aquamarine_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "aquamarine and gold cufflinks" }, + "description": "A pair of cufflinks with inset aquamarines.", + "color": "light_blue" + }, + { + "id": "emerald_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "emerald and gold cufflinks" }, + "description": "A pair of cufflinks with inset emeralds.", + "color": "green" + }, + { + "id": "alexandrite_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "alexandrite and gold cufflinks" }, + "description": "A pair of cufflinks with inset alexandrites.", + "color": "green" + }, + { + "id": "ruby_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "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" }, + "description": "A pair of cufflinks with inset peridots.", + "color": "light_green" + }, + { + "id": "sapphire_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "sapphire and gold cufflinks" }, + "description": "A pair of cufflinks with inset sapphires.", + "color": "blue" + }, + { + "id": "tourmaline_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "tourmaline and gold cufflinks" }, + "description": "A pair of cufflinks with inset tourmalines.", + "color": "light_red" + }, + { + "id": "citrine_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "citrine and gold cufflinks" }, + "description": "A pair of cufflinks with inset citrines.", + "color": "yellow" + }, + { + "id": "blue_topaz_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "blue topaz and gold cufflinks" }, + "description": "A pair of cufflinks with inset blue topaz.", + "color": "light_blue" + }, + { + "id": "opal_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "opal and gold cufflinks" }, + "description": "A pair of cufflinks with inset opals.", + "color": "white" + }, + { + "id": "pearl_gold_cufflinks", + "copy-from": "garnet_gold_cufflinks", + "type": "ARMOR", + "name": { "str": "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" }, + "description": "A pair of cufflinks with inset garnets.", + "weight": "15 g", + "volume": 0, + "price": 3500, + "price_postapoc": 100, + "material": [ "silver", "gemstone" ], + "looks_like": "cufflinks", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "diamond_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "diamond and silver cufflinks" }, + "description": "A pair of cufflinks with inset diamonds.", + "material": [ "silver", "diamond" ], + "color": "white" + }, + { + "id": "amethyst_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "amethyst and silver cufflinks" }, + "description": "A pair of cufflinks with inset amethysts.", + "color": "blue" + }, + { + "id": "aquamarine_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "aquamarine and silver cufflinks" }, + "description": "A pair of cufflinks with inset aquamarines.", + "color": "light_blue" + }, + { + "id": "emerald_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "emerald and silver cufflinks" }, + "description": "A pair of cufflinks with inset emeralds.", + "color": "green" + }, + { + "id": "alexandrite_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "alexandrite and silver cufflinks" }, + "description": "A pair of cufflinks with inset alexandrites.", + "color": "green" + }, + { + "id": "ruby_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "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" }, + "description": "A pair of cufflinks with inset peridots.", + "color": "light_green" + }, + { + "id": "sapphire_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "sapphire and silver cufflinks" }, + "description": "A pair of cufflinks with inset sapphires.", + "color": "blue" + }, + { + "id": "tourmaline_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "tourmaline and silver cufflinks" }, + "description": "A pair of cufflinks with inset tourmalines.", + "color": "light_red" + }, + { + "id": "citrine_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "citrine and silver cufflinks" }, + "description": "A pair of cufflinks with inset citrines.", + "color": "yellow" + }, + { + "id": "blue_topaz_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "blue topaz and silver cufflinks" }, + "description": "A pair of cufflinks with inset blue topaz.", + "color": "light_blue" + }, + { + "id": "opal_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "opal and silver cufflinks" }, + "description": "A pair of cufflinks with inset opals.", + "color": "white" + }, + { + "id": "pearl_silver_cufflinks", + "copy-from": "garnet_silver_cufflinks", + "type": "ARMOR", + "name": { "str": "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" }, + "description": "A pair of cufflinks with inset garnets.", + "weight": "15 g", + "volume": 0, + "price": 3500, + "price_postapoc": 100, + "material": [ "platinum", "gemstone" ], + "looks_like": "cufflinks", + "symbol": "[", + "color": "red", + "flags": [ "FANCY" ] + }, + { + "id": "diamond_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "diamond and platinum cufflinks" }, + "description": "A pair of cufflinks with inset diamonds.", + "material": [ "platinum", "diamond" ], + "color": "white" + }, + { + "id": "amethyst_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "amethyst and platinum cufflinks" }, + "description": "A pair of cufflinks with inset amethysts.", + "color": "blue" + }, + { + "id": "aquamarine_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "aquamarine and platinum cufflinks" }, + "description": "A pair of cufflinks with inset aquamarines.", + "color": "light_blue" + }, + { + "id": "emerald_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "emerald and platinum cufflinks" }, + "description": "A pair of cufflinks with inset emeralds.", + "color": "green" + }, + { + "id": "alexandrite_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "alexandrite and platinum cufflinks" }, + "description": "A pair of cufflinks with inset alexandrites.", + "color": "green" + }, + { + "id": "ruby_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "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" }, + "description": "A pair of cufflinks with inset peridots.", + "color": "light_green" + }, + { + "id": "sapphire_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "sapphire and platinum cufflinks" }, + "description": "A pair of cufflinks with inset sapphires.", + "color": "blue" + }, + { + "id": "tourmaline_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "tourmaline and platinum cufflinks" }, + "description": "A pair of cufflinks with inset tourmalines.", + "color": "light_red" + }, + { + "id": "citrine_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "citrine and platinum cufflinks" }, + "description": "A pair of cufflinks with inset citrines.", + "color": "yellow" + }, + { + "id": "blue_topaz_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "blue topaz and platinum cufflinks" }, + "description": "A pair of cufflinks with inset blue topaz.", + "color": "light_blue" + }, + { + "id": "opal_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "opal and platinum cufflinks" }, + "description": "A pair of cufflinks with inset opals.", + "color": "white" + }, + { + "id": "pearl_platinum_cufflinks", + "copy-from": "garnet_platinum_cufflinks", + "type": "ARMOR", + "name": { "str": "pearl and platinum cufflinks" }, + "description": "A pair of cufflinks with inset pearls.", + "color": "white" + }, { "id": "ear_spool", "type": "ARMOR",