diff --git a/assets/common/items/armor/cultist_slayer/back.ron b/assets/common/items/armor/cultist_slayer/back.ron new file mode 100644 index 0000000000..31f0719084 --- /dev/null +++ b/assets/common/items/armor/cultist_slayer/back.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Cultist Slayer Mantle", + description: "For light and honor.", + kind: Armor(( + kind: Back("CultistSlayer"), + stats: ( + protection: Normal(3.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Epic, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/cultist_slayer/belt.ron b/assets/common/items/armor/cultist_slayer/belt.ron new file mode 100644 index 0000000000..7c8cb79d3f --- /dev/null +++ b/assets/common/items/armor/cultist_slayer/belt.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Cultist Slayer Belt", + description: "For light and honor.", + kind: Armor(( + kind: Belt("CultistSlayer"), + stats: ( + protection: Normal(6.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Epic, + tags: [], +) diff --git a/assets/common/items/armor/cultist_slayer/chest.ron b/assets/common/items/armor/cultist_slayer/chest.ron new file mode 100644 index 0000000000..77723e1e6d --- /dev/null +++ b/assets/common/items/armor/cultist_slayer/chest.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Cultist Slayer Harness", + description: "For light and honor.", + kind: Armor(( + kind: Chest("CultistSlayer"), + stats: ( + protection: Normal(30.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Epic, + tags: [], +) diff --git a/assets/common/items/armor/cultist_slayer/foot.ron b/assets/common/items/armor/cultist_slayer/foot.ron new file mode 100644 index 0000000000..ff168b0adf --- /dev/null +++ b/assets/common/items/armor/cultist_slayer/foot.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Cultist Slayer Sabatons", + description: "For light and honor.", + kind: Armor(( + kind: Foot("CultistSlayer"), + stats: ( + protection: Normal(6.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Epic, + tags: [], +) diff --git a/assets/common/items/armor/cultist_slayer/hand.ron b/assets/common/items/armor/cultist_slayer/hand.ron new file mode 100644 index 0000000000..6942eeecf0 --- /dev/null +++ b/assets/common/items/armor/cultist_slayer/hand.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Cultist Slayer Gloves", + description: "For light and honor.", + kind: Armor(( + kind: Hand("CultistSlayer"), + stats: ( + protection: Normal(12.0), + poise_resilience: Normal(8.0), + ), + )), + quality: Epic, + tags: [], +) diff --git a/assets/common/items/armor/cultist_slayer/pants.ron b/assets/common/items/armor/cultist_slayer/pants.ron new file mode 100644 index 0000000000..4532872a4e --- /dev/null +++ b/assets/common/items/armor/cultist_slayer/pants.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Cultist Slayer Gauntlets", + description: "For light and honor.", + kind: Armor(( + kind: Pants("CultistSlayer"), + stats: ( + protection: Normal(24.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Epic, + tags: [], +) diff --git a/assets/common/items/armor/cultist_slayer/shoulder.ron b/assets/common/items/armor/cultist_slayer/shoulder.ron new file mode 100644 index 0000000000..c19cf4b5cc --- /dev/null +++ b/assets/common/items/armor/cultist_slayer/shoulder.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Cultist Slayer Pauldrons", + description: "For light and honor.", + kind: Armor(( + kind: Shoulder("CultistSlayer"), + stats: ( + protection: Normal(18.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Epic, + tags: [], +) diff --git a/assets/server/manifests/kits.ron b/assets/server/manifests/kits.ron index eeb423c649..673706c17a 100644 --- a/assets/server/manifests/kits.ron +++ b/assets/server/manifests/kits.ron @@ -55,4 +55,13 @@ ("common.items.weapons.sceptre.fork0", 1), ("common.items.consumable.potion_med", 100), ], + "cultist_slayer": [ + ("common.items.armor.cultist_slayer.chest",1), + ("common.items.armor.cultist_slayer.pants",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.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 ec18da9f45..026c08cba9 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1126,6 +1126,51 @@ "voxel.armor.cultist.shoulder", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), + // Cultist Slayer Set + Armor(Chest("CultistSlayer")): VoxTrans( + "voxel.armor.cultist.chest", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants("CultistSlayer")): VoxTrans( + "voxel.armor.cultist_slayer.pants", + (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, + ), + Armor(Foot("CultistSlayer")): VoxTrans( + "voxel.armor.cultist_slayer.shoe_l", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand("CultistSlayer")): VoxTrans( + "voxel.armor.cultist_slayer.hand_l", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("CultistSlayer")): VoxTrans( + "voxel.armor.cultist_slayer.shoulder_r", + (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, + ), + Armor(Pants("CultistSlayer")): VoxTrans( + "voxel.armor.cultist_slayer.pants", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Hand("CultistSlayer")): VoxTrans( + "voxel.armor.cultist_slayer.hand_l", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder("CultistSlayer")): VoxTrans( + "voxel.armor.cultist_slayer.shoulder_l", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Back("CultistSlayer")): VoxTrans( + "voxel.armor.cultist_slayer.back", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.0, + ), // Druid Set Armor(Chest("Druid")): VoxTrans( "voxel.armor.druid.chest", diff --git a/assets/voxygen/voxel/armor/cultist_slayer/back.vox b/assets/voxygen/voxel/armor/cultist_slayer/back.vox new file mode 100644 index 0000000000..b79e13ea92 --- /dev/null +++ b/assets/voxygen/voxel/armor/cultist_slayer/back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ab1bcb6cf6a9b303ddb7846d6772f8a8f9692bfa1c4d60445b8ccd26afd35ae +size 27135 diff --git a/assets/voxygen/voxel/armor/cultist_slayer/belt.vox b/assets/voxygen/voxel/armor/cultist_slayer/belt.vox new file mode 100644 index 0000000000..4da3d019c4 --- /dev/null +++ b/assets/voxygen/voxel/armor/cultist_slayer/belt.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec1b6e993373c6a4fcb8bbcb1584075179c4d674d62d2f7f2d4364959d552a77 +size 27127 diff --git a/assets/voxygen/voxel/armor/cultist_slayer/chest.vox b/assets/voxygen/voxel/armor/cultist_slayer/chest.vox new file mode 100644 index 0000000000..c0af732c6c --- /dev/null +++ b/assets/voxygen/voxel/armor/cultist_slayer/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:225064964669363b5b2d68ccc6280d4f517f112764b0f0f48ed7214fcdc814dd +size 28599 diff --git a/assets/voxygen/voxel/armor/cultist_slayer/hand_l.vox b/assets/voxygen/voxel/armor/cultist_slayer/hand_l.vox new file mode 100644 index 0000000000..855c5b17b5 --- /dev/null +++ b/assets/voxygen/voxel/armor/cultist_slayer/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5deca8e1c529eaf20be5772a06019ca81f8bf44033ddda5a3a63c11c6e23f089 +size 26991 diff --git a/assets/voxygen/voxel/armor/cultist_slayer/hand_r.vox b/assets/voxygen/voxel/armor/cultist_slayer/hand_r.vox new file mode 100644 index 0000000000..855c5b17b5 --- /dev/null +++ b/assets/voxygen/voxel/armor/cultist_slayer/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5deca8e1c529eaf20be5772a06019ca81f8bf44033ddda5a3a63c11c6e23f089 +size 26991 diff --git a/assets/voxygen/voxel/armor/cultist_slayer/pants.vox b/assets/voxygen/voxel/armor/cultist_slayer/pants.vox new file mode 100644 index 0000000000..a0165b076e --- /dev/null +++ b/assets/voxygen/voxel/armor/cultist_slayer/pants.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3bfd314aa1d9f5efac77cb4a7a3f56bbaabffccfa0a1b261064af76f0255daf +size 27575 diff --git a/assets/voxygen/voxel/armor/cultist_slayer/shoe_l.vox b/assets/voxygen/voxel/armor/cultist_slayer/shoe_l.vox new file mode 100644 index 0000000000..c9af0bb6ce --- /dev/null +++ b/assets/voxygen/voxel/armor/cultist_slayer/shoe_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63450e055a9418c75b3621c5d45037da6485202e3266540dd79ea6c54860d95b +size 1564 diff --git a/assets/voxygen/voxel/armor/cultist_slayer/shoe_r.vox b/assets/voxygen/voxel/armor/cultist_slayer/shoe_r.vox new file mode 100644 index 0000000000..39f1a5f869 --- /dev/null +++ b/assets/voxygen/voxel/armor/cultist_slayer/shoe_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23bbf8761c7b51af4d34dc7e490f8e4bde1807821c449f9f12edeaf0c8e57231 +size 27155 diff --git a/assets/voxygen/voxel/armor/cultist_slayer/shoulder_l.vox b/assets/voxygen/voxel/armor/cultist_slayer/shoulder_l.vox new file mode 100644 index 0000000000..831a049b88 --- /dev/null +++ b/assets/voxygen/voxel/armor/cultist_slayer/shoulder_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eca7992a259089054e4765ad001565fd8b9e14f1704d6cf17604cd8f6e0c14b9 +size 27799 diff --git a/assets/voxygen/voxel/armor/cultist_slayer/shoulder_r.vox b/assets/voxygen/voxel/armor/cultist_slayer/shoulder_r.vox new file mode 100644 index 0000000000..831a049b88 --- /dev/null +++ b/assets/voxygen/voxel/armor/cultist_slayer/shoulder_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eca7992a259089054e4765ad001565fd8b9e14f1704d6cf17604cd8f6e0c14b9 +size 27799 diff --git a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron index 81e30417f8..0541bd5297 100644 --- a/assets/voxygen/voxel/humanoid_armor_back_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_back_manifest.ron @@ -48,5 +48,9 @@ vox_spec: ("armor.warlock.back", (-5.0, -1.5, -15.5)), color: None ), + "CultistSlayer": ( + vox_spec: ("armor.cultist_slayer.back", (-5.0, -1.5, -15.5)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron index d9be59fe73..9339190040 100644 --- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron @@ -96,5 +96,9 @@ vox_spec: ("armor.warlock.belt", (-4.0, -3.0, 2.0)), color: None ), + "CultistSlayer": ( + vox_spec: ("armor.cultist_slayer.belt", (-5.0, -4.0, 1.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron index e06b45db3f..d39162c2f4 100644 --- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron @@ -166,5 +166,9 @@ vox_spec: ("armor.warlock.chest", (-7.0, -3.5, 0.5)), color: None ), + "CultistSlayer": ( + vox_spec: ("armor.cultist_slayer.chest", (-7.0, -4.0, 2.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron index 43235c8e94..a45efc7f3d 100644 --- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron @@ -96,5 +96,9 @@ vox_spec: ("armor.warlock.foot", (-2.5, -3.5, -2.0)), color: None ), + "CultistSlayer": ( + vox_spec: ("armor.cultist_slayer.shoe_l", (-2.5, -3.5, -2.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron index 1bf311f527..67d447dd87 100644 --- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron @@ -210,5 +210,15 @@ color: None ) ), + "CultistSlayer": ( + left: ( + vox_spec: ("armor.cultist_slayer.hand_l", (-4.0, -2.0, -4.5)), + color: None + ), + right: ( + vox_spec: ("armor.cultist_slayer.hand_l", (-2.0, -2.0, -4.5)), + color: None + ) + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron index d3ce20aa93..9df8da9166 100644 --- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron @@ -124,5 +124,9 @@ vox_spec: ("armor.warlock.pants", (-5.0, -4.0, -2.0)), color: None ), + "CultistSlayer": ( + vox_spec: ("armor.cultist_slayer.pants", (-5.0, -3.0, -1.0)), + color: None + ), }, )) diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index 4a97ad7ea2..8e2b578ef7 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -1,5 +1,5 @@ (( - //This shouldn't be the none option, but what is? + // This shouldn't be the none option, but what is? default: ( left: ( vox_spec: ("armor.empty", (-3.0, -3.5, 1.0)), @@ -291,5 +291,15 @@ color: None ) ), + "CultistSlayer": ( + left: ( + vox_spec: ("armor.cultist_slayer.shoulder_l", (-6.0, -5.0 , -2.0)), + color: None + ), + right: ( + vox_spec: ("armor.cultist_slayer.shoulder_l", (-3.0, -5.0, -2.0)), + color: None + ) + ), }, ))