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 0000000000..0a95c3fa71 --- /dev/null +++ b/assets/voxygen/voxel/armor/cultist/necklace.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78bb73a88b2dbe4e49294ae676e98e90dcaa58a0aee8ab6048deeaeeb0fd8f2e +size 1672 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 0000000000..79d481190e --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/neck/amethyst.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5282f39e7373906c04ffebde3cfe44904671bae528f7165cd6f610f95c29300e +size 1272 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 0000000000..bfb819bada --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/neck/ankh_of_life.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d78ae24d245cc38e1d877e54b96a819feab3cb7310108eb398b91ed43895b31 +size 1244 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 0000000000..4639bf481a --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/neck/carcanet_of_wrath.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2794c665cc304ac7e76e238978a48ec22b04b5081e9779b860b0261b9b80741c +size 1352 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 0000000000..2fc83806da --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/neck/diamond.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a6e84f5596cd06bef08ecfd8091e36e3a996de14d2c029ca19edfdec7634c67 +size 1360 diff --git a/assets/voxygen/voxel/armor/misc/neck/emerald.vox b/assets/voxygen/voxel/armor/misc/neck/emerald.vox new file mode 100644 index 0000000000..6eee3ce8ae --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/neck/emerald.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f658b07d8a587211349259d4bf762e2a1b325a621d4d4b99eec9445c8ff335c1 +size 1320 diff --git a/assets/voxygen/voxel/armor/misc/neck/fang.vox b/assets/voxygen/voxel/armor/misc/neck/fang.vox new file mode 100644 index 0000000000..b7566b4435 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/neck/fang.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4064f219ea313ae417b5082b38786f611a8f00fba800e50e228d8fbbf38f7deb +size 1264 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 0000000000..418a1d6435 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/neck/gold.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c48e2bf114189927cd723d39236abd32f94e8c924fc2fcaa52bb581e96e3b07 +size 1316 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 0000000000..2b68b8374d --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/neck/haniwa_talisman.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23a678dd7b17b01f7739b94c1c3260194756e74014be7e7b9a5b15835fab18f7 +size 1360 diff --git a/assets/voxygen/voxel/armor/misc/neck/honeycomb_pendant.vox b/assets/voxygen/voxel/armor/misc/neck/honeycomb_pendant.vox new file mode 100644 index 0000000000..b0d071c00f --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/neck/honeycomb_pendant.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df987cdf9d3ad744bc9e987fd239f91c77e6448f5622cc0cd7ca1994c8849684 +size 1256 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 0000000000..f53b69da17 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/neck/pendant_of_protection.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5002efac4bd38b1aedf0acc6469e54e60330eb4adbb63c7e8f464a76950fe57 +size 1400 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 0000000000..45c4da4ce8 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/neck/resilience_gem.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91e95b0389b8867661277ad21b5550a43860e6a09cefccb5d5cbdff17bc70930 +size 55819 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 0000000000..f7d1ca8b81 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/neck/ruby.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a1bce574490fd426ce3575b770fd12dcd52a41ce745249bd5be4257cd97eebb +size 1360 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 0000000000..2b2003540f --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/neck/sapphire.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68c790a4e3a5b5a24e56e8654caded9917ac8a1d99af343b523c55ef3a64033d +size 1308 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 0000000000..4d6ad9e446 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/neck/scratched.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cce689f9a24ecc14811684addcd71eeabac1a63c4185a18a5fce11caa6186484 +size 1216 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 0000000000..9f77ced100 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/neck/shell.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:415d69175045f4b27bf5a87923f1720e1c9be43c33ff90b4a2e84824fba9f459 +size 1332 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 0000000000..46e9b60b27 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/neck/topaz.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0039a2a2011a6af0584a2d2b154b92c99a61d0ada87f701e9e13e2095c08940e +size 1336 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