From aa36082eed40a75c073dc81866632e97b18e63c5 Mon Sep 17 00:00:00 2001 From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com> Date: Thu, 27 Feb 2020 21:07:30 +0100 Subject: [PATCH] more armour --- assets/common/items/armor/chest_assassin.ron | 8 +++++ .../common/items/armor/shoulder_assassin.ron | 8 +++++ assets/voxygen/item_image_manifest.ron | 31 +++++++++++++++++++ assets/voxygen/voxel/armor/chest/plate.vox | 2 +- 4 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 assets/common/items/armor/chest_assassin.ron create mode 100644 assets/common/items/armor/shoulder_assassin.ron diff --git a/assets/common/items/armor/chest_assassin.ron b/assets/common/items/armor/chest_assassin.ron new file mode 100644 index 0000000000..9df179fb06 --- /dev/null +++ b/assets/common/items/armor/chest_assassin.ron @@ -0,0 +1,8 @@ +Item( + name: "Assassin Chest", + description: "Only the best for a member of the creed.", + kind: Armor( + kind: Chest(Assassin), + stats: 20, + ), +) diff --git a/assets/common/items/armor/shoulder_assassin.ron b/assets/common/items/armor/shoulder_assassin.ron new file mode 100644 index 0000000000..819538cc5e --- /dev/null +++ b/assets/common/items/armor/shoulder_assassin.ron @@ -0,0 +1,8 @@ +Item( + name: "Assassin Shoulder Guard", + description: "Only the best for a member of the creed.", + kind: Armor( + kind: Shoulder(Assassin), + stats: 20, + ), +) diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 196dd36a54..d7fc51f8be 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -35,6 +35,37 @@ "element.icons.collar", (0.0, 0.0, 0.0), (-90.0, 180.0, 10.0), 1.3, ), + // Armor + // Assassin Set + Armor(Chest(Assassin)): VoxTrans( + "voxel.armor.pants.assa", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants(Assassin)): VoxTrans( + "voxel.armor.pants.assa", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants(Assassin)): VoxTrans( + "voxel.armor.belt.assa", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants(Assassin)): VoxTrans( + "voxel.armor.foot.assa", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Hand(Assassin)): VoxTrans( + "voxel.armor.hand.assa_left", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Shoulder(Assassin)): VoxTrans( + "voxel.armor.pants.assa", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + // Starting Armor - Plate + Armor(Chest(Plate)): VoxTrans( + "voxel.armor.chest.plate", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), // Consumables Consumable(Apple): VoxTrans( "element.icons.item_apple", diff --git a/assets/voxygen/voxel/armor/chest/plate.vox b/assets/voxygen/voxel/armor/chest/plate.vox index d11968f267..79466f4172 100644 --- a/assets/voxygen/voxel/armor/chest/plate.vox +++ b/assets/voxygen/voxel/armor/chest/plate.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:814763c1e4ad138f5de5ebb628dce3dc8f6f010c050052e993142754a8806668 +oid sha256:2d91415da84dba3e5a7c1c321b9728d80f1a9ca05ec8707bf39003b8b13033a1 size 57227