add rings and bracelets (#36278)

* add rings and bracelets * update name strings * lint * Update jewelry.json
CleverRaven · Dec 21, 2019 · bfb1fcc · bfb1fcc
1 parent 0bac1c9
commit bfb1fcc
Show file tree

Hide file tree

Showing 3 changed files with 912 additions and 103 deletions.
diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json
@@ -605,6 +605,132 @@
       [ "garnet_platinum_earring", 50 ]
     ]
   },
+  {
+    "id": "rings_silver",
+    "type": "item_group",
+    "items": [
+      [ "silver_ring", 50 ],
+      [ "citrine_silver_ring", 50 ],
+      [ "diamond_silver_ring", 50 ],
+      [ "emerald_silver_ring", 50 ],
+      [ "peridot_silver_ring", 50 ],
+      [ "amethyst_silver_ring", 50 ],
+      [ "sapphire_silver_ring", 50 ],
+      [ "aquamarine_silver_ring", 50 ],
+      [ "blue_topaz_silver_ring", 50 ],
+      [ "tourmaline_silver_ring", 50 ],
+      [ "alexandrite_silver_ring", 50 ],
+      [ "pearl_silver_ring", 50 ],
+      [ "opal_silver_ring", 50 ],
+      [ "ruby_silver_ring", 50 ],
+      [ "garnet_silver_ring", 50 ]
+    ]
+  },
+  {
+    "id": "rings_gold",
+    "type": "item_group",
+    "items": [
+      [ "gold_ring", 50 ],
+      [ "citrine_gold_ring", 50 ],
+      [ "diamond_ring", 50 ],
+      [ "emerald_gold_ring", 50 ],
+      [ "peridot_gold_ring", 50 ],
+      [ "amethyst_gold_ring", 50 ],
+      [ "sapphire_gold_ring", 50 ],
+      [ "aquamarine_gold_ring", 50 ],
+      [ "blue_topaz_gold_ring", 50 ],
+      [ "tourmaline_gold_ring", 50 ],
+      [ "alexandrite_gold_ring", 50 ],
+      [ "pearl_gold_ring", 50 ],
+      [ "opal_gold_ring", 50 ],
+      [ "ruby_gold_ring", 50 ],
+      [ "garnet_gold_ring", 50 ]
+    ]
+  },
+  {
+    "id": "rings_platinum",
+    "type": "item_group",
+    "items": [
+      [ "platinum_ring", 50 ],
+      [ "citrine_platinum_ring", 50 ],
+      [ "diamond_platinum_ring", 50 ],
+      [ "emerald_platinum_ring", 50 ],
+      [ "peridot_platinum_ring", 50 ],
+      [ "amethyst_platinum_ring", 50 ],
+      [ "sapphire_platinum_ring", 50 ],
+      [ "aquamarine_platinum_ring", 50 ],
+      [ "blue_topaz_platinum_ring", 50 ],
+      [ "tourmaline_platinum_ring", 50 ],
+      [ "alexandrite_platinum_ring", 50 ],
+      [ "pearl_platinum_ring", 50 ],
+      [ "opal_platinum_ring", 50 ],
+      [ "ruby_platinum_ring", 50 ],
+      [ "garnet_platinum_ring", 50 ]
+    ]
+  },
+  {
+    "id": "bracelets_silver",
+    "type": "item_group",
+    "items": [
+      [ "silver_bracelet", 50 ],
+      [ "citrine_silver_bracelet", 50 ],
+      [ "diamond_silver_bracelet", 50 ],
+      [ "emerald_silver_bracelet", 50 ],
+      [ "peridot_silver_bracelet", 50 ],
+      [ "amethyst_silver_bracelet", 50 ],
+      [ "sapphire_silver_bracelet", 50 ],
+      [ "aquamarine_silver_bracelet", 50 ],
+      [ "blue_topaz_silver_bracelet", 50 ],
+      [ "tourmaline_silver_bracelet", 50 ],
+      [ "alexandrite_silver_bracelet", 50 ],
+      [ "pearl_silver_bracelet", 50 ],
+      [ "opal_silver_bracelet", 50 ],
+      [ "ruby_silver_bracelet", 50 ],
+      [ "garnet_silver_bracelet", 50 ]
+    ]
+  },
+  {
+    "id": "bracelets_gold",
+    "type": "item_group",
+    "items": [
+      [ "gold_bracelet", 50 ],
+      [ "citrine_gold_bracelet", 50 ],
+      [ "diamond_gold_bracelet", 50 ],
+      [ "emerald_gold_bracelet", 50 ],
+      [ "peridot_gold_bracelet", 50 ],
+      [ "amethyst_gold_bracelet", 50 ],
+      [ "sapphire_gold_bracelet", 50 ],
+      [ "aquamarine_gold_bracelet", 50 ],
+      [ "blue_topaz_gold_bracelet", 50 ],
+      [ "tourmaline_gold_bracelet", 50 ],
+      [ "alexandrite_gold_bracelet", 50 ],
+      [ "pearl_gold_bracelet", 50 ],
+      [ "opal_gold_bracelet", 50 ],
+      [ "ruby_gold_bracelet", 50 ],
+      [ "garnet_gold_bracelet", 50 ]
+    ]
+  },
+  {
+    "id": "bracelets_platinum",
+    "type": "item_group",
+    "items": [
+      [ "platinum_bracelet", 50 ],
+      [ "citrine_platinum_bracelet", 50 ],
+      [ "diamond_platinum_bracelet", 50 ],
+      [ "emerald_platinum_bracelet", 50 ],
+      [ "peridot_platinum_bracelet", 50 ],
+      [ "amethyst_platinum_bracelet", 50 ],
+      [ "sapphire_platinum_bracelet", 50 ],
+      [ "aquamarine_platinum_bracelet", 50 ],
+      [ "blue_topaz_platinum_bracelet", 50 ],
+      [ "tourmaline_platinum_bracelet", 50 ],
+      [ "alexandrite_platinum_bracelet", 50 ],
+      [ "pearl_platinum_bracelet", 50 ],
+      [ "opal_platinum_bracelet", 50 ],
+      [ "ruby_platinum_bracelet", 50 ],
+      [ "garnet_platinum_bracelet", 50 ]
+    ]
+  },
   {
     "type": "item_group",
     "id": "shirts_summer_unisex",

diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json
@@ -3171,6 +3171,13 @@
       { "group": "earrings_gold", "prob": 10 },
       { "group": "earrings_platinum", "prob": 5 },
       { "group": "dental_grills", "prob": 10 },
+      { "group": "bracelets_silver", "prob": 30 },
+      { "group": "bracelets_gold", "prob": 10 },
+      { "group": "bracelets_platinum", "prob": 5 },
+      { "group": "rings_silver", "prob": 30 },
+      { "group": "rings_gold", "prob": 10 },
+      { "group": "rings_platinum", "prob": 5 },
+      { "group": "dental_grills", "prob": 10 },
       { "group": "gemstones", "prob": 30 },
       [ "gold_ring", 30 ],
       [ "gold_ear", 30 ],