diff --git a/assets/common/items/armor/cultist_slayer/kilt.ron b/assets/common/items/armor/cultist_slayer/kilt.ron new file mode 100644 index 0000000000..6361c58768 --- /dev/null +++ b/assets/common/items/armor/cultist_slayer/kilt.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Righteous Champion Kilt", + description: "For light and honor.", + kind: Armor(( + kind: Pants("CultistSlayer0"), + stats: ( + protection: Normal(15.0), + poise_resilience: Normal(10.0), + ), + )), + quality: Epic, + tags: [], +) diff --git a/assets/common/items/armor/cultist_slayer/shoulder.ron b/assets/common/items/armor/cultist_slayer/shoulder.ron index a498a8ad5d..ae75d0f838 100644 --- a/assets/common/items/armor/cultist_slayer/shoulder.ron +++ b/assets/common/items/armor/cultist_slayer/shoulder.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Shoulder("CultistSlayer"), stats: ( - protection: Normal(22.0), - poise_resilience: Normal(1.5), + protection: Normal(16.0), + poise_resilience: Normal(10.0), ), )), quality: Epic, diff --git a/assets/common/items/armor/cultist_slayer/shoulder_0.ron b/assets/common/items/armor/cultist_slayer/shoulder_0.ron new file mode 100644 index 0000000000..e7a6dfbcc7 --- /dev/null +++ b/assets/common/items/armor/cultist_slayer/shoulder_0.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Righteous Champion Mantle", + description: "For light and honor.", + kind: Armor(( + kind: Shoulder("CultistSlayer0"), + stats: ( + protection: Normal(14.0), + poise_resilience: Normal(1.5), + ), + )), + quality: Epic, + tags: [], +) diff --git a/assets/server/manifests/kits.ron b/assets/server/manifests/kits.ron index 673706c17a..8e4b750dac 100644 --- a/assets/server/manifests/kits.ron +++ b/assets/server/manifests/kits.ron @@ -58,9 +58,11 @@ "cultist_slayer": [ ("common.items.armor.cultist_slayer.chest",1), ("common.items.armor.cultist_slayer.pants",1), + ("common.items.armor.cultist_slayer.kilt",1), ("common.items.armor.cultist_slayer.hand",1), ("common.items.armor.cultist_slayer.foot",1), ("common.items.armor.cultist_slayer.shoulder",1), + ("common.items.armor.cultist_slayer.shoulder_0",1), ("common.items.armor.cultist_slayer.belt",1), ("common.items.armor.cultist_slayer.back",1), ], diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 61d00c54de..dfc9aa0217 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1135,6 +1135,10 @@ "voxel.armor.cultist_slayer.pants", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), + Armor(Pants("CultistSlayer0")): VoxTrans( + "voxel.armor.cultist_slayer.pants_0", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), Armor(Belt("CultistSlayer")): VoxTrans( "voxel.armor.cultist_slayer.belt", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4, @@ -1151,6 +1155,10 @@ "voxel.armor.cultist_slayer.shoulder_r", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), + Armor(Shoulder("CultistSlayer0")): VoxTrans( + "voxel.armor.cultist_slayer.shoulder_l_0", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), Armor(Chest("CultistSlayer")): VoxTrans( "voxel.armor.cultist_slayer.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, diff --git a/assets/voxygen/voxel/armor/cultist_slayer/chest.vox b/assets/voxygen/voxel/armor/cultist_slayer/chest.vox index 33e7f5ca3f..025111e197 100644 --- a/assets/voxygen/voxel/armor/cultist_slayer/chest.vox +++ b/assets/voxygen/voxel/armor/cultist_slayer/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e85a90b030c7d6e44bcfd669abed54ca08421f0972a01b3cd2745fe44b0a0cbf -size 3104 +oid sha256:c37af2b39b1101943ec5c464f0e1e2710c04e6e3a8130106d0a3bf94e9b0375e +size 3064 diff --git a/assets/voxygen/voxel/armor/cultist_slayer/pants_0.vox b/assets/voxygen/voxel/armor/cultist_slayer/pants_0.vox new file mode 100644 index 0000000000..c0c2f021b0 --- /dev/null +++ b/assets/voxygen/voxel/armor/cultist_slayer/pants_0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:604b85fdd9edcb0d4d5f6210f7da2aca30d85a7b94d18bb2c63eb7bcda482054 +size 2952 diff --git a/assets/voxygen/voxel/armor/cultist_slayer/shoulder_l_0.vox b/assets/voxygen/voxel/armor/cultist_slayer/shoulder_l_0.vox new file mode 100644 index 0000000000..109c50bc41 --- /dev/null +++ b/assets/voxygen/voxel/armor/cultist_slayer/shoulder_l_0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a1dca97ef180de46b03213ccad00740b4499ee04e8505ce533201af26c9991d +size 1884 diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron index bf7df5d6c4..9cc013d03c 100644 --- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron @@ -128,5 +128,9 @@ vox_spec: ("armor.cultist_slayer.pants", (-6.0, -3.1, 0.0)), color: None ), + "CultistSlayer0": ( + vox_spec: ("armor.cultist_slayer.pants_0", (-6.0, -3.5, -2.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index d8ea960673..05d11c0d12 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -301,5 +301,15 @@ color: None ) ), + "CultistSlayer0": ( + left: ( + vox_spec: ("armor.cultist_slayer.shoulder_l_0", (-7.0, -5.0 , -2.0)), + color: None + ), + right: ( + vox_spec: ("armor.cultist_slayer.shoulder_l_0", (-2.0, -5.0, -2.0)), + color: None + ) + ), }, ))