diff --git a/assets/voxygen/voxel/armor/belt/belt_none.vox b/assets/voxygen/voxel/armor/belt/belt_none.vox new file mode 100644 index 0000000000..aa27c2a7cb --- /dev/null +++ b/assets/voxygen/voxel/armor/belt/belt_none.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2be744a5ee964b6f325875424a32a121386a87f88c53cf61553b171c6ff9dad7 +size 1472 diff --git a/assets/voxygen/voxel/armor/chest/chest_none.vox b/assets/voxygen/voxel/armor/chest/chest_none.vox index d069a845bf..1e9089c6b0 100644 --- a/assets/voxygen/voxel/armor/chest/chest_none.vox +++ b/assets/voxygen/voxel/armor/chest/chest_none.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e68800bb3cb0397f590620f78ff8333fda650db5283ffa8ca9f4034d2b0397d -size 2600 +oid sha256:aaf05edac3fb92fab781293452dd074f915763bc3650cf79c4dbf356da3cfb23 +size 57075 diff --git a/assets/voxygen/voxel/armor/foot/foot_none.vox b/assets/voxygen/voxel/armor/foot/foot_none.vox index 8b7ce6c7c0..8bb8442d00 100644 --- a/assets/voxygen/voxel/armor/foot/foot_none.vox +++ b/assets/voxygen/voxel/armor/foot/foot_none.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bbcaa4c986daea335e3178cf49fed844c536c30643c042d07c116832dc93e6b -size 1416 +oid sha256:e7c2c8e06095499d1b72c17433fc401969166a7634e815965568b4c5326d63ea +size 55899 diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron index 7e149a2be8..b0fb98ac76 100644 --- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron @@ -1,6 +1,6 @@ ({ None:( - vox_spec: ("armor.belt.belt-none", (-5.0, -3.5, 2.0)), + vox_spec: ("armor.belt.belt_none", (-5.0, -3.5, 2.0)), color: None ), Dark:( diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index a2d886ec1f..fd3602df48 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -386,7 +386,7 @@ impl HumArmorChestSpec { ) }; - let bare_chest = graceful_load_mat_segment("armor.chest.none"); + let bare_chest = graceful_load_mat_segment("armor.empty"); let mut chest_armor = graceful_load_mat_segment(&spec.vox_spec.0); @@ -484,7 +484,7 @@ impl HumArmorBeltSpec { { belt } else { - &Belt::Dark + &Belt::None }; let spec = match self.0.get(&belt) { @@ -540,7 +540,7 @@ impl HumArmorPantsSpec { ) }; - let bare_pants = graceful_load_mat_segment("armor.pants.grayscale"); + let bare_pants = graceful_load_mat_segment("armor.empty"); let mut pants_armor = graceful_load_mat_segment(&spec.vox_spec.0);