diff --git a/assets/common/items/armor/foot/jackalope_slippers.ron b/assets/common/items/armor/foot/jackalope_slippers.ron new file mode 100644 index 0000000000..bd0804c5d3 --- /dev/null +++ b/assets/common/items/armor/foot/jackalope_slippers.ron @@ -0,0 +1,8 @@ +Item( + name: "Fluffy Jackalope Slippers", + description: "So warm and cozy!\n\n<Right-Click to use>", + kind: Armor( + kind: Foot(JackalopeSlips), + stats: (20), + ), +) diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index a06cd716b5..86a24042cd 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -602,6 +602,10 @@ "voxel.armor.shoulder.leather_strips_right", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), + Armor(Foot(JackalopeSlips)): VoxTrans( + "voxel.armor.foot.jackalope_slippers", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), // Backs Armor(Back(Short0)): VoxTrans( "voxel.armor.back.short-0", diff --git a/assets/voxygen/voxel/armor/foot/jackalope_slippers.vox b/assets/voxygen/voxel/armor/foot/jackalope_slippers.vox new file mode 100644 index 0000000000..6f210f6652 --- /dev/null +++ b/assets/voxygen/voxel/armor/foot/jackalope_slippers.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6647bb6113e20a5353975ec8b3e7ea5f2779c8f472ffb6842ff2729ddc877e3 +size 1404 diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron index a5a1bb2358..0b97024ac2 100644 --- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron @@ -52,5 +52,9 @@ vox_spec: ("armor.foot.leather-2", (-2.5, -3.5, -2.0)), color: None ), + JackalopeSlips:( + vox_spec: ("armor.foot.jackalope_slippers", (-2.5, -3.5, -2.0)), + color: None + ), }, )) diff --git a/common/src/comp/inventory/item/armor.rs b/common/src/comp/inventory/item/armor.rs index 871d7266c6..e0e6f06e58 100644 --- a/common/src/comp/inventory/item/armor.rs +++ b/common/src/comp/inventory/item/armor.rs @@ -186,9 +186,10 @@ pub enum Foot { Cultist = 10, Steel0 = 11, Leather2 = 12, + JackalopeSlips = 13, } -pub const ALL_FEET: [Foot; 12] = [ +pub const ALL_FEET: [Foot; 13] = [ Foot::Dark, Foot::Sandal0, Foot::Jester, @@ -201,6 +202,7 @@ pub const ALL_FEET: [Foot; 12] = [ Foot::Cultist, Foot::Steel0, Foot::Leather2, + Foot::JackalopeSlips, ]; #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]