From e916e32547a36a10a4e73ac17f5f7c952adfd95f Mon Sep 17 00:00:00 2001 From: Doctor Kompot Date: Fri, 22 Oct 2021 05:24:20 +0000 Subject: [PATCH] DoctorKompot - New Necklaces --- .../common/items/armor/cultist/necklace.ron | 17 ++++ assets/common/items/armor/cultist/ring.ron | 17 ++++ .../common/items/armor/misc/neck/amethyst.ron | 17 ++++ .../items/armor/misc/neck/ankh_of_life.ron | 17 ++++ .../armor/misc/neck/carcanet_of_wrath.ron | 17 ++++ .../common/items/armor/misc/neck/diamond.ron | 17 ++++ .../common/items/armor/misc/neck/emerald.ron | 17 ++++ assets/common/items/armor/misc/neck/fang.ron | 17 ++++ .../{plain_1.ron => gem_of_resilience.ron} | 10 +-- assets/common/items/armor/misc/neck/gold.ron | 17 ++++ .../skull.ron => neck/haniwa_talisman.ron} | 8 +- .../armor/misc/neck/honeycomb_pendant.ron | 17 ++++ ...{plain_0.ron => pendant_of_protection.ron} | 10 +-- assets/common/items/armor/misc/neck/ruby.ron | 17 ++++ .../common/items/armor/misc/neck/sapphire.ron | 17 ++++ .../items/armor/misc/neck/scratched.ron | 17 ++++ assets/common/items/armor/misc/neck/shell.ron | 4 +- assets/common/items/armor/misc/neck/topaz.ron | 17 ++++ .../common/items/armor/misc/ring/amethyst.ron | 4 +- .../common/items/armor/misc/ring/diamond.ron | 4 +- .../common/items/armor/misc/ring/emerald.ron | 8 +- assets/common/items/armor/misc/ring/gold.ron | 4 +- assets/common/items/armor/misc/ring/ruby.ron | 10 +-- .../common/items/armor/misc/ring/sapphire.ron | 4 +- .../items/armor/misc/ring/scratched.ron | 2 +- assets/common/items/armor/misc/ring/topaz.ron | 2 +- assets/common/loadout/test.ron | 2 +- assets/common/loadout/village/merchant.ron | 2 +- assets/common/loot_tables/cave_large.ron | 10 ++- .../creature/biped_large/saurok.ron | 2 + .../common/loot_tables/creature/humanoid.ron | 2 + .../loot_tables/dungeon/tier-0/boss.ron | 5 +- .../loot_tables/dungeon/tier-1/boss.ron | 5 +- .../loot_tables/dungeon/tier-2/boss.ron | 3 +- .../loot_tables/dungeon/tier-3/boss.ron | 5 +- .../loot_tables/dungeon/tier-4/boss.ron | 5 +- .../loot_tables/dungeon/tier-5/boss.ron | 4 +- .../loot_tables/dungeon/tier-5/miniboss.ron | 6 +- assets/common/recipe_book.ron | 72 +++++++++++++++++ assets/common/trading/jewellery.ron | 2 +- assets/server/manifests/kits.ron | 28 ++++--- assets/voxygen/item_image_manifest.ron | 76 ++++++++++++++++-- .../voxygen/voxel/armor/cultist/necklace.vox | Bin 0 -> 1672 bytes .../{misc/ring/skull.vox => cultist/ring.vox} | Bin .../voxel/armor/misc/neck/amethyst.vox | Bin 0 -> 1272 bytes .../voxel/armor/misc/neck/ankh_of_life.vox | Bin 0 -> 1244 bytes .../armor/misc/neck/carcanet_of_wrath.vox | Bin 0 -> 1352 bytes .../voxygen/voxel/armor/misc/neck/diamond.vox | Bin 0 -> 1360 bytes .../voxygen/voxel/armor/misc/neck/emerald.vox | Bin 0 -> 1320 bytes assets/voxygen/voxel/armor/misc/neck/fang.vox | Bin 0 -> 1264 bytes assets/voxygen/voxel/armor/misc/neck/gold.vox | Bin 0 -> 1316 bytes .../voxel/armor/misc/neck/haniwa_talisman.vox | Bin 0 -> 1360 bytes .../armor/misc/neck/honeycomb_pendant.vox | Bin 0 -> 1256 bytes .../armor/misc/neck/pendant_of_protection.vox | Bin 0 -> 1400 bytes .../voxel/armor/misc/neck/resilience_gem.vox | Bin 0 -> 55819 bytes assets/voxygen/voxel/armor/misc/neck/ruby.vox | Bin 0 -> 1360 bytes .../voxel/armor/misc/neck/sapphire.vox | Bin 0 -> 1308 bytes .../voxel/armor/misc/neck/scratched.vox | Bin 0 -> 1216 bytes .../voxygen/voxel/armor/misc/neck/shell.vox | Bin 0 -> 1332 bytes .../voxygen/voxel/armor/misc/neck/topaz.vox | Bin 0 -> 1336 bytes server/src/migrations/V45__new_necklaces.sql | 6 ++ 61 files changed, 472 insertions(+), 71 deletions(-) create mode 100644 assets/common/items/armor/cultist/necklace.ron create mode 100644 assets/common/items/armor/cultist/ring.ron create mode 100644 assets/common/items/armor/misc/neck/amethyst.ron create mode 100644 assets/common/items/armor/misc/neck/ankh_of_life.ron create mode 100644 assets/common/items/armor/misc/neck/carcanet_of_wrath.ron create mode 100644 assets/common/items/armor/misc/neck/diamond.ron create mode 100644 assets/common/items/armor/misc/neck/emerald.ron create mode 100644 assets/common/items/armor/misc/neck/fang.ron rename assets/common/items/armor/misc/neck/{plain_1.ron => gem_of_resilience.ron} (65%) create mode 100644 assets/common/items/armor/misc/neck/gold.ron rename assets/common/items/armor/misc/{ring/skull.ron => neck/haniwa_talisman.ron} (59%) create mode 100644 assets/common/items/armor/misc/neck/honeycomb_pendant.ron rename assets/common/items/armor/misc/neck/{plain_0.ron => pendant_of_protection.ron} (64%) create mode 100644 assets/common/items/armor/misc/neck/ruby.ron create mode 100644 assets/common/items/armor/misc/neck/sapphire.ron create mode 100644 assets/common/items/armor/misc/neck/scratched.ron create mode 100644 assets/common/items/armor/misc/neck/topaz.ron create mode 100644 assets/voxygen/voxel/armor/cultist/necklace.vox rename assets/voxygen/voxel/armor/{misc/ring/skull.vox => cultist/ring.vox} (100%) create mode 100644 assets/voxygen/voxel/armor/misc/neck/amethyst.vox create mode 100644 assets/voxygen/voxel/armor/misc/neck/ankh_of_life.vox create mode 100644 assets/voxygen/voxel/armor/misc/neck/carcanet_of_wrath.vox create mode 100644 assets/voxygen/voxel/armor/misc/neck/diamond.vox create mode 100644 assets/voxygen/voxel/armor/misc/neck/emerald.vox create mode 100644 assets/voxygen/voxel/armor/misc/neck/fang.vox create mode 100644 assets/voxygen/voxel/armor/misc/neck/gold.vox create mode 100644 assets/voxygen/voxel/armor/misc/neck/haniwa_talisman.vox create mode 100644 assets/voxygen/voxel/armor/misc/neck/honeycomb_pendant.vox create mode 100644 assets/voxygen/voxel/armor/misc/neck/pendant_of_protection.vox create mode 100644 assets/voxygen/voxel/armor/misc/neck/resilience_gem.vox create mode 100644 assets/voxygen/voxel/armor/misc/neck/ruby.vox create mode 100644 assets/voxygen/voxel/armor/misc/neck/sapphire.vox create mode 100644 assets/voxygen/voxel/armor/misc/neck/scratched.vox create mode 100644 assets/voxygen/voxel/armor/misc/neck/shell.vox create mode 100644 assets/voxygen/voxel/armor/misc/neck/topaz.vox create mode 100644 server/src/migrations/V45__new_necklaces.sql diff --git a/assets/common/items/armor/cultist/necklace.ron b/assets/common/items/armor/cultist/necklace.ron new file mode 100644 index 0000000000..fd8ee0af28 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/cultist/ring.ron b/assets/common/items/armor/cultist/ring.ron new file mode 100644 index 0000000000..4cd2d414a6 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/amethyst.ron b/assets/common/items/armor/misc/neck/amethyst.ron new file mode 100644 index 0000000000..914c73a705 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/ankh_of_life.ron b/assets/common/items/armor/misc/neck/ankh_of_life.ron new file mode 100644 index 0000000000..e57c93c6a3 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron b/assets/common/items/armor/misc/neck/carcanet_of_wrath.ron new file mode 100644 index 0000000000..f3b104c6c2 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/diamond.ron b/assets/common/items/armor/misc/neck/diamond.ron new file mode 100644 index 0000000000..1984809d06 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/emerald.ron b/assets/common/items/armor/misc/neck/emerald.ron new file mode 100644 index 0000000000..a4c7d4d8db --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/fang.ron b/assets/common/items/armor/misc/neck/fang.ron new file mode 100644 index 0000000000..991648e16a --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/plain_1.ron b/assets/common/items/armor/misc/neck/gem_of_resilience.ron similarity index 65% rename from assets/common/items/armor/misc/neck/plain_1.ron rename to assets/common/items/armor/misc/neck/gem_of_resilience.ron index 65c91c6f1a..9b66ea6d04 100644 --- a/assets/common/items/armor/misc/neck/plain_1.ron +++ b/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: [], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/gold.ron b/assets/common/items/armor/misc/neck/gold.ron new file mode 100644 index 0000000000..2a11af782e --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/ring/skull.ron b/assets/common/items/armor/misc/neck/haniwa_talisman.ron similarity index 59% rename from assets/common/items/armor/misc/ring/skull.ron rename to assets/common/items/armor/misc/neck/haniwa_talisman.ron index 14ee6113b3..106839624c 100644 --- a/assets/common/items/armor/misc/ring/skull.ron +++ b/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, diff --git a/assets/common/items/armor/misc/neck/honeycomb_pendant.ron b/assets/common/items/armor/misc/neck/honeycomb_pendant.ron new file mode 100644 index 0000000000..d2d65d8cb9 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/plain_0.ron b/assets/common/items/armor/misc/neck/pendant_of_protection.ron similarity index 64% rename from assets/common/items/armor/misc/neck/plain_0.ron rename to assets/common/items/armor/misc/neck/pendant_of_protection.ron index 49ae7b5b2d..50853315a1 100644 --- a/assets/common/items/armor/misc/neck/plain_0.ron +++ b/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: [], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/ruby.ron b/assets/common/items/armor/misc/neck/ruby.ron new file mode 100644 index 0000000000..067f5003f1 --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/sapphire.ron b/assets/common/items/armor/misc/neck/sapphire.ron new file mode 100644 index 0000000000..dce3693f8e --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/scratched.ron b/assets/common/items/armor/misc/neck/scratched.ron new file mode 100644 index 0000000000..b3c9a9a08b --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/neck/shell.ron b/assets/common/items/armor/misc/neck/shell.ron index af0bcbf75f..03e7f01360 100644 --- a/assets/common/items/armor/misc/neck/shell.ron +++ b/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, diff --git a/assets/common/items/armor/misc/neck/topaz.ron b/assets/common/items/armor/misc/neck/topaz.ron new file mode 100644 index 0000000000..324f8a161e --- /dev/null +++ b/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: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/ring/amethyst.ron b/assets/common/items/armor/misc/ring/amethyst.ron index 5d72036ecf..27235cbe3e 100644 --- a/assets/common/items/armor/misc/ring/amethyst.ron +++ b/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, ), diff --git a/assets/common/items/armor/misc/ring/diamond.ron b/assets/common/items/armor/misc/ring/diamond.ron index a82fb13ea6..176103e44d 100644 --- a/assets/common/items/armor/misc/ring/diamond.ron +++ b/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, ), )), diff --git a/assets/common/items/armor/misc/ring/emerald.ron b/assets/common/items/armor/misc/ring/emerald.ron index ed668c9a8a..0e961aa9d3 100644 --- a/assets/common/items/armor/misc/ring/emerald.ron +++ b/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: [], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/ring/gold.ron b/assets/common/items/armor/misc/ring/gold.ron index b8113d6b9c..8f80727eaa 100644 --- a/assets/common/items/armor/misc/ring/gold.ron +++ b/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, ), )), diff --git a/assets/common/items/armor/misc/ring/ruby.ron b/assets/common/items/armor/misc/ring/ruby.ron index 92d98e1db2..1131d3915d 100644 --- a/assets/common/items/armor/misc/ring/ruby.ron +++ b/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: [], ) \ No newline at end of file diff --git a/assets/common/items/armor/misc/ring/sapphire.ron b/assets/common/items/armor/misc/ring/sapphire.ron index 8242516a44..cd8de86921 100644 --- a/assets/common/items/armor/misc/ring/sapphire.ron +++ b/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, ), )), diff --git a/assets/common/items/armor/misc/ring/scratched.ron b/assets/common/items/armor/misc/ring/scratched.ron index 6ea5fdb31e..25078dc804 100644 --- a/assets/common/items/armor/misc/ring/scratched.ron +++ b/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, diff --git a/assets/common/items/armor/misc/ring/topaz.ron b/assets/common/items/armor/misc/ring/topaz.ron index f8d01214df..93ec8acfb5 100644 --- a/assets/common/items/armor/misc/ring/topaz.ron +++ b/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, diff --git a/assets/common/loadout/test.ron b/assets/common/loadout/test.ron index 0c3a572ecd..65f2cd68a9 100644 --- a/assets/common/loadout/test.ron +++ b/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"), diff --git a/assets/common/loadout/village/merchant.ron b/assets/common/loadout/village/merchant.ron index 7bbe20362f..2f8b2e4cd1 100644 --- a/assets/common/loadout/village/merchant.ron +++ b/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"), }) diff --git a/assets/common/loot_tables/cave_large.ron b/assets/common/loot_tables/cave_large.ron index 29db972870..e831d6b429 100644 --- a/assets/common/loot_tables/cave_large.ron +++ b/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")), diff --git a/assets/common/loot_tables/creature/biped_large/saurok.ron b/assets/common/loot_tables/creature/biped_large/saurok.ron index 0d20129f77..30e3718624 100644 --- a/assets/common/loot_tables/creature/biped_large/saurok.ron +++ b/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 diff --git a/assets/common/loot_tables/creature/humanoid.ron b/assets/common/loot_tables/creature/humanoid.ron index 04b0ae6193..45291c0b88 100644 --- a/assets/common/loot_tables/creature/humanoid.ron +++ b/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 diff --git a/assets/common/loot_tables/dungeon/tier-0/boss.ron b/assets/common/loot_tables/dungeon/tier-0/boss.ron index 1f5a4c51cb..05855041e8 100644 --- a/assets/common/loot_tables/dungeon/tier-0/boss.ron +++ b/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")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-1/boss.ron b/assets/common/loot_tables/dungeon/tier-1/boss.ron index 65fc15182b..4135deb1e3 100644 --- a/assets/common/loot_tables/dungeon/tier-1/boss.ron +++ b/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")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-2/boss.ron b/assets/common/loot_tables/dungeon/tier-2/boss.ron index c2b4b7ccb2..298094e660 100644 --- a/assets/common/loot_tables/dungeon/tier-2/boss.ron +++ b/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")), -] +] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-3/boss.ron b/assets/common/loot_tables/dungeon/tier-3/boss.ron index 015c4df215..a36c830209 100644 --- a/assets/common/loot_tables/dungeon/tier-3/boss.ron +++ b/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")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-4/boss.ron b/assets/common/loot_tables/dungeon/tier-4/boss.ron index 3763394f56..16e3dc7291 100644 --- a/assets/common/loot_tables/dungeon/tier-4/boss.ron +++ b/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)), -] +] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-5/boss.ron b/assets/common/loot_tables/dungeon/tier-5/boss.ron index 7efaa3879c..08b4ce4a70 100644 --- a/assets/common/loot_tables/dungeon/tier-5/boss.ron +++ b/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)), -] +] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/tier-5/miniboss.ron b/assets/common/loot_tables/dungeon/tier-5/miniboss.ron index 04f67c0a8d..221f592fd6 100644 --- a/assets/common/loot_tables/dungeon/tier-5/miniboss.ron +++ b/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")), ] diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 7d8ec16176..38ce351956 100644 --- a/assets/common/recipe_book.ron +++ b/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: [ diff --git a/assets/common/trading/jewellery.ron b/assets/common/trading/jewellery.ron index cc55273026..557269c06b 100644 --- a/assets/common/trading/jewellery.ron +++ b/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")), ] diff --git a/assets/server/manifests/kits.ron b/assets/server/manifests/kits.ron index 3350bba1d4..a2ab58741d 100644 --- a/assets/server/manifests/kits.ron +++ b/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 diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 6262bf0176..c372bdc3b9 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/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 diff --git a/assets/voxygen/voxel/armor/cultist/necklace.vox b/assets/voxygen/voxel/armor/cultist/necklace.vox new file mode 100644 index 0000000000000000000000000000000000000000..43eac3097183015f0a6f19fcc799fe78a8d99ea5 GIT binary patch literal 1672 zcmW-fKZ_ej7>9qeyR$pHdrrKP8r|6t^cALc<3x_R!Z9Q$Tuewgq|F}?q)BH~hF~0~ zFt`Z>Re_|_CkSkrR=5bH6!`{|XGV9A-ksmhzVpniK7W4q!D~s+9^ZaK(f6(N+3kxb zS9!qa9#pV^yDwhcZu5Z8Pf+Rp1Ecq^jozc)yRLKvmyO%EGQ4{BKU z^y!C>)s&x;Qu)k$M+o47nCRa>|4V=T`Z~RR^)mhZ@&_{VJS}oF#`Me6Iep#zmG1O= z`ba;fZy)|m3nm2m1fPEU@?FWFE2PUmZ&ILsqpw(kK6z!)N6aVxSl>~VmxcTnA%F*R zZp?hmGx$nlvYc_feID9nKzpBbMSpE;1Tz1fp{a!>Bb@yT18@tN_N@tH-A zPuXs#J zkmD2Z3HStjxCP|+}g zd^|oL5znG559B=PndAvPKKuhYJ{}*BkH?1?@-HU8rF=5khCh6SkMI#b!bkYr{@q*78PH=<+>|qC6*uVt3z!^?( zgahnh2V2;{1iHW(PH=<+>|qC6*ua!7mrFXI&*^kJrQ`9K4u?b9@Aql9+okPxn>L$G Jnx=`l(*KVta$o=e literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/ring/skull.vox b/assets/voxygen/voxel/armor/cultist/ring.vox similarity index 100% rename from assets/voxygen/voxel/armor/misc/ring/skull.vox rename to assets/voxygen/voxel/armor/cultist/ring.vox diff --git a/assets/voxygen/voxel/armor/misc/neck/amethyst.vox b/assets/voxygen/voxel/armor/misc/neck/amethyst.vox new file mode 100644 index 0000000000000000000000000000000000000000..1fd710516f424dd5086058ca89ca60d19c4ef78f GIT binary patch literal 1272 zcmW;KJ*yi>6o>I6X>}#P+`!&jUAYOW-3_>MC~uP|RhxC!YZ@(m`x-CaHV@}Dzjp4INx&tH7{E+W2oa{J6F{_Y~ax_$Zi z{o%%T2NQgP7vH?R{op)o569zTHH&UFjrl5KdDF$^O~gI-m-5R8leoB9;KKM^-CVYe zh1xr~YyAF$F1qWbxeM19<}Kw*<4b+Im|b--#RSpMVuC4V{X8bu^O$0GJ&oDwBBs`v zttK(Qnnc%6)GT6ty@>8=q0iL#mrp-?5*iI#8@K9MkdYu3{qy0!_Q!AU+poX8Yd`(? zMkXK1iosIa&rfUn_Tdlh?W5ZMdi}5I@~j~1lT&;D>SH_p`TIEk``ve1%ai^|pJC-t zAL>IMayk+WdqGBm+(31xRbJ&)&c`j}d}@&wd68>b`BXlYPvujy+%h%ElblcGQ~3;! zR{2yul~3hU`HYV{+7#Cr335J#Pa#k&Rx~b}(16@U;Zyh&J}x2WQ}`44=5}(9JjNywJ-qP^T3^sN?!6*0xpWqXGOoyCL@CiP_ zM@z{01fSp&d@KVwpWqXGg3RN`a*Kq9VR9%u^Eu&&1NPWqiw)N35oerm!~uKku*C*z z^oTP~IO2dkcGzNrHTrfwpWEqlYRBWT9S(=K-|yRQw`<$&wrw_>wqCDW-}h=G{s(DH BYP$dc literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/neck/ankh_of_life.vox b/assets/voxygen/voxel/armor/misc/neck/ankh_of_life.vox new file mode 100644 index 0000000000000000000000000000000000000000..f572a02f3bf7ed80da57b04fbcd2c73c1fd37fd9 GIT binary patch literal 1244 zcmW;KKaUef7{~GF&VSAjF4Ed49TKt>C1s>(X^0%5D*y@P=s2aGw_u4EKwL)&$#iLm zBDbW%9TmmA1S~pAgD4`UVe;AC^>^0$n`fT++PgnKyuAH9BJSV4c;FIm#u1M%u70@D z-#D(}1YhFv$<@UluKn@#FkYXJWBSb`#)}cgG5&5GlW#|HK0l3f_vhV7+?Ypv(VfQh z=1H6_CNY^$&CTNae4=hU>&QAL>IMayk;!_O`t; zW+cc>R70%=@|xOTAHHgCA?H(zyr?hgwX9jrr}C+MYL?rkCV7(cseCG*{-;$wl~3hU z`BXl`&t*`CGaD1+dC!OheA6@F{!>A4?$T zQ}`4Q6|{Xf&&IQayh;1hg;Pw=rEaz4Q)_yiv#`ZJW)et=H?eTCLi0xoln6sg3v_b|!1H literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/neck/carcanet_of_wrath.vox b/assets/voxygen/voxel/armor/misc/neck/carcanet_of_wrath.vox new file mode 100644 index 0000000000000000000000000000000000000000..42382fc1d16dfc27a249e1726e479f492b4edfcb GIT binary patch literal 1352 zcmW;Kv5y-?7>4n0*Iu7Zj>0;)bCsZLkRnACLm4R-bSPW_NI?gehyt3C(jX*?lV~U+ zMOPyTnhpukxP{Ig_5KTPDJ?`ncOHJbYd<@?@63GPWAA?c>D4>0BjV%77oQm7{Vw9O zi{~F64mXZB(Be&8J$rsJZCp6c#`9v;#^Guble;rCac9*oyV zPntM*dlrW$Q}Z)(VQv=P@yyyTCb!xi&7wV;y4F>VLk#zatGT_Maca#prf+p<)jb&J z?yMHE!2Dz}?(2@*X!mVQ^lmZPH__fU>duYxvHoPgkcZw2G||bs+iBC@c9=GNFm0NB zhsK&YW=)I9eqx*$pFa8EagZ90Iv%}qK}LdD^!K0t)IWZIU4Q-QRsHeR_cHmgte7mN z{_>=+AEi`ZeDy^=OAqRM_wUzdj~>;t2M@;a#nn~)`QKXq`mffne;Z1xZ+#uw4xK}t zC^ddCd^6m~&=$j|AR|F;qIc?hc`xtfeB46Lr!Vp%FLJH=EYI>R&+;tSzEAQb=hO4) zlYIEee0n~8$V1L&{JEn|ah;JMAN~S9g+S4)C|new0lAC9r|>C!Ttd#L@F{!>AJdTY zDSQf_!p9cK`4m2dPvJ8>A$FrlcFuePv(>Pn1Y;7=9BqkK9-M9h}~$CoD&}<;OX&6d=j6;M_I`EBtD5x;xoP)d=j6; zClN`S4zEj6EZLYWN`l147jiy{PvVpKh%vk|!&4gmnZd?~Pw)vo!6*0xAKM}46MTYC z@KF+SKEWsW1Rrf6=M#K_Pmp=|P_9WR7&eE6J3d=%u*MCpafx%BVu{#ciw)Me!8I;% zj#DfVJ8ZGR8aKGcCC+h*W!>#|b-Ufx&1O^A>vg?(`CYyK_RD(t^rF6d?{2-fTGi!p HX>G*+G-`pl literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/neck/diamond.vox b/assets/voxygen/voxel/armor/misc/neck/diamond.vox new file mode 100644 index 0000000000000000000000000000000000000000..c3a5f2ce4a659a4d167323a274faeb03368b7564 GIT binary patch literal 1360 zcmW;Ky^bSA6o%pBw%dO@gXHlfJ0l_FTc~uBT^X$=V39yZ%Zj)HE&xkhz{&v;f<={) zAdu4~b4J{^V38m~3lSiZP(0mjzg^W|Rh@eK=d+JreegCSK6>`}QWFnt#HWw1KfLNM z9DO^&dwBKv>&L79!torF7_TSM+|0By?I`BAZH({QXr4~vdeveY}nO(cX`uy=!ERv4w15Y!M^tM_htatY-QXjAD$*O+>4mu9tYCzmzZKje8o~XKDW> zmnD}uw*{9Ozb0n-v-Kx0omOguYxm_$2@|q9In`gj_`QDrcdftuQ|rI~^`+%W{iKe64eP`F zkcT{?-xmF^AR|F;pmXXvc_;7Wd|X1#rz`RzFLEWjEa%hl>G*V6ZksO2lblb-r{mM# zTF0m3)A8x}bbN-}9c+qzMuMDA;Zq0{n-ztNA~Yb^DSQf_!bcZ!K7~)=Q}`H$oKN9X z_!K^tK+dP|DSQeaWrn9B(e}RtIiJiY^T~WNpUh`?9egsMOd{JbD?Yp;i?RvXMdp+F zXdvg4`D8wsk0HqUWImZs=41NshS&`z$vN>+0^S~<#3%7de3XTpPvVpKBtFBZ!6)%a zd=iml)8TVbELoULN`l14A96m4PvVpKh|zyB{afmvOmE}IC-?-P;1hg;kL8f_2|mFm z_$UcEpWqXGf{$$==M#K_PmpJ#+Oiu!6hdn$08~yBj+KANr51y17;@21V)FP zl#z)jlWI1pVZDXn5-}W1jLT1V_dH!w->Ul6(| z4IRe=Oz;+-fBxeBZ|!iri)l<(%a~p-V|KTU?zW4`b;L!lglzu!GA>t_`jc4pQ**kQ zYrETJEc!)ERu}S%=(IBoV+(WVs|6;qNp#m!brvz}XR=N+0D9uxh^?TpVNu5K>k5wEN3%Xq-+q4BGm87A`3cektHJT<42fAZ|T zr(yAMwDG8}1sMrq(LaCw+y40Vb^GPVm+jTd?_}~}S}|Bk`{`M2-~V=O-~RA(+kUfa zAAI?>5+-DIa%#VS@uuDU^{}npywkq=@0HT>q<&Io*g4b*^FtnTI)h0a&*GYqAU9B5 zYL!=cmGjYsoKG$CA}?|!YnJn=d@7%s<+iCwp5%NgpUP*rwaTaRseCG*%4fV?24y_6 zYl3`u1bhmCVzZ)fQG^EM{uDliPvPS)t3^|{|r|>C!EPwo;pG+d#Fe^U3B8##KSts+!d^C{r$$T=O%*PPqd@`TR zC-X6Vd_(L;ljNHCC;@MePvVpKBtFVQ&L{Cnd=j7W)8Lc%BtD5qvg!D_D3&ZtCM7}Q z;|DpP#3%7de8d>OnBgrAPiC-j@(Dh{C-?-P;A1)De1cE#2|h|f&L{W;pWtH~$oT}H z;1gt?JdxWZ6by^Q#5120jyPbC9k$qDjUI8v2}c~T#|~R;uttwK4oh{z$r$(wx+baHZQJmDMOH2omI@pTQ{&wFEX2TdA4r8bt z%m(HTH6h4Jd;o}x^K7~)=Q~2nH zoKN9X_!K^-K+dP|DSQeaW%^%5qV3KEIiJiY^T~WNpUkJ<4nCPrCXp?e74Nsmq-;R; zkojaj8p!!%KABJEqYH9AnNQ}E`54~s5WC(axh6hJ!0z!$d=j6;M_I`EBtD5x;?sW` zd=j6;ClN^&?LL>JSTZpglmv;7KgjtcK8a7_BS!bdbi363GM$Z+Pw)vo!6*0xAJZY{ z6MTYC@KF+SKEWsW1Ru*l&L{W;pCEH|B)3Q?7$%2-8$N5Su*3qFxWEbK@Q>YMgEdxI zVu4Fs-~@Bb5F4zq!V(Ky;sPg_W7amCO(rD L&)aM^GdAJ_SXzI# literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/neck/gold.vox b/assets/voxygen/voxel/armor/misc/neck/gold.vox new file mode 100644 index 0000000000000000000000000000000000000000..3aa7db1f5c21110a1b347937dd723e7d7c2910f0 GIT binary patch literal 1316 zcmW;Lzpfia7>4oBe~)c)5Nn?rA>YCjG--m2qEnDaM2?b(dhP&O;sPQUR0x8mqd@|< z(78)Jmw-j8lop~uqG9;$+I~E{?|k#kv)=Xdr!PKv6A@oLx_@Gbk7g0i?q7ZWpg-~Y z03&>e7cXDkzcco)Pce!IYZYC@YQ2ct&B}Naw|6Vq(%dX=yLsHM$L1#TspE*n-6(D_ z-^^pYp2w)08YeNm8^=t|WHXD&-Q2ivzEZzbzf^ytW)@@fBfZ1AQ8$T+Jty{boE# zK`eUz`(N$1pWn2fzJJ}md;N_}-j@}VrL-R(8-IP)+P5FKKfYeHn$2egS)ZKRFJJxH ze)zk!xBs;E?|*%3dD1_r^J!sys1JF_Bl>O8zY8)F zC-cc9vJJE5!!5EXE67eVpUlSqIiJiY^T~XMTgxZ&$$T=O%t!ffhu94!$#>$T1>8M8 ziBIB__-G3`pTsBeNqmM!gHPg<_#`69ro-c+S+X!GN`l142Xa1%PvVpK43E|D#PoNm z|7Cg`Z$7~%_ynKe6MQU(oKNrxKEX#z$oT}H;1hgo1391I6MTZq!-sO4goa^pD7^By z;EWTFIAD(*w(zHHam58^oN&Yed+e}9hq&T`Gfp_-fIW8DqHEXdwOuZkc0Qlm>2zwx YU8gqUe}f!so&W#< literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/neck/haniwa_talisman.vox b/assets/voxygen/voxel/armor/misc/neck/haniwa_talisman.vox new file mode 100644 index 0000000000000000000000000000000000000000..dd699f8581b16134319bc6b86574472939665701 GIT binary patch literal 1360 zcmW;Ky>A>v7{~EvZ+Gwf5{hfit_X62h=eGnLb3>nj1m_K63FDGikp$#AW>OLLl?P5 zA!s@zL~|{4*HQ1ka4qEtQBcH|htJ;LeRrPu?d&t(yWQ`;e*V$BhDvuH7m{;-eku-lHkabn&aOpRUB-S*KQ_Dy@+#^j(?x7N%qR27d|ZN@Pv(>PWImQ}pAfsPNpennw1B6_C-F&q5+7|L=acv(K8erv)!>u( zBtD5qvg!D`B+Zf=lSN68`1nH3C-F&q5+5=pHC9;S3YR#;363yFY_P@(OI+a+ zXE?zT=7|iFzP@-?e|Ytzo(q0yMPv^`^EVsV}c6_JBC zHkYW;Tw|f#R?za6v>Q4KiVdNl;4rVBnVJ30%=?@7dEW2N%&pIFe{>QNi|cy_PVsyk z@#Ws#8yCBQ?E(h4jN5na?)~oEZC5dfi|5lA?N4K{n8bL05ZmtuvGslwlmCWs>D?Hk z7%j%`ja*MGGmNQmEJkX!)lcNx>ZWS8V!FSrekVRS--#Vu(ErlAErg5>cFu<}Tx?++ zqk{=XF+7-J90TLQ!5}7jPximK`RVnrShux)tBwU331ZR9e_ywM{y1r;zZ|s(N8iij z-L&FnDeckC+WtO0X}{k8vHkSjx60+&gse|a?XP<;+QT=kJ$>8SSHE?w=bP&$-9Il0dOo(YRC!3Lhnq^C^4^pTb9*{;5cuyFEePJ$gQwPv(>PWIp}t;FI}e64`=T z^Zpen$|huk%qR14f}Bt0llf#mZb8l`^T~WNAJh9c#I83s5K8a7_qb=lo z5}(8;@##MeK8a7_lZYgX_MeMpNntW62@)Sa$oV8biBIAq?!FfIuKFj_+1U96pWqXG zf=}>K4mqFT6MTY?mXPxaKEWsWSO#)F!6*0xnQPbN76}bQahSN_v&IT%IL0BC*u@+( z#0G1uaE4J?*=*W+y>6@3s-2x4wbP%M?eOc5+w!w3 RZ8v?`=JR=*&1U9C{0~x+finOA literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/neck/pendant_of_protection.vox b/assets/voxygen/voxel/armor/misc/neck/pendant_of_protection.vox new file mode 100644 index 0000000000000000000000000000000000000000..af1a05711f37f9d8c8feb4ba102617feb13078f9 GIT binary patch literal 1400 zcmXAnF>4e-7>3{7o!z}l;>i_vms0Z=#!74=7c>x!sF5TFAs_=mK?EUxmsnWS3{K*v;__g2A={9YZhR7Ic=Wuoc_EgwJ$QY7P;zqOII#x)r*!| z=WVTAw6#2Mt379jXqOh!@}g2_QK~bqLDU#^E^_V*b-cn=< zEcN`N$VD!4kxQ{L3F-7)9atczBX9}$1bhNM0iUFYPrxVO6YvT6BxQVpBX{JE+>x_P zz$f4n@Co27$K&Ji@%VUr(l)1^X>6L)0y#boABT^_$Km7f zVL2ej$06ZZ&@nj*Ku&?Vw$(q>`Y_B$^Hl*;Uj#6kMMcp7^^1ep?RKe^{sZ)7 BhCKiP literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/neck/resilience_gem.vox b/assets/voxygen/voxel/armor/misc/neck/resilience_gem.vox new file mode 100644 index 0000000000000000000000000000000000000000..1d1e25ed9cd744c153fe9aad1fd1caec8295ad97 GIT binary patch literal 55819 zcmds=cYIq{700iZN74XhZ$tu=6(jjsbtn`_a7k0rBsha4P+n!}Jz0$`2}zD)R-r&+ z_H5x10%cRPS15HEPFR7*FuQ;mfwBr_6|0pgc-B?Oed_voO31ui<&iO+hOHh z1KS>`^z(NSbc1G-zO?e@fgN`XyJpTOkFt-F<1x)+GL{yDNebyp++3{P0GUZ8Q^~&a z&Wm>3Q;wraxU{*{(%-sq-@yH)(`<4~Cfnugup@(%EU++2oXeupOQS^MvZ$V=QKD#B zl(jSpC0ZWUyEIBvFUyr#8r8N^)Okyz+EHE|geK!4@L?Xzg^6^y#pUD9 zhu??ahu?=^!aVprbUgSy_&xY#stdmhzl(tjzYD*lv*5Sjx8S$nu;9l}VBk0K8~6?U zkOL1)ZXV2qSupr7ksvs7BaTClfgS@rND1?UouiX@gdchg^k5kn@<5M)o^`!@@CZK^ zHdw?!kHKVvz*#tFV3V*3*f?wywj0(DTMO%gT{U|=Ff+(8X@bipt`5vN`lGPjuzuKD zSQpI9!e(I5WF}zauu<4792f#G&p?t zaFEaEgRZVF#L7$GuC2$VgC^CTcjR(nk2=M|P($L$W@4kMlQ%aG@Vp5 z@@A2zHmj*krc`y~tL#SwyR5TBzqQSRgMAx)+R5TBx zqIozK%_FF2&ZVMxBo)o0sAwKdMI*mv$McThu~ancsc5>XXdXvJlcJ(YQ_=KL(cpJ4 ziC%Adsc14(H0M##^ik1lprUy^70vlnG*6(Sk$+Ie^KR_|Dw-!z(L9-o<|$M(8>whE zQPDh=il(26=0Yl(r%};trlPrsie?KH&BatSPp6{UN=0)C70os(n(b6HJE&-$K}9n_ zMYEHNW)~F={$2>tr-OT_Xr4($vzLly9~I4hDw=0e(L9@q=29w}=TOnuR5X`S(PXJ; z2B~OrR5W=i8i$I;rJ^ZN(F{@16sc$~r=mGPMN^`p8K$BsQ_)nYXsT2+&!wWNQPI?? zXc|;BBUCg8sc7)`_=&z-J48h@Mn&^HDw^k0(Y%0)=7m%=FQTHkf{NzFR5UN4qPdca z=A~3LFQcM)ITg)SR5XXFXvV2%UO`3kN-COHQPI4bism&`G_R$ic^wta>#1noKt=OL zDw;P@(Y%?8=4vXMYp7`6LPhgdDjJW9=516oN2qAtPDOK+isl_uH1DLMxt5CNT~svh zrlNTd70r98Xx>Lf^L{Ft4^Yv3kc#FyDw+u@nh#OYe3**nBUCgWrK0&570t(~Xg)zj z^GPb2Pf^i)nu_K#R5Zt^Xg*6tb3GN!=cs6IprVrlG8N5NsA#@QMe{W(ny*vQoTQ@p1{KXWsc3vEnr~6je4C2qJ5)5^rJ|Xp zqWK;b&G)Hjen3U@Ln@jdQPKREismO&G&fPv{FI93XH+ylr=ppmqWJ|C%`d5Fenmy| zYbu&kR5ZV#qWLWq&COIazoVl0Jr&I#sA&F3Me`>rnp>!7{!B&l7b==rDw@Ai(fo~y z=I>NA|DdAzCl$@DR5bshqWL!!&23aPw^Pylhl=LER5YilXwFd4oTZ|rfMEQCI?IH^!Bjw`% zUQ~3i*90r2C=Qmw6tY}e$!nEHYwc^B6Fcy@c2GS4nJuj%+;%Gkdv347 zJS&z*orM))=Yj*_7(;$*7XSQa10{ zWu3FYQEM%_4O68_`WA$C++t~1JIX zO#(GoPIax!V5w3WR)XQ;p|F%;$?CamDLnbxG0D!>t4=OFH>AFHW2olThbkrA(zL8` z0o>9SovJ#wP^*lT^SWHFQmWJhenTp$Kf3f#r4}x&iO$tDOP-f<+#W2NUD8gWR$QRJl|`#quV!<_vKAse zpH{f=l{zSNS2h=tgROPYoy SC1p-JiJMN&Ii->Wr0)d$Plzx8 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/neck/ruby.vox b/assets/voxygen/voxel/armor/misc/neck/ruby.vox new file mode 100644 index 0000000000000000000000000000000000000000..65bf9fd27de172d66ce338f5d37d52103d5d7771 GIT binary patch literal 1360 zcmW;MF^?NX7>DuK_O92LoRNIKE)8;Os%fuDWE5Qikw8WvqD1o*Eb#$?YXm`a6%7({ zOFBzeQ13@L3n|5w7NVdXe(Uu;-ktxv^Ukwg`@VVo=F|5P@x_bVFP-A1jrjWZ?dO-n z!0`kle1bRMzP-I129B4Q#q`-UnyU%M(JV*NEZS(FH8FABKA%N*brDmv#+|zH^(;oN zN6Qvru5q4OH;&15sOy}&=$6x%UXNnBinv%_#LU`uIf;?_=@rFA6Ro+K>t@wN^L%Vg z7h~&MjIUdD9fz^H3q3l$rq;JHvDbJx<{msJ_L-^a_+J<|db?{pHGazV@@g7$`_HYN z+jqX0$-0=Ef1=lX`PHkJFT%p%sOO{iUXYO>7CnCWr~di-`}*6@@9IzQevrwBvSPB7 z`s=H{K0ZFyhlhuHe}7-^?(VcukoC!_{_)-4^_PEZ{p&w#e*B=dJn5hG8FmhRLVbK+ zKgMUyF>H(BRgjS&H_?0RdwDPK<$Mew=hGK?kr%nG`Yh+u^Xd8YS#JA2$&;K<&!^`z z+*;44=hKHg^8Hg-_vA_-J$fR3y&BD?!dD^T~WNpUfxoIX@0QnNKE>ZJ0GbKO&2=f^3la zWIj%i^T~WNpUlS;)4v zpWqXGw1k{b@CiP_$2O4j2|mFm$lTn>Z4w%W#i8)T=ZFLL*kOwe*6vVIIN^u`_Sj*I4c1s;QBS8+Jsywsa5&WceqVRHUEOZCb+g&j^?F@bt5sbr I7HT8@2OV^8^#A|> literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/neck/sapphire.vox b/assets/voxygen/voxel/armor/misc/neck/sapphire.vox new file mode 100644 index 0000000000000000000000000000000000000000..fd023d7e81b7fe9f902d6723ebf18c0d8b8f047e GIT binary patch literal 1308 zcmY+@KdU2E7{~D^nM@LOSIFMoTik6Vdu?nFcH68(mRqQxMApT|=DY#HSg552!A5lD zU?YeiX|<6wR#xW)*aSPvAija)XQp#^4`;%KaIooD!Q0m^q56l&tkHg#q_$5?tT~j{b|gvX3?#u(Oq=W zJ(wH&m|iTSztczmU>38hxiy_^8jH(GEHC@GeXonT`T3ohb@Q04V;pDK(-@ep<|Dnj z{dy7e)dUOuCTcFYOfZd!ev8XR+`6|=cN(|vc51tu%ZTTVFWjA&o5`1sm-3~2?)>e? zuRRJkG;D3$s(nF5f>`wTum7}PetOn^_~!HWXvpmbQoKMYi?Q4=JIiJd>@)>Te@~M1k$V2Y&jJG@5 z6vr6}^5GHiDFljUMd6|d4agl7K7~)=;}CK_g-_vA_?U*APvKMe6h1D2oKN9X_!K_M zj88>k9DWIMKABJEllf#mnU8jm^T{N#hFNh6kXw+QWImaX0dhW>Pv(>Pn1Y;7=9Bqk zK9-Mfh}~$C>=Pd);O+5Ad=j6;M_I`EBtD5x;xm34d=j6;ClN`Sj-QKS$%VGF9I(d@TWsJTzpW5woN&Yed+e~q25YPkXPj`v0ekGQ#RhAv o+WCBLr_-q&kH>a69NK=rZ@b;DZMWOD*=*W+y>6@3%G!wk0IEf7tN;K2 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/neck/scratched.vox b/assets/voxygen/voxel/armor/misc/neck/scratched.vox new file mode 100644 index 0000000000000000000000000000000000000000..97cf910fdb17ad8979162e949e75d7b1cdfc2fa3 GIT binary patch literal 1216 zcmW;KKZ_GV7{~D^m;0+{kvAZcw=k`Z5|JxZP$H+;*i2~~5kauf6jq`qgN-191i?bP zbk_40f}Ld$3qf--es*{B-P!%^JkNYLySHx~UpR?~YnP6$8{*S;#I2*dR}Q-i+ZhaS z4##)y9z8a8+j$J)>}EH%{_MtJvlGKVgV;MA#O~=Zw*PI#;oofxW6L-+cGq#b6+8cS zA~wSqobIdNk?*V9RkP>bzWReWvpI-;9O!@ecMnW9;X33uuU@_snsr<2x9V7sksucR z`1-Sb`Eb(Sy?WMOK6@mSchicSrL;F!Yy14}q`iIdv^{_LK)F1dkoC!_eZ2R*z5dnO zx8JSZf8Vv1C;gK?-O6Eplon46${QUCy1gJHLGDI%s8wF&RnEsHdx~6h4KIHvPXMF?M@`oKNPH`D8wsPv+CV4nCPr zCXp?eHSb@MqHIETk@;jk2FUqjKABJE;}+z6GM~&R^D(`DL+pB!av7-Q7d>vdbLR&BXlw#8!6=JR=*&1P*n Sowmtj(#GR)8;wThM*IiFmW6x( literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/neck/shell.vox b/assets/voxygen/voxel/armor/misc/neck/shell.vox new file mode 100644 index 0000000000000000000000000000000000000000..16db6d860d0c3cccdd88e4b5fbb32dc099fde9cf GIT binary patch literal 1332 zcmXBSKWkG_7{~GF+&@WLTOseDW_LPUlMa=Lbg+UFt=$B9pyDX@C74ZIga;AS!68Fe zh3uum1J=RKEWUu?APzR=_&vuYzk8BjPVV{S+GBCfx*rjVjJ8bf~8SBuD8q$(F)V!~GUyrJiitj7Bimt*_ zlWJInz}&z&0(}^E7#pe1Yn&3+SHjwzu(@i(=0(F;GggctY^=IO!rEo87}r-l-rv1- zV^^B;*CmyQb2OqP66#zz2d8&>r+4~1&FGCcMsM^+pMR?KO0RrSdZo{&i}aB`(npF& z&npSN&ZgJ z%2weqJjVVQ9%FyX_Te!+hR5(2p1h@o$M6^)!(({LHkX~rn*5A}K5so9#iMu>kK!qp z1CQcS5Xyqe$;&0;N6G}{gW^#<<+9;XJc>v0D4u*N6_4UkJc>v0l*?PLQr?-Y$xr%x z$?-%y5l_Su@s!&DPs9`PL_85sxi#=aJP}U>5?Qp|E}Sg#!^osa5%KUM^mrnkh$rHq zCi#xZS1IpI*6_@?8XmzTcm$8&dHNxxM{iPk`I+zW2%Z<8QhH1;`)||eXwL0Pk4NyZ z4DodR$tk0zYuiVR^eikaB6tLkFmXw_AagP!Q*uluWK0I6Ph?3JWKL#eN{-2djLCrX zi7d&2V3HY`l4CL^LvoxJf)89Y8)6ef;(#gknX)qY1e!tIL Fk$;M?lYamJ literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/armor/misc/neck/topaz.vox b/assets/voxygen/voxel/armor/misc/neck/topaz.vox new file mode 100644 index 0000000000000000000000000000000000000000..5daa6525ed1afe3e6463c73c78d43853cdbe97c8 GIT binary patch literal 1336 zcmW;MJ&Pn&6o>IsRsAxfI}0^$$tKe42Uxg?!6Yj!%LJ~VwCpZ|+06toX%NJ;K?4#&yo^gx3kb zQ$DBMPPxt9(}z#qeLUXuxYXk^SQlg@h(&+>`ggs1^-X>C?YjQ(^=C5qSXP`YrT+9} zsK0;tX}x>?PW}1mqk8wf+OO1pp*E-b%O`)!0*b`uNt+CrW)? z9@XLV`}SiTi}6#Cksx974`#DDomNa-)VU&+;tiGi15(Ly{*spMlT7 zXS}t6&%kF0dC2)3Z}(_Z>}Mp%$De>tAy5n}8W&AyKyIh-DSQeayO8rKd`4m2dPvJ8@A$CWTY@PXJK3YT0C-cdCG9Tk0=aWff1GDB7AXktbWImaX z4di?>pUfxoaSC!inNQ}E`6xd=A$CWTWS#hE0Z)%l;*83>SyO1D`#1*kXe^Fe!s7~-L7u8+q&6o>UzDdtJSJ5m&>|XENb8PY9sy! D^ww+= literal 0 HcmV?d00001 diff --git a/server/src/migrations/V45__new_necklaces.sql b/server/src/migrations/V45__new_necklaces.sql new file mode 100644 index 0000000000..3d7ad7202c --- /dev/null +++ b/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' \ No newline at end of file