diff --git a/assets/common/items/armor/pants/cloth_blue_0.ron b/assets/common/items/armor/pants/cloth_blue_0.ron index ae40e9005b..b8642e11d9 100644 --- a/assets/common/items/armor/pants/cloth_blue_0.ron +++ b/assets/common/items/armor/pants/cloth_blue_0.ron @@ -2,7 +2,7 @@ Item( name: "Blue Linen Skirt", description: "WIP", kind: Armor( - kind: Belt(ClothBlue0), + kind: Pants(ClothBlue0), stats: 20, ), ) diff --git a/assets/common/items/armor/pants/cloth_green_0.ron b/assets/common/items/armor/pants/cloth_green_0.ron index 402a9fe954..bbb60b2220 100644 --- a/assets/common/items/armor/pants/cloth_green_0.ron +++ b/assets/common/items/armor/pants/cloth_green_0.ron @@ -2,7 +2,7 @@ Item( name: "Green Linen Skirt", description: "WIP", kind: Armor( - kind: Belt(ClothGreen0), + kind: Pants(ClothGreen0), stats: 20, ), ) diff --git a/assets/common/items/armor/pants/cloth_purple_0.ron b/assets/common/items/armor/pants/cloth_purple_0.ron index a70280779f..d1b73cb4b0 100644 --- a/assets/common/items/armor/pants/cloth_purple_0.ron +++ b/assets/common/items/armor/pants/cloth_purple_0.ron @@ -2,7 +2,7 @@ Item( name: "Purple Linen Skirt", description: "WIP", kind: Armor( - kind: Belt(ClothPurple0), + kind: Pants(ClothPurple0), stats: 20, ), ) diff --git a/assets/common/items/armor/shoulder/cloth_blue_0.ron b/assets/common/items/armor/shoulder/cloth_blue_0.ron index 55246f765f..70bfcf1bb3 100644 --- a/assets/common/items/armor/shoulder/cloth_blue_0.ron +++ b/assets/common/items/armor/shoulder/cloth_blue_0.ron @@ -2,7 +2,7 @@ Item( name: "Blue Linen Coat", description: "WIP", kind: Armor( - kind: Belt(ClothBlue0), + kind: Shoulder(ClothBlue0), stats: 20, ), ) diff --git a/assets/common/items/armor/shoulder/cloth_green_0.ron b/assets/common/items/armor/shoulder/cloth_green_0.ron index 899b3568b5..79ff879ecc 100644 --- a/assets/common/items/armor/shoulder/cloth_green_0.ron +++ b/assets/common/items/armor/shoulder/cloth_green_0.ron @@ -2,7 +2,7 @@ Item( name: "Green Linen Coat", description: "WIP", kind: Armor( - kind: Belt(ClothGreen0), + kind: Shoulder(ClothGreen0), stats: 20, ), -) \ No newline at end of file +) diff --git a/assets/common/items/armor/shoulder/cloth_purple_0.ron b/assets/common/items/armor/shoulder/cloth_purple_0.ron index bc89fea35c..130a52c5ab 100644 --- a/assets/common/items/armor/shoulder/cloth_purple_0.ron +++ b/assets/common/items/armor/shoulder/cloth_purple_0.ron @@ -2,7 +2,7 @@ Item( name: "Purple Linen Coat", description: "WIP", kind: Armor( - kind: Belt(ClothPurple0), + kind: Shoulder(ClothPurple0), stats: 20, ), -) \ No newline at end of file +) diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 2d3b35706f..7294505cb3 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -74,11 +74,11 @@ (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), Armor(Hand(Assassin)): VoxTrans( - "voxel.armor.hand.assa_left", + "voxel.armor.hand.assa_right", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder(Assassin)): VoxTrans( - "voxel.armor.shoulder.assa_left", + "voxel.armor.shoulder.assa_right", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), // Starting Armor - Plate @@ -99,15 +99,15 @@ (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), Armor(Hand(Plate0)): VoxTrans( - "voxel.armor.hand.plate_left-0", + "voxel.armor.hand.plate_right-0", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder(Plate0)): VoxTrans( - "voxel.armor.shoulder.plate_left-0", + "voxel.armor.shoulder.plate_right-0", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), //Leather0 Armor - Armor(Chest(Leather0)): VoxTrans( + Armor(Chest(Leather0)): VoxTrans( "voxel.armor.chest.leather-0", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), @@ -124,15 +124,98 @@ (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, ), Armor(Hand(Leather0)): VoxTrans( - "voxel.armor.hand.leather_left-0", + "voxel.armor.hand.leather_right-0", (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, ), Armor(Shoulder(Leather1)): VoxTrans( - "voxel.armor.shoulder.leather_left-1", + "voxel.armor.shoulder.leather_right-1", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), Armor(Shoulder(Leather0)): VoxTrans( - "voxel.armor.shoulder.leather_left-0", + "voxel.armor.shoulder.leather_right-0", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + //Linen Cloth + Armor(Chest(ClothBlue0)): VoxTrans( + "voxel.armor.chest.cloth_blue-0", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants(ClothBlue0)): VoxTrans( + "voxel.armor.pants.cloth_blue-0", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt(ClothBlue0)): VoxTrans( + "voxel.armor.belt.cloth_blue-0", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8, + ), + Armor(Foot(ClothBlue0)): VoxTrans( + "voxel.armor.foot.cloth_blue-0", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand(ClothBlue0)): VoxTrans( + "voxel.armor.hand.cloth_blue_right-0", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder(ClothBlue0)): VoxTrans( + "voxel.armor.shoulder.cloth_blue_right-0", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + ////////////// + Armor(Chest(ClothGreen0)): VoxTrans( + "voxel.armor.chest.cloth_green-0", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants(ClothGreen0)): VoxTrans( + "voxel.armor.pants.cloth_green-0", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt(ClothGreen0)): VoxTrans( + "voxel.armor.belt.cloth_green-0", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8, + ), + Armor(Foot(ClothGreen0)): VoxTrans( + "voxel.armor.foot.cloth_green-0", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand(ClothGreen0)): VoxTrans( + "voxel.armor.hand.cloth_green_right-0", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder(Leather1)): VoxTrans( + "voxel.armor.shoulder.cloth_green_right-0", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Shoulder(ClothGreen0)): VoxTrans( + "voxel.armor.shoulder.cloth_green_right-0", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + ////// + Armor(Chest(ClothPurple0)): VoxTrans( + "voxel.armor.chest.cloth_purple-0", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Pants(ClothPurple0)): VoxTrans( + "voxel.armor.pants.cloth_purple-0", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, + ), + Armor(Belt(ClothPurple0)): VoxTrans( + "voxel.armor.belt.cloth_purple-0", + (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8, + ), + Armor(Foot(ClothPurple0)): VoxTrans( + "voxel.armor.foot.cloth_purple-0", + (0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1, + ), + Armor(Hand(ClothPurple0)): VoxTrans( + "voxel.armor.hand.cloth_purple_right-0", + (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, + ), + Armor(Shoulder(ClothPurple0)): VoxTrans( + "voxel.armor.shoulder.cloth_purple_right-1", + (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, + ), + Armor(Shoulder(ClothPurple0)): VoxTrans( + "voxel.armor.shoulder.cloth_purple_right-0", (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, ), // Consumables diff --git a/assets/voxygen/voxel/armor/belt/cloth_blood.vox b/assets/voxygen/voxel/armor/belt/cloth_blood.vox index aada11a8f7..6ceecc6bcc 100644 --- a/assets/voxygen/voxel/armor/belt/cloth_blood.vox +++ b/assets/voxygen/voxel/armor/belt/cloth_blood.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55cab5d4e7af59ee51a9b84a9b1f463ec67e4b7dcf826190bd7841d5ec4a6498 -size 56019 +oid sha256:a7b0dc5700924993498e85da238575afe82560eb731f5325208010195ec59a3f +size 1536 diff --git a/assets/voxygen/voxel/armor/belt/cloth_blue-0.vox b/assets/voxygen/voxel/armor/belt/cloth_blue-0.vox index 4402e9f2d1..bbfffeddfa 100644 --- a/assets/voxygen/voxel/armor/belt/cloth_blue-0.vox +++ b/assets/voxygen/voxel/armor/belt/cloth_blue-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:214ecba8428bf90de0e5a4703f028ce474b47121b29d5d786681c5e7081a7c71 +oid sha256:0c9105cf4a36363c634305678e58da2e0caed456ac58ece7cc2f75073af1d1cb size 1480 diff --git a/assets/voxygen/voxel/armor/belt/cloth_green-0.vox b/assets/voxygen/voxel/armor/belt/cloth_green-0.vox index 5bac822528..881e668464 100644 --- a/assets/voxygen/voxel/armor/belt/cloth_green-0.vox +++ b/assets/voxygen/voxel/armor/belt/cloth_green-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbfa2b6ff274de9fab0a7b910849d9059d9879a041166aeff7cfa8b95cdcecac +oid sha256:6947c00796247c7176aebff4d7b19c88416db20ce692245a864e1baaa9035350 size 1480 diff --git a/assets/voxygen/voxel/armor/belt/cloth_purple-0.vox b/assets/voxygen/voxel/armor/belt/cloth_purple-0.vox index 1aec2c1601..8671b16647 100644 --- a/assets/voxygen/voxel/armor/belt/cloth_purple-0.vox +++ b/assets/voxygen/voxel/armor/belt/cloth_purple-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f038d665dec7532e904efc4a5c64f610e72a8ab3b526f254d5ad6c1d0b55f9d3 +oid sha256:c5b5ff3e4c197686e9bae89cc776f13e3461fff9b168c68c570c4dccfc7c2d34 size 1480 diff --git a/assets/voxygen/voxel/armor/chest/cloth_blue-0.vox b/assets/voxygen/voxel/armor/chest/cloth_blue-0.vox index fe27d36a65..db4983e487 100644 --- a/assets/voxygen/voxel/armor/chest/cloth_blue-0.vox +++ b/assets/voxygen/voxel/armor/chest/cloth_blue-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5290d1fb4cc05689bc27b4cd5927809208ef93bbd7f2366c7c95c6d0a99d1a40 -size 2896 +oid sha256:86dae5747863ce7d6295579d615f9981f36cfabd90491135eae77b27ee4bc7d2 +size 2688 diff --git a/assets/voxygen/voxel/armor/chest/cloth_green-0.vox b/assets/voxygen/voxel/armor/chest/cloth_green-0.vox index 54b8596052..46c430dfa0 100644 --- a/assets/voxygen/voxel/armor/chest/cloth_green-0.vox +++ b/assets/voxygen/voxel/armor/chest/cloth_green-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92e619fe8e555784f6bcf0ec8701741f7868a5b17ef005231bd53ce7343112b6 -size 2896 +oid sha256:d036f47008c035f4523819e53933cca39461eb3dd51cde6a0e591c6d3f6f2629 +size 2688 diff --git a/assets/voxygen/voxel/armor/chest/cloth_purple-0.vox b/assets/voxygen/voxel/armor/chest/cloth_purple-0.vox index 61d9c3217e..cc7af8ef79 100644 --- a/assets/voxygen/voxel/armor/chest/cloth_purple-0.vox +++ b/assets/voxygen/voxel/armor/chest/cloth_purple-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b97d4b71ec99918480672fd03135cb99276083e2570214b65813f7d399bfb195 -size 2896 +oid sha256:40b9e27d6ffa8129eae701e36a4e7e54ca864a1b8b47dc442eefe7ffb0bae9e7 +size 2688 diff --git a/assets/voxygen/voxel/armor/hand/cloth_blue_right-0.vox b/assets/voxygen/voxel/armor/hand/cloth_blue_right-0.vox index f71e01b85a..94db99996f 100644 --- a/assets/voxygen/voxel/armor/hand/cloth_blue_right-0.vox +++ b/assets/voxygen/voxel/armor/hand/cloth_blue_right-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f22d6fad1a1752016d79a0f9bbb305be31fb7209d5d5679126de612c68befff9 +oid sha256:a9778605e9bd050a5fd79c553ee4ae1a0d6dcdc68c582b22090cfef609cc0b2c size 1240 diff --git a/assets/voxygen/voxel/armor/hand/cloth_purple_right-0.vox b/assets/voxygen/voxel/armor/hand/cloth_purple_right-0.vox index 148bae4f57..8ffef537eb 100644 --- a/assets/voxygen/voxel/armor/hand/cloth_purple_right-0.vox +++ b/assets/voxygen/voxel/armor/hand/cloth_purple_right-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0fd8ff5b52d6d7f8a2d8967da1957d21012958714cce43f0a0105d90b76c3fe -size 1240 +oid sha256:93dd0d8050e30b1349218efb63c2e669fa750da83156a6eded1395731b8e057d +size 55723 diff --git a/assets/voxygen/voxel/armor/pants/cloth_blue-0.vox b/assets/voxygen/voxel/armor/pants/cloth_blue-0.vox index 8bd1fbf769..87d313fc19 100644 --- a/assets/voxygen/voxel/armor/pants/cloth_blue-0.vox +++ b/assets/voxygen/voxel/armor/pants/cloth_blue-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:016dfd8f53ffbc51cb49f097a55eb5f7f7f33c22a143f50ba1c9b48236b6c6dd -size 56723 +oid sha256:57c43b492bb31f704ee3f78b0b030fb4588916d78742b0b832cdab44a482beb2 +size 2312 diff --git a/assets/voxygen/voxel/armor/pants/cloth_green-0.vox b/assets/voxygen/voxel/armor/pants/cloth_green-0.vox index 89cba3fc8d..ebf4a2685d 100644 --- a/assets/voxygen/voxel/armor/pants/cloth_green-0.vox +++ b/assets/voxygen/voxel/armor/pants/cloth_green-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19c2a53716b89f3ed90078ce5e43eecaff3ebb86b2409b7b0f709224de421310 -size 56723 +oid sha256:510460353bc946a9e2f224d88d388122099abfecbebf13a3f2a16dfddc8a1ce5 +size 2312 diff --git a/assets/voxygen/voxel/armor/pants/cloth_purple-0.vox b/assets/voxygen/voxel/armor/pants/cloth_purple-0.vox index 455e0ef463..88b068b5d5 100644 --- a/assets/voxygen/voxel/armor/pants/cloth_purple-0.vox +++ b/assets/voxygen/voxel/armor/pants/cloth_purple-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:872d7aafecb11c883d5f1771cc94224558724bc7f817f2ce605cdbc6b9bf2147 -size 56723 +oid sha256:91b30a998e7f395bef3f2adf8214f6a5b5c5f30b55807bb0c8fdc4d10c47b61a +size 2312 diff --git a/assets/voxygen/voxel/armor/pants/grayscale.vox b/assets/voxygen/voxel/armor/pants/grayscale.vox index 43c06d85a1..e3def7502b 100644 --- a/assets/voxygen/voxel/armor/pants/grayscale.vox +++ b/assets/voxygen/voxel/armor/pants/grayscale.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d764227547e7dd1660ac5c39c4d9646f11c2c58efd8363702259b326e832a55 -size 56395 +oid sha256:7efe7e5563f5af4229118b9abb560f0e32472ae40416146bd5bbd12a99d66df5 +size 1912 diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron index 8e73ed569c..24fbedd44c 100644 --- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron @@ -36,16 +36,16 @@ color: None ), ClothPurple0:( - vox_spec: ("armor.belt.cloth_purple_0", (-5.0, -3.5, 2.0)), + vox_spec: ("armor.belt.cloth_purple-0", (-5.0, -3.5, 2.0)), color: None ), ClothBlue0:( - vox_spec: ("armor.belt.cloth_blue_0", (-5.0, -3.5, 2.0)), + vox_spec: ("armor.belt.cloth_blue-0", (-5.0, -3.5, 2.0)), color: None ), ClothGreen0:( - vox_spec: ("armor.belt.cloth_purple_0", (-5.0, -3.5, 2.0)), + vox_spec: ("armor.belt.cloth_green-0", (-5.0, -3.5, 2.0)), color: None ), - + }) diff --git a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron index c6fe492716..c053c04cbd 100644 --- a/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_chest_manifest.ron @@ -44,16 +44,16 @@ color: None ), ClothPurple0:( - vox_spec: ("armor.chest.cloth_purple-0", (-7.0, -3.5, 2.0)), + vox_spec: ("armor.chest.cloth_purple-0", (-7.0, -3.5, 1.0)), color: None ), ClothBlue0:( - vox_spec: ("armor.chest.cloth_blue-0", (-7.0, -3.5, 2.0)), + vox_spec: ("armor.chest.cloth_blue-0", (-7.0, -3.5, 1.0)), color: None ), ClothGreen0:( - vox_spec: ("armor.chest.cloth_green-0", (-7.0, -3.5, 2.0)), + vox_spec: ("armor.chest.cloth_green-0", (-7.0, -3.5, 1.0)), color: None ), - + }) diff --git a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron index a546c19310..868541dc78 100644 --- a/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_foot_manifest.ron @@ -28,15 +28,15 @@ color: None ), ClothPurple0:( - vox_spec: ("armor.foot.cloth_purple_0", (-2.5, -3.5, -9.0)), + vox_spec: ("armor.foot.cloth_purple-0", (-2.5, -3.5, -9.0)), color: None ), ClothBlue0:( - vox_spec: ("armor.foot.cloth_purple_0", (-2.5, -3.5, -9.0)), + vox_spec: ("armor.foot.cloth_blue-0", (-2.5, -3.5, -9.0)), color: None ), ClothGreen0:( - vox_spec: ("armor.foot.cloth_purple_0", (-2.5, -3.5, -9.0)), + vox_spec: ("armor.foot.cloth_green-0", (-2.5, -3.5, -9.0)), color: None ), }) diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron index 1005bbfcc3..151a85f9a9 100644 --- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron @@ -51,7 +51,7 @@ ), ClothPurple0: ( left: ( - vox_spec: ("armor.hand.cloth_purple_left-0", (-1.5, -1.5, -7.0)), + vox_spec: ("armor.hand.cloth_purple_right-0", (-1.5, -1.5, -7.0)), color: None ), right: ( @@ -61,7 +61,7 @@ ), ClothBlue0: ( left: ( - vox_spec: ("armor.hand.cloth_blue_left-0", (-1.5, -1.5, -7.0)), + vox_spec: ("armor.hand.cloth_blue_right-0", (-1.5, -1.5, -7.0)), color: None ), right: ( @@ -71,7 +71,7 @@ ), ClothGreen0: ( left: ( - vox_spec: ("armor.hand.cloth_green_left-0", (-1.5, -1.5, -7.0)), + vox_spec: ("armor.hand.cloth_green_right-0", (-1.5, -1.5, -7.0)), color: None ), right: ( diff --git a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron index 1b8d93ad57..56ae5d0c2d 100644 --- a/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_pants_manifest.ron @@ -40,15 +40,15 @@ color: None ), ClothPurple0:( - vox_spec: ("armor.pants.cloth_purple_0", (-5.0, -3.5, 2.0)), + vox_spec: ("armor.pants.cloth_purple-0", (-5.0, -3.5, 0.0)), color: None ), ClothBlue0:( - vox_spec: ("armor.pants.cloth_blue_0", (-5.0, -3.5, 2.0)), + vox_spec: ("armor.pants.cloth_blue-0", (-5.0, -3.5, 0.0)), color: None ), ClothGreen0:( - vox_spec: ("armor.pants.cloth_purple_0", (-5.0, -3.5, 2.0)), + vox_spec: ("armor.pants.cloth_green-0", (-5.0, -3.5, 0.0)), color: None ), }) diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index c099a12fd9..8b06beeeea 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -82,7 +82,7 @@ ), ClothPurple0: ( left: ( - vox_spec: ("armor.shoulder.cloth_purple_left-0", (-3.2, -3.5, 1.0)), + vox_spec: ("armor.shoulder.cloth_purple_right-0", (-3.2, -3.5, 1.0)), color: None ), right: ( diff --git a/common/src/comp/inventory/mod.rs b/common/src/comp/inventory/mod.rs index ad2d0f7e53..89a382354d 100644 --- a/common/src/comp/inventory/mod.rs +++ b/common/src/comp/inventory/mod.rs @@ -277,10 +277,62 @@ impl Inventory { impl Default for Inventory { fn default() -> Inventory { let mut inventory = Inventory { - slots: vec![None; 18], + slots: vec![None; 45], }; - inventory.push(assets::load_expect_cloned("common.items.cheese")); - inventory.push(assets::load_expect_cloned("common.items.apple")); + inventory.push(assets::load_expect_cloned( + "common.items.armor.chest.cloth_blue_0", + )); + inventory.push(assets::load_expect_cloned( + "common.items.armor.belt.cloth_blue_0", + )); + inventory.push(assets::load_expect_cloned( + "common.items.armor.foot.cloth_blue_0", + )); + inventory.push(assets::load_expect_cloned( + "common.items.armor.hand.cloth_blue_0", + )); + inventory.push(assets::load_expect_cloned( + "common.items.armor.pants.cloth_blue_0", + )); + inventory.push(assets::load_expect_cloned( + "common.items.armor.shoulder.cloth_blue_0", + )); + inventory.push(assets::load_expect_cloned( + "common.items.armor.chest.cloth_green_0", + )); + inventory.push(assets::load_expect_cloned( + "common.items.armor.belt.cloth_green_0", + )); + inventory.push(assets::load_expect_cloned( + "common.items.armor.foot.cloth_green_0", + )); + inventory.push(assets::load_expect_cloned( + "common.items.armor.hand.cloth_green_0", + )); + inventory.push(assets::load_expect_cloned( + "common.items.armor.pants.cloth_green_0", + )); + inventory.push(assets::load_expect_cloned( + "common.items.armor.shoulder.cloth_green_0", + )); + inventory.push(assets::load_expect_cloned( + "common.items.armor.chest.cloth_purple_0", + )); + inventory.push(assets::load_expect_cloned( + "common.items.armor.belt.cloth_purple_0", + )); + inventory.push(assets::load_expect_cloned( + "common.items.armor.foot.cloth_purple_0", + )); + inventory.push(assets::load_expect_cloned( + "common.items.armor.hand.cloth_purple_0", + )); + inventory.push(assets::load_expect_cloned( + "common.items.armor.pants.cloth_purple_0", + )); + inventory.push(assets::load_expect_cloned( + "common.items.armor.shoulder.cloth_purple_0", + )); inventory } }