mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
unclothed parts
This commit is contained in:
parent
19a09782a0
commit
40910b28e4
BIN
assets/voxygen/voxel/armor/chest/chest_none.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/chest/chest_none.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/chest/none.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/armor/chest/none.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/armor/foot/foot_none.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/foot/foot_none.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/hand/hand_left_none.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/hand/hand_left_none.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/hand/hand_right_none.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/hand/hand_right_none.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/pants/pants_none.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/pants/pants_none.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,4 +1,8 @@
|
||||
({
|
||||
None:(
|
||||
vox_spec: ("armor.belt.belt-none", (-5.0, -3.5, 2.0)),
|
||||
color: None
|
||||
),
|
||||
Dark:(
|
||||
vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)),
|
||||
color: None
|
||||
@ -27,4 +31,5 @@
|
||||
vox_spec: ("armor.belt.plate-0", (-5.0, -3.5, 2.0)),
|
||||
color: None
|
||||
),
|
||||
|
||||
})
|
||||
|
@ -1,4 +1,8 @@
|
||||
({
|
||||
None: (
|
||||
vox_spec: ("armor.chest.chest_none", (-7.0, -3.5, 2.0)),
|
||||
color: None
|
||||
),
|
||||
Blue: (
|
||||
vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
|
||||
color: Some((44, 74, 109))
|
||||
@ -35,8 +39,5 @@
|
||||
vox_spec: ("armor.chest.plate_green-0", (-7.0, -3.5, 2.0)),
|
||||
color: None
|
||||
),
|
||||
None: (
|
||||
vox_spec: ("armor.chest.none", (-7.0, -3.5, 2.0)),
|
||||
color: None
|
||||
)
|
||||
|
||||
})
|
||||
|
@ -1,7 +1,6 @@
|
||||
({
|
||||
//This shouldn't be bare, but what is?
|
||||
({
|
||||
Bare: (
|
||||
vox_spec: ("armor.foot.cloth_sandals", (-2.5, -3.5, -9.0)),
|
||||
vox_spec: ("armor.foot.foot_none", (-2.5, -3.5, -9.0)),
|
||||
color: None
|
||||
),
|
||||
Dark: (
|
||||
|
@ -1,11 +1,11 @@
|
||||
({
|
||||
Bare: (
|
||||
left: (
|
||||
vox_spec: ("armor.hand.bare_left", (-1.5, -1.5, -7.0)),
|
||||
vox_spec: ("armor.hand.hand_left_none", (-1.5, -1.5, -7.0)),
|
||||
color: None
|
||||
),
|
||||
right: (
|
||||
vox_spec: ("armor.hand.bare_right", (-1.5, -1.5, -7.0)),
|
||||
vox_spec: ("armor.hand.hand_right_none", (-1.5, -1.5, -7.0)),
|
||||
color: None
|
||||
)
|
||||
),
|
||||
|
@ -1,4 +1,8 @@
|
||||
({
|
||||
None: (
|
||||
vox_spec: ("armor.pants.pants_none", (-5.0, -3.5, 1.0)),
|
||||
color: Some((28, 66, 109))
|
||||
),
|
||||
Blue: (
|
||||
vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
|
||||
color: Some((28, 66, 109))
|
||||
|
@ -474,18 +474,19 @@ pub const ALL_BODY_TYPES: [BodyType; 2] = [BodyType::Female, BodyType::Male];
|
||||
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
||||
#[repr(u32)]
|
||||
pub enum Chest {
|
||||
Blue = 0,
|
||||
Brown = 1,
|
||||
Dark = 2,
|
||||
Green = 3,
|
||||
Orange = 4,
|
||||
Midnight = 5,
|
||||
Kimono = 6,
|
||||
Assassin = 7,
|
||||
PlateGreen0 = 8,
|
||||
None = 9,
|
||||
None = 0,
|
||||
Blue = 1,
|
||||
Brown = 2,
|
||||
Dark = 3,
|
||||
Green = 4,
|
||||
Orange = 5,
|
||||
Midnight = 6,
|
||||
Kimono = 7,
|
||||
Assassin = 8,
|
||||
PlateGreen0 = 9,
|
||||
}
|
||||
pub const ALL_CHESTS: [Chest; 9] = [
|
||||
pub const ALL_CHESTS: [Chest; 10] = [
|
||||
Chest::None,
|
||||
Chest::Blue,
|
||||
Chest::Brown,
|
||||
Chest::Dark,
|
||||
@ -500,14 +501,16 @@ pub const ALL_CHESTS: [Chest; 9] = [
|
||||
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
||||
#[repr(u32)]
|
||||
pub enum Belt {
|
||||
Dark = 0,
|
||||
TurqCloth = 1,
|
||||
BloodCloth = 2,
|
||||
BlackCloth = 3,
|
||||
Assassin = 4,
|
||||
Plate0 = 5,
|
||||
None = 0,
|
||||
Dark = 1,
|
||||
TurqCloth = 2,
|
||||
BloodCloth = 3,
|
||||
BlackCloth = 4,
|
||||
Assassin = 5,
|
||||
Plate0 = 6,
|
||||
}
|
||||
pub const ALL_BELTS: [Belt; 6] = [
|
||||
pub const ALL_BELTS: [Belt; 7] = [
|
||||
Belt::None,
|
||||
Belt::Dark,
|
||||
Belt::TurqCloth,
|
||||
Belt::BloodCloth,
|
||||
@ -519,16 +522,18 @@ pub const ALL_BELTS: [Belt; 6] = [
|
||||
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
||||
#[repr(u32)]
|
||||
pub enum Pants {
|
||||
Blue = 0,
|
||||
Brown = 1,
|
||||
Dark = 2,
|
||||
Green = 3,
|
||||
Orange = 4,
|
||||
Kimono = 5,
|
||||
Assassin = 6,
|
||||
PlateGreen0 = 7,
|
||||
None = 0,
|
||||
Blue = 1,
|
||||
Brown = 2,
|
||||
Dark = 3,
|
||||
Green = 4,
|
||||
Orange = 5,
|
||||
Kimono = 6,
|
||||
Assassin = 7,
|
||||
PlateGreen0 = 8,
|
||||
}
|
||||
pub const ALL_PANTS: [Pants; 8] = [
|
||||
pub const ALL_PANTS: [Pants; 9] = [
|
||||
Pants::None,
|
||||
Pants::Blue,
|
||||
Pants::Brown,
|
||||
Pants::Dark,
|
||||
|
@ -520,7 +520,7 @@ impl HumArmorPantsSpec {
|
||||
{
|
||||
pants
|
||||
} else {
|
||||
&Pants::Dark
|
||||
&Pants::None
|
||||
};
|
||||
|
||||
let spec = match self.0.get(&pants) {
|
||||
|
Loading…
Reference in New Issue
Block a user