diff --git a/CHANGELOG.md b/CHANGELOG.md index ca508fb866..47e46a3da8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Petting animals tamed by you or someone else! - Updated furniture sprites. +- Added Abyssal rings ### Changed diff --git a/assets/common/item_i18n_manifest.ron b/assets/common/item_i18n_manifest.ron index 65e3dcfc5a..746c545841 100644 --- a/assets/common/item_i18n_manifest.ron +++ b/assets/common/item_i18n_manifest.ron @@ -1305,6 +1305,9 @@ Simple( "common.items.armor.misc.ring.topaz", ): "armor-misc-ring-topaz", + Simple( + "common.items.armor.misc.ring.abyssal_ring", + ): "armor-misc-ring-abyssal_ring", Simple( "common.items.armor.misc.bag.heavy_seabag", ): "armor-misc-bag-heavy_seabag", diff --git a/assets/common/items/armor/misc/ring/abyssal_ring.ron b/assets/common/items/armor/misc/ring/abyssal_ring.ron new file mode 100644 index 0000000000..57b10b1fe3 --- /dev/null +++ b/assets/common/items/armor/misc/ring/abyssal_ring.ron @@ -0,0 +1,13 @@ +ItemDef( + legacy_name: "Abyssal Ring", + legacy_description: "A pearl ring crudely held together with gold and coral.", + kind: Armor(( + kind: Ring, + stats: Direct(( + protection: Some(Normal(2.0)), + poise_resilience: Some(Normal(1.5)), + )), + )), + quality: Legendary, + tags: [], +) diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 54655043d0..191deaec4a 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -2028,6 +2028,15 @@ ], craft_sprite: Some(CraftingBench), ), + "abyssal_ring": ( + output: ("common.items.armor.misc.ring.abyssal_ring", 1), + inputs: [ + (Item("common.items.crafting_ing.coral_branch"), 2, false), + (Item("common.items.mineral.ingot.gold"), 1, false), + (Item("common.items.crafting_ing.pearl"), 1, false), + ], + craft_sprite: Some(CraftingBench), + ), /// LANTERN "black_lantern": ( output: ("common.items.lantern.black_0", 1), diff --git a/assets/server/manifests/kits.ron b/assets/server/manifests/kits.ron index 84d518b786..0b3ca536fb 100644 --- a/assets/server/manifests/kits.ron +++ b/assets/server/manifests/kits.ron @@ -75,6 +75,7 @@ (Item("common.items.armor.misc.ring.scratched"), 2), (Item("common.items.armor.misc.ring.gold"), 2), (Item("common.items.armor.cultist.ring"), 2), + (Item("common.items.armor.misc.ring.abyssal_ring"), 2), ], "tier-5": [ // Hide diff --git a/assets/test/loadout/ok/just_crafted_rings.ron b/assets/test/loadout/ok/just_crafted_rings.ron index 1e487fbfa5..67a5d7ad74 100644 --- a/assets/test/loadout/ok/just_crafted_rings.ron +++ b/assets/test/loadout/ok/just_crafted_rings.ron @@ -8,6 +8,7 @@ (1, Item("common.items.armor.misc.ring.ruby")), (1, Item("common.items.armor.misc.ring.sapphire")), (1, Item("common.items.armor.misc.ring.topaz")), + (1, Item("common.items.armor.misc.ring.abyssal_ring")), ]), ring2: Choice([ (1, Item("common.items.armor.misc.ring.amethyst")), @@ -17,5 +18,6 @@ (1, Item("common.items.armor.misc.ring.ruby")), (1, Item("common.items.armor.misc.ring.sapphire")), (1, Item("common.items.armor.misc.ring.topaz")), + (1, Item("common.items.armor.misc.ring.abyssal_ring")), ]), ) diff --git a/assets/voxygen/i18n/en/item/armor/armor.ftl b/assets/voxygen/i18n/en/item/armor/armor.ftl index 2bb178ad82..aa9942fa4b 100644 --- a/assets/voxygen/i18n/en/item/armor/armor.ftl +++ b/assets/voxygen/i18n/en/item/armor/armor.ftl @@ -391,6 +391,9 @@ armor-misc-ring-scratched = Scratched Ring armor-misc-ring-topaz = Topaz Ring .desc = A copper ring with a topaz gem. +armor-misc-ring-abyssal_ring = Abyssal Ring + .desc = A pearl ring crudely held together with gold and coral. + armor-misc-back-backpack-traveler = Traveler's Backpack .desc = Comfortable and with enough capacity, its a hoarder's best friend. diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 7c4c98449c..49201cd1bc 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -3029,6 +3029,10 @@ "voxel.armor.misc.ring.diamond", (0.0, 0.0, 0.0), (45.0, 20.0, 0.0), 0.9, ), + Simple("common.items.armor.misc.ring.abyssal_ring"): VoxTrans( + "voxel.armor.misc.ring.abyssal_ring", + (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9, + ), Simple("common.items.armor.cultist.ring"): VoxTrans( "voxel.armor.cultist.ring", (0.0, 0.0, 0.0), (45.0, 15.0, 0.0), 0.9, diff --git a/assets/voxygen/voxel/armor/misc/ring/abyssal_ring.vox b/assets/voxygen/voxel/armor/misc/ring/abyssal_ring.vox new file mode 100644 index 0000000000..6dbf01ebb3 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/ring/abyssal_ring.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:634e777f7309d86f16924e4ed0c8254d2bcf0e332b46af95deca1f105bac9f60 +size 1400 diff --git a/assets/voxygen/voxel/item_drop_manifest.ron b/assets/voxygen/voxel/item_drop_manifest.ron index 9b10e633c1..fa0a78539a 100644 --- a/assets/voxygen/voxel/item_drop_manifest.ron +++ b/assets/voxygen/voxel/item_drop_manifest.ron @@ -765,6 +765,7 @@ Simple("common.items.armor.misc.ring.ruby"): "voxel.armor.misc.ring.ruby", Simple("common.items.armor.misc.ring.diamond"): "voxel.armor.misc.ring.diamond", Simple("common.items.armor.cultist.ring"): "voxel.armor.cultist.ring", + Simple("common.items.armor.misc.ring.abyssal_ring"): "voxel.armor.misc.ring.abyssal_ring", // Necks Simple("common.items.armor.misc.neck.ankh_of_life"): "voxel.armor.misc.neck.ankh_of_life", Simple("common.items.armor.misc.neck.carcanet_of_wrath"): "voxel.armor.misc.neck.carcanet_of_wrath",