Merge branch 'doctorkompot/new_necklaces' into 'master'

DoctorKompot - New Necklaces

See merge request veloren/veloren!2940

assets/common/items/armor/cultist/necklace.ron

@@ -0,0 +1,17 @@
+ItemDef(
+    name: "Cultist Amulet",
+    description: "You can still feel the Mindflayer's presence within this amulet...",
+    kind: Armor((
+        kind: Neck("Cultist"),
+        stats: (
+            protection: Normal(2.0),
+            poise_resilience: Normal(0.0),
+            energy_max: 10,
+            energy_reward: 0.05,
+            crit_power: 0.06,
+            stealth: 0.0,
+        ),
+    )),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/armor/cultist/ring.ron

@@ -0,0 +1,17 @@
+ItemDef(
+    name: "Cultist Signet Ring ",
+    description: "Once belonged to a cultist.",
+    kind: Armor((
+        kind: Ring("Cultist"),
+        stats: (
+            protection: Normal(1.0),
+            poise_resilience: Normal(0.0),
+            energy_max: 5,
+            energy_reward: 0.025,
+            crit_power: 0.02,
+            stealth: 0.0,
+        ),
+    )),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/armor/misc/neck/amethyst.ron

@@ -0,0 +1,17 @@
+ItemDef(
+    name: "Amethyst Necklace",
+    description: "A tin necklace lined with amethyst gems.",
+    kind: Armor((
+        kind: Neck("Amethyst"),
+        stats: (
+            protection: Normal(1.0),
+            poise_resilience: Normal(0.0),
+            energy_max: 0,
+            energy_reward: 0.1,
+            crit_power: 0.0,
+            stealth: 0.0,
+        ),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/armor/misc/neck/ankh_of_life.ron

@@ -0,0 +1,17 @@
+ItemDef(
+    name: "Ankh of Life",
+    description: "A unique necklace of unkown origin... You can feel the power flowing through it.",
+    kind: Armor((
+        kind: Neck("Ankh"),
+        stats: (
+            protection: Normal(2.0),
+            poise_resilience: Normal(0.0),
+            energy_max: 20,
+            energy_reward: 0.1,
+            crit_power: 0.0,
+            stealth: 0.0,
+        ),
+    )),
+    quality: Legendary,
+    tags: [],
+)

assets/common/items/armor/misc/neck/carcanet_of_wrath.ron

@@ -0,0 +1,17 @@
+ItemDef(
+    name: "Carcanet of Wrath",
+    description: "A necklace that gives even the most feeble beings immense amounts of power.",
+    kind: Armor((
+        kind: Neck("Carcanet"),
+        stats: (
+            protection: Normal(2.0),
+            poise_resilience: Normal(0.0),
+            energy_max: 0,
+            energy_reward: 0.0,
+            crit_power: 0.2,
+            stealth: 0.0,
+        ),
+    )),
+    quality: Legendary,
+    tags: [],
+)

assets/common/items/armor/misc/neck/diamond.ron

@@ -0,0 +1,17 @@
+ItemDef(
+    name: "Diamond Necklace",
+    description: "An expensive gold necklace, ornate with exquisite diamonds.",
+    kind: Armor((
+        kind: Neck("Diamond"),
+        stats: (
+            protection: Normal(1.0),
+            poise_resilience: Normal(0.0),
+            energy_max: 0,
+            energy_reward: -0.1,
+            crit_power: 0.1,
+            stealth: 0.0,
+        ),
+    )),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/armor/misc/neck/emerald.ron

@@ -0,0 +1,17 @@
+ItemDef(
+    name: "Emerald Necklace",
+    description: "A cobalt necklace, bearing beautiful emerald gems.",
+    kind: Armor((
+        kind: Neck("Emerald"),
+        stats: (
+            protection: Normal(1.0),
+            poise_resilience: Normal(0.0),
+            energy_max: 20.0,
+            energy_reward: -0.2,
+            crit_power: 0.0,
+            stealth: 0.0,
+        ),
+    )),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/armor/misc/neck/fang.ron

@@ -0,0 +1,17 @@
+ItemDef(
+    name: "Fang Necklace",
+    description: "Only the most savage beings can handle the power of this necklace...",
+    kind: Armor((
+        kind: Neck("Fang"),
+        stats: (
+            protection: Normal(1.0),
+            poise_resilience: Normal(0.0),
+            energy_max: 0.0,
+            energy_reward: 0.0,
+            crit_power: 0.07,
+            stealth: 0.0,
+        ),
+    )),
+    quality: High,
+    tags: [],
+)

assets/common/items/armor/misc/neck/gem_of_resilience.ron

@@ -1,11 +1,11 @@
 ItemDef(
-    name: "Gem of lesser Protection",
+    name: "Gem of Resilience",
     description: "Surrounded by a discrete magical glow.",
     kind: Armor((
-        kind: Neck("Plain1"),
+        kind: Neck("ResilienceGem"),
         stats: (
             protection: Normal(2.0),
-            poise_resilience: Normal(0.0),
+            poise_resilience: Normal(1.0),
             energy_max: 0,
             energy_reward: 0.0,
             crit_power: 0.0,
@@ -13,7 +13,5 @@ ItemDef(
         ),
     )),
     quality: Moderate,
-    tags: [
-        Material(Steel)
-    ],
+    tags: [],
 )

assets/common/items/armor/misc/neck/gold.ron

@@ -0,0 +1,17 @@
+ItemDef(
+    name: "Gold Necklace",
+    description: "An expensive gold necklace... looks stolen.",
+    kind: Armor((
+        kind: Neck("Gold"),
+        stats: (
+            protection: Normal(1.0),
+            poise_resilience: Normal(0.0),
+            energy_max: 10,
+            energy_reward: 0.0,
+            crit_power: 0.02,
+            stealth: 0.0,
+        ),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/armor/misc/neck/haniwa_talisman.ron

@@ -1,11 +1,11 @@
 ItemDef(
-    name: "Cultist Signet Ring ",
-    description: "Once belonged to a cultist.",
+    name: "Haniwa Talisman",
+    description: "A talisman depicting a figure of unkown origin.",
     kind: Armor((
-        kind: Ring("Skull"),
+        kind: Neck("Haniwa"),
         stats: (
             protection: Normal(3.0),
-            poise_resilience: Normal(0.0),
+            poise_resilience: Normal(2.0),
             energy_max: 0,
             energy_reward: 0.0,
             crit_power: 0.0,

assets/common/items/armor/misc/neck/honeycomb_pendant.ron

@@ -0,0 +1,17 @@
+ItemDef(
+    name: "Honeycomb Pendant",
+    description: "This necklace is always spewing out honey...",
+    kind: Armor((
+        kind: Neck("Honeycomb"),
+        stats: (
+            protection: Normal(1.0),
+            poise_resilience: Normal(0.0),
+            energy_max: 10,
+            energy_reward: 0.05,
+            crit_power: 0.0,
+            stealth: 0.0,
+        ),
+    )),
+    quality: High,
+    tags: [],
+)

assets/common/items/armor/misc/neck/pendant_of_protection.ron

@@ -1,8 +1,8 @@
 ItemDef(
-    name: "Plain Necklace",
-    description: "It's become tarnished with age.",
+    name: "Pendant of Protection",
+    description: "You feel as if something is always watching you...",
     kind: Armor((
-        kind: Neck("Plain0"),
+        kind: Neck("Pendant"),
         stats: (
             protection: Normal(1.0),
             poise_resilience: Normal(0.0),
@@ -13,7 +13,5 @@ ItemDef(
         ),
     )),
     quality: Common,
-    tags: [
-        Material(Iron)
-    ],
+    tags: [],
 )

assets/common/items/armor/misc/neck/ruby.ron

@@ -0,0 +1,17 @@
+ItemDef(
+    name: "Ruby Necklace",
+    description: "An ornate silver necklace, embedded with beautiful rubies.",
+    kind: Armor((
+        kind: Neck("Ruby"),
+        stats: (
+            protection: Normal(1.0),
+            poise_resilience: Normal(0.0),
+            energy_max: 0.0,
+            energy_reward: 0.2,
+            crit_power: -0.06,
+            stealth: 0.0,
+        ),
+    )),
+    quality: Epic,
+    tags: [],
+)

assets/common/items/armor/misc/neck/sapphire.ron

@@ -0,0 +1,17 @@
+ItemDef(
+    name: "Sapphire Necklace",
+    description: "A sturdy iron necklace, with polished sapphire gems embedded into it.",
+    kind: Armor((
+        kind: Neck("Sapphire"),
+        stats: (
+            protection: Normal(1.0),
+            poise_resilience: Normal(0.0),
+            energy_max: 0,
+            energy_reward: 0.0,
+            crit_power: 0.05,
+            stealth: 0.0,
+        ),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/armor/misc/neck/scratched.ron

@@ -0,0 +1,17 @@
+ItemDef(
+    name: "Scratched Necklace",
+    description: "The string is about to snap...",
+    kind: Armor((
+        kind: Neck("Scratched"),
+        stats: (
+            protection: Normal(0.5),
+            poise_resilience: Normal(0.0),
+            energy_max: 0,
+            energy_reward: 0.0,
+            crit_power: 0.0,
+            stealth: 0.0,
+        ),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/armor/misc/neck/shell.ron

@@ -1,11 +1,11 @@
 ItemDef(
     name: "Seashell Necklace",
-    description: "Contains the guardian aura of the ocean",
+    description: "Contains the guardian aura of the ocean.",
     kind: Armor((
         kind: Neck("Shell"),
         stats: (
             protection: Normal(2.0),
-            poise_resilience: Normal(0.0),
+            poise_resilience: Normal(1.0),
             energy_max: 0,
             energy_reward: 0.0,
             crit_power: 0.0,

assets/common/items/armor/misc/neck/topaz.ron

@@ -0,0 +1,17 @@
+ItemDef(
+    name: "Topaz Necklace",
+    description: "A copper necklace, with topaz embedded in the center.",
+    kind: Armor((
+        kind: Neck("Topaz"),
+        stats: (
+            protection: Normal(1.0),
+            poise_resilience: Normal(0.0),
+            energy_max: 10.0,
+            energy_reward: 0.00,
+            crit_power: 0.0,
+            stealth: 0.0,
+        ),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/armor/misc/ring/amethyst.ron

@@ -4,10 +4,10 @@ ItemDef(
     kind: Armor((
         kind: Ring("Amethyst"),
         stats: (
-            protection: Normal(0.0),
+            protection: Normal(0.5),
             poise_resilience: Normal(0.0),
             energy_max: 0,
-            energy_reward: 0.025,
+            energy_reward: 0.05,
             crit_power: 0.0,
             stealth: 0.0,
         ),

assets/common/items/armor/misc/ring/diamond.ron

@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Ring("Diamond"),
         stats: (
-            protection: Normal(0.0),
+            protection: Normal(0.5),
             poise_resilience: Normal(0.0),
             energy_max: 0,
             energy_reward: -0.05,
-            crit_power: 0.1,
+            crit_power: 0.05,
             stealth: 0.0,
         ),
     )),

assets/common/items/armor/misc/ring/emerald.ron

@@ -4,14 +4,14 @@ ItemDef(
     kind: Armor((
         kind: Ring("Emerald"),
         stats: (
-            protection: Normal(0.0),
+            protection: Normal(0.5),
             poise_resilience: Normal(0.0),
             energy_max: 10.0,
-            energy_reward: 0.0,
-            crit_power: -0.025,
+            energy_reward: -0.1,
+            crit_power: 0.0,
             stealth: 0.0,
         ),
     )),
-    quality: Moderate,
+    quality: Epic,
     tags: [],
 )

assets/common/items/armor/misc/ring/gold.ron

@@ -6,9 +6,9 @@ ItemDef(
         stats: (
             protection: Normal(0.5),
             poise_resilience: Normal(0.0),
-            energy_max: 0,
+            energy_max: 5,
             energy_reward: 0.0,
-            crit_power: 0.0,
+            crit_power: 0.01,
             stealth: 0.0,
         ),
     )),

assets/common/items/armor/misc/ring/ruby.ron

@@ -4,14 +4,14 @@ ItemDef(
     kind: Armor((
         kind: Ring("Ruby"),
         stats: (
-            protection: Normal(0.0),
+            protection: Normal(0.5),
             poise_resilience: Normal(0.0),
-            energy_max: -10.0,
-            energy_reward: 0.05,
-            crit_power: 0.0,
+            energy_max: 0.0,
+            energy_reward: 0.1,
+            crit_power: -0.03,
             stealth: 0.0,
         ),
     )),
-    quality: High,
+    quality: Epic,
     tags: [],
 )

assets/common/items/armor/misc/ring/sapphire.ron

@@ -4,11 +4,11 @@ ItemDef(
     kind: Armor((
         kind: Ring("Sapphire"),
         stats: (
-            protection: Normal(0.0),
+            protection: Normal(0.5),
             poise_resilience: Normal(0.0),
             energy_max: 0,
             energy_reward: 0.0,
-            crit_power: 0.05,
+            crit_power: 0.025,
             stealth: 0.0,
         ),
     )),

assets/common/items/armor/misc/ring/scratched.ron

@@ -4,7 +4,7 @@ ItemDef(
     kind: Armor((
         kind: Ring("Scratched"),
         stats: (
-            protection: Normal(0.1),
+            protection: Normal(0.5),
             poise_resilience: Normal(0.0),
             energy_max: 0,
             energy_reward: 0.0,

assets/common/items/armor/misc/ring/topaz.ron

@@ -4,7 +4,7 @@ ItemDef(
     kind: Armor((
         kind: Ring("Topaz"),
         stats: (
-            protection: Normal(0.0),
+            protection: Normal(0.5),
             poise_resilience: Normal(0.0),
             energy_max: 5.0,
             energy_reward: 0.00,

assets/common/loadout/test.ron

@@ -17,7 +17,7 @@
 
     // Biju
     Armor(Back): Item("common.items.armor.misc.back.dungeon_purple"),
-    Armor(Neck): Item("common.items.armor.misc.neck.plain_1"),
+    Armor(Neck): Item("common.items.armor.misc.neck.gem_of_resilience"),
     Armor(Ring1): Item("common.items.armor.misc.ring.gold"),
     Armor(Ring2): Item("common.items.armor.misc.ring.gold"),
     

assets/common/loadout/village/merchant.ron

@@ -7,7 +7,7 @@
     Armor(Belt): Item("common.items.armor.twigsflowers.belt"),
 
     Lantern: Item("common.items.lantern.black_0"),
-    Armor(Neck): Item("common.items.armor.misc.neck.plain_1"),
+    Armor(Neck): Item("common.items.armor.misc.neck.gem_of_resilience"),
     Armor(Ring1): Item("common.items.armor.misc.ring.gold"),
     Armor(Ring2): Item("common.items.armor.misc.ring.gold"),
 })

assets/common/loot_tables/cave_large.ron

@@ -1,14 +1,20 @@
 [
-    // Misc
-    (0.25, Item("common.items.armor.misc.neck.plain_1")),
+    // Necklaces
+    (0.25, Item("common.items.armor.misc.neck.gem_of_resilience")),
+    (0.05, Item("common.items.armor.misc.neck.gold")),
+    // Materials
     (1.5, LootTable("common.loot_tables.materials.common")),
     (3.5, LootTable("common.loot_tables.materials.underground")),
+    // Gliders
     (0.1, Item("common.items.glider.blue")),
     (0.05, Item("common.items.glider.morpho")),
     (0.05, Item("common.items.glider.monarch")),
     (0.05, Item("common.items.glider.moth")),
+    // Ring
     (0.05, Item("common.items.armor.misc.ring.gold")),
+    // Lantern
     (0.1, Item("common.items.lantern.geode_purp")),
+    // Weapons
     (2.0, LootTable("common.loot_tables.weapons.tier-3")),
     (1.5, LootTable("common.loot_tables.weapons.tier-4")),
     (1.0, LootTable("common.loot_tables.weapons.tier-5")),

assets/common/loot_tables/creature/biped_large/saurok.ron

@@ -4,6 +4,8 @@
     (0.5, Item("common.items.consumable.potion_minor")),
     // Ring
     (0.2, Item("common.items.armor.misc.ring.gold")),
+    // Necklace
+    (0.2, Item("common.items.armor.misc.neck.gold")),
     // Utility
     (0.1, Item("common.items.utility.collar")),
     // Bag

assets/common/loot_tables/creature/humanoid.ron

@@ -7,6 +7,8 @@
     (1.0, LootTable("common.loot_tables.armor.cloth")),
     // Ring
     (0.02, Item("common.items.armor.misc.ring.gold")),
+    // Necklace
+    (0.02, Item("common.items.armor.misc.neck.gold")),
     // Utility
     (0.05, Item("common.items.utility.collar")),
     // Food

assets/common/loot_tables/dungeon/tier-0/boss.ron

@@ -1,4 +1,7 @@
 [
+    // Weapons
     (1.0, LootTable("common.loot_tables.weapons.tier-0")),
+    // Armor
     (1.0, LootTable("common.loot_tables.armor.tier-0")),
-]
+    (1.0, Item("common.items.armor.misc.neck.scratched")),
+]

assets/common/loot_tables/dungeon/tier-1/boss.ron

@@ -1,4 +1,7 @@
 [
+    // Weapons
     (1.0, LootTable("common.loot_tables.weapons.tier-1")),
+    // Armor
     (1.0, LootTable("common.loot_tables.armor.tier-1")),
-]
+    (1.0, Item("common.items.armor.misc.neck.pendant_of_protection")),
+]

assets/common/loot_tables/dungeon/tier-2/boss.ron

@@ -2,6 +2,7 @@
     // Equipment
     (5.0, LootTable("common.loot_tables.weapons.tier-2")),
     (5.0, LootTable("common.loot_tables.armor.tier-2")),
+    (2.0, Item("common.items.armor.misc.neck.gem_of_resilience")),
     // Special Loot
     (1.0, Item("common.items.armor.misc.bag.heavy_seabag")),
-]
+]

assets/common/loot_tables/dungeon/tier-3/boss.ron

@@ -1,4 +1,7 @@
 [
+    // Weapons
     (1.0, LootTable("common.loot_tables.weapons.tier-3")),
+    // Armor
     (1.0, LootTable("common.loot_tables.armor.tier-3")),
-]
+    (0.3, Item("common.items.armor.misc.neck.haniwa_talisman")),
+]

assets/common/loot_tables/dungeon/tier-4/boss.ron

@@ -1,11 +1,12 @@
 [
-    // tier equipment
+    // Armor
     (10.0, LootTable("common.loot_tables.weapons.tier-5")),
     (10.0, LootTable("common.loot_tables.armor.tier-5")),
+    (1.0, Item("common.items.armor.misc.neck.carcanet_of_wrath")),
     // Legendary weapons
     (1.0, LootTable("common.loot_tables.weapons.legendary_melee")),
     // Crafting material
     (1.0, ItemQuantity("common.items.crafting_ing.cloth.sunsilk", 3, 10)),
     (1.0, ItemQuantity("common.items.crafting_ing.hide.dragon_scale", 3, 10)),
     (1.0, ItemQuantity("common.items.mineral.ingot.orichalcum", 3, 10)),
-]
+]

assets/common/loot_tables/dungeon/tier-5/boss.ron

@@ -7,6 +7,8 @@
     // Rare misc items
     (1.0, Item("common.items.boss_drops.lantern")),
     (1.0, Item("common.items.glider.skullgrin")),
+    (1.0, Item("common.items.armor.cultist.necklace")),
+    (0.01, Item("common.items.armor.misc.neck.ankh_of_life")),
     // Legendary weapons
     (1.0, LootTable("common.loot_tables.weapons.legendary_ranged")),
     // Crafting material
@@ -14,4 +16,4 @@
     (1.0, ItemQuantity("common.items.crafting_ing.cloth.sunsilk", 3, 10)),
     (1.0, ItemQuantity("common.items.crafting_ing.hide.dragon_scale", 3, 10)),
     (1.0, ItemQuantity("common.items.mineral.ingot.orichalcum", 3, 10)),
-]
+]

assets/common/loot_tables/dungeon/tier-5/miniboss.ron

@@ -5,8 +5,10 @@
     (5.0, LootTable("common.loot_tables.food.prepared")),
     // Consumables
     (5.0, LootTable("common.loot_tables.consumable.good")),
-    // Cosmetic items
+    // Back
     (1.0, Item("common.items.armor.misc.back.dungeon_purple")),
-    (1.0, Item("common.items.armor.misc.ring.skull")),
+    // Ring
+    (0.5, Item("common.items.armor.cultist.ring")),
+    // Glider
     (1.0, Item("common.items.glider.blue")),
 ]

assets/common/recipe_book.ron

@@ -1978,6 +1978,24 @@
         craft_sprite: Some(Anvil),
         is_recycling: true,
     ),
+    "fang necklace": (
+        output: ("common.items.armor.misc.neck.fang", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.leather.leather_strips"), 3),
+            (Item("common.items.crafting_ing.animal_misc.sharp_fang"), 15),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
+    "honeycomb pendant": (
+        output: ("common.items.armor.misc.neck.honeycomb_pendant", 1),
+        inputs: [
+            (Item("common.items.crafting_ing.sticky_thread"), 3),
+            (Item("common.items.crafting_ing.honey"), 15),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
     "diamond ring": (
         output: ("common.items.armor.misc.ring.diamond", 1),
         inputs: [
@@ -1987,6 +2005,15 @@
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
+    "diamond necklace": (
+        output: ("common.items.armor.misc.neck.diamond", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.gold"), 4),
+            (Item("common.items.mineral.gem.diamond"), 6),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
     "ruby ring": (
         output: ("common.items.armor.misc.ring.ruby", 1),
         inputs: [
@@ -1996,6 +2023,15 @@
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
+    "ruby necklace": (
+        output: ("common.items.armor.misc.neck.ruby", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.silver"), 4),
+            (Item("common.items.mineral.gem.ruby"), 6),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
     "emerald ring": (
         output: ("common.items.armor.misc.ring.emerald", 1),
         inputs: [
@@ -2005,6 +2041,15 @@
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
+    "emerald necklace": (
+        output: ("common.items.armor.misc.neck.emerald", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.cobalt"), 4),
+            (Item("common.items.mineral.gem.emerald"), 6),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
     "sapphire ring": (
         output: ("common.items.armor.misc.ring.sapphire", 1),
         inputs: [
@@ -2014,6 +2059,15 @@
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
+    "sapphire necklace": (
+        output: ("common.items.armor.misc.neck.sapphire", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.iron"), 2),
+            (Item("common.items.mineral.gem.sapphire"), 3),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
     "topaz ring": (
         output: ("common.items.armor.misc.ring.topaz", 1),
         inputs: [
@@ -2023,6 +2077,15 @@
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
+    "topaz necklace": (
+        output: ("common.items.armor.misc.neck.topaz", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.copper"), 2),
+            (Item("common.items.mineral.gem.topaz"), 3),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
     "amethyst ring": (
         output: ("common.items.armor.misc.ring.amethyst", 1),
         inputs: [
@@ -2032,6 +2095,15 @@
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
+    "amethyst necklace": (
+        output: ("common.items.armor.misc.neck.amethyst", 1),
+        inputs: [
+            (Item("common.items.mineral.ingot.tin"), 2),
+            (Item("common.items.mineral.gem.amethyst"), 3),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
     //"metal_blade": (
     //    output: ("common.items.crafting_ing.modular.damage.sword.metal_blade", 1),
     //    inputs: [

assets/common/trading/jewellery.ron

@@ -7,5 +7,5 @@
 // Please keep it sorted by rarity so it's easier to reason about things
 [
     (1, Item("common.items.armor.misc.back.dungeon_purple")),
-    (1, Item("common.items.armor.misc.ring.skull")),
+    (1, Item("common.items.armor.cultist.ring")),
 ]

assets/server/manifests/kits.ron

@@ -46,29 +46,33 @@
     ],
     "jewellery": [
         // Necklace
+        ("common.items.armor.misc.neck.amethyst", 1),
+        ("common.items.armor.misc.neck.ankh_of_life", 1),
+        ("common.items.armor.misc.neck.carcanet_of_wrath", 1),
+        ("common.items.armor.misc.neck.diamond", 1),
+        ("common.items.armor.misc.neck.emerald", 1),
+        ("common.items.armor.misc.neck.fang", 1),
+        ("common.items.armor.misc.neck.gem_of_resilience", 1),
+        ("common.items.armor.misc.neck.gold", 1),
+        ("common.items.armor.misc.neck.haniwa_talisman", 1),
+        ("common.items.armor.misc.neck.honeycomb_pendant", 1),
+        ("common.items.armor.misc.neck.pendant_of_protection", 1),
+        ("common.items.armor.misc.neck.ruby", 1),
+        ("common.items.armor.misc.neck.sapphire", 1),
+        ("common.items.armor.misc.neck.scratched", 1),
         ("common.items.armor.misc.neck.shell", 1),
-        ("common.items.armor.misc.neck.plain_1", 1),
+        ("common.items.armor.misc.neck.topaz", 1),
 
         // Rings
-        // With effects
         ("common.items.armor.misc.ring.diamond", 2),
-
         ("common.items.armor.misc.ring.ruby", 2),
-
         ("common.items.armor.misc.ring.emerald", 2),
-
         ("common.items.armor.misc.ring.sapphire", 2),
-
         ("common.items.armor.misc.ring.topaz", 2),
-
         ("common.items.armor.misc.ring.amethyst", 2),
-
-        // Without effects
         ("common.items.armor.misc.ring.scratched", 2),
-
         ("common.items.armor.misc.ring.gold", 2),
-
-        ("common.items.armor.misc.ring.skull", 2),
+        ("common.items.armor.cultist.ring", 2),
     ],
     "endgame": [
         // Cultist weapons

assets/voxygen/item_image_manifest.ron

@@ -2174,19 +2174,79 @@
         "voxel.armor.misc.ring.diamond",
         (0.0, 0.0, 0.0), (45.0, 20.0, 0.0), 0.9,
     ),
-    Armor(Ring("Skull")): VoxTrans(
-        "voxel.armor.misc.ring.skull",
+    Armor(Ring("Cultist")): VoxTrans(
+        "voxel.armor.cultist.ring",
         (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9,
     ),
+    
     // Necks
-    Armor(Neck("Plain0")): Png(
-        "element.items.neck-0",
+    Armor(Neck("Ankh")): VoxTrans(
+        "voxel.armor.misc.neck.ankh_of_life",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    Armor(Neck("Plain1")): Png(
-        "element.items.neck-1",
+    Armor(Neck("Carcanet")): VoxTrans(
+        "voxel.armor.misc.neck.carcanet_of_wrath",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
-    Armor(Neck("Shell")): Png(
-        "element.items.neck-seashell",
+    Armor(Neck("Fang")): VoxTrans(
+        "voxel.armor.misc.neck.fang",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
+    ),
+    Armor(Neck("Honeycomb")): VoxTrans(
+        "voxel.armor.misc.neck.honeycomb_pendant",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
+    ),
+    Armor(Neck("Haniwa")): VoxTrans(
+        "voxel.armor.misc.neck.haniwa_talisman",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
+    ),
+    Armor(Neck("Pendant")): VoxTrans(
+        "voxel.armor.misc.neck.pendant_of_protection",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
+    ),
+    Armor(Neck("ResilienceGem")): VoxTrans(
+        "voxel.armor.misc.neck.resilience_gem",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
+    ),
+    Armor(Neck("Shell")): VoxTrans(
+        "voxel.armor.misc.neck.shell",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
+    ),
+    Armor(Neck("Amethyst")): VoxTrans(
+        "voxel.armor.misc.neck.amethyst",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
+    ),
+    Armor(Neck("Diamond")): VoxTrans(
+        "voxel.armor.misc.neck.diamond",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
+    ),
+    Armor(Neck("Cultist")): VoxTrans(
+        "voxel.armor.cultist.necklace",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
+    ),
+    Armor(Neck("Ruby")): VoxTrans(
+        "voxel.armor.misc.neck.ruby",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
+    ),
+    Armor(Neck("Topaz")): VoxTrans(
+        "voxel.armor.misc.neck.topaz",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
+    ),
+    Armor(Neck("Emerald")): VoxTrans(
+        "voxel.armor.misc.neck.emerald",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
+    ),
+    Armor(Neck("Gold")): VoxTrans(
+        "voxel.armor.misc.neck.gold",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
+    ),
+    Armor(Neck("Sapphire")): VoxTrans(
+        "voxel.armor.misc.neck.sapphire",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
+    ),
+    Armor(Neck("Scratched")): VoxTrans(
+        "voxel.armor.misc.neck.scratched",
+        (0.0, 0.2, 0.0), (-70.0, 20.0, 10.0), 0.9,
     ),
 
     // Tabards

server/src/migrations/V45__new_necklaces.sql

@@ -0,0 +1,6 @@
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.neck.pendant_of_protection' WHERE item_definition_id = 'common.items.armor.misc.neck.plain_0';
+UPDATE item
+SET item_definition_id = 'common.items.armor.cultist.ring' WHERE item_definition_id = 'common.items.armor.misc.ring.skull';
+UPDATE item
+SET item_definition_id = 'common.items.armor.misc.neck.gem_of_resilience' WHERE item_definition_id = 'common.items.armor.misc.neck.plain_1'