assassin armour

This commit is contained in:
Pfauenauge90 2020-02-08 20:24:24 +01:00 committed by timokoesters
parent 1b170f70c3
commit 5a962771d9
15 changed files with 106 additions and 11 deletions

BIN
assets/voxygen/voxel/armor/belt/assa.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/belt/cloth_black.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/belt/cloth_blood.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/belt/cloth_grey.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/chest/assa.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/foot/assa.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/pants/assa.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/shoulder/assa_left.vox (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -3,8 +3,20 @@
vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)),
color: None
),
Cloth:(
TurqCloth:(
vox_spec: ("armor.belt.cloth_turq", (-4.0, -3.5, -6.0)),
color: None
),
BloodCloth:(
vox_spec: ("armor.belt.cloth_blood", (-4.0, -3.5, -6.0)),
color: Some((29, 26, 33))
),
BlackCloth:(
vox_spec: ("armor.belt.cloth_black", (-4.0, -3.5, -6.0)),
color: Some((29, 26, 33))
),
Assassin:(
vox_spec: ("armor.belt.assa", (-5.0, -3.5, 2.0)),
color: None
)
})
})

View File

@ -23,6 +23,10 @@
vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
color: Some((29, 26, 33))
),
Assassin: (
vox_spec: ("armor.chest.assa", (-7.0, -3.5, 2.0)),
color: None
),
Kimono: (
vox_spec: ("armor.chest.cloth_red_kimono", (-7.0, -3.5, 2.0)),
color: None

View File

@ -8,6 +8,10 @@
vox_spec: ("armor.foot.dark-0", (-2.5, -3.5, -9.0)),
color: None
),
Assassin: (
vox_spec: ("armor.foot.assa", (-2.5, -3.5, -9.0)),
color: None
),
Sandal: (
vox_spec: ("armor.foot.cloth_sandals", (-2.5, -2.5, -9.0)),
color: None

View File

@ -9,6 +9,16 @@
color: None
)
),
Assassin: (
left: (
vox_spec: ("armor.hand.assa_left", (-1.5, -1.5, -7.0)),
color: None
),
right: (
vox_spec: ("armor.hand.assa_right", (-1.5, -1.5, -7.0)),
color: None
)
),
Cloth: (
left: (
vox_spec: ("armor.hand.cloth_basic_left", (-1.5, -1.5, -7.0)),

View File

@ -19,8 +19,12 @@
vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
color: Some((148, 52, 33))
),
Assassin: (
vox_spec: ("armor.pants.assa", (-5.0, -3.5, 1.0)),
color: None
),
Kimono: (
vox_spec: ("armor.pants.cloth_red_kimono", (-5.0, -3.5, 1.0)),
vox_spec: ("armor.pants.cloth_red_kimono", (-5.0, -3.5, 0.0)),
color: None
)
})
})

View File

@ -20,6 +20,16 @@
color: None
)
),
Assassin: (
left: (
vox_spec: ("armor.shoulder.assa_left", (-4.5, -3.0, 0.1)),
color: None
),
right: (
vox_spec: ("armor.empty", (-2.0, -3.5, 0.1)),
color: None
)
),
Chain: (
left: (
vox_spec: ("armor.shoulder.chain_left-1", (-4.0, -3.5, 0.1)),

View File

@ -487,8 +487,9 @@ pub enum Chest {
Orange = 4,
Midnight = 5,
Kimono = 6,
Assassin = 7,
}
pub const ALL_CHESTS: [Chest; 7] = [
pub const ALL_CHESTS: [Chest; 8] = [
Chest::Blue,
Chest::Brown,
Chest::Dark,
@ -496,15 +497,25 @@ pub const ALL_CHESTS: [Chest; 7] = [
Chest::Orange,
Chest::Midnight,
Chest::Kimono,
Chest::Assassin,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)]
pub enum Belt {
Dark = 0,
Cloth = 1,
TurqCloth = 1,
BloodCloth = 2,
BlackCloth = 3,
Assassin = 4,
}
pub const ALL_BELTS: [Belt; 2] = [Belt::Dark, Belt::Cloth];
pub const ALL_BELTS: [Belt; 5] = [
Belt::Dark,
Belt::TurqCloth,
Belt::BloodCloth,
Belt::BlackCloth,
Belt::Assassin,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)]
@ -515,14 +526,16 @@ pub enum Pants {
Green = 3,
Orange = 4,
Kimono = 5,
Assassin = 6,
}
pub const ALL_PANTS: [Pants; 6] = [
pub const ALL_PANTS: [Pants; 7] = [
Pants::Blue,
Pants::Brown,
Pants::Dark,
Pants::Green,
Pants::Orange,
Pants::Kimono,
Pants::Assassin,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@ -530,8 +543,9 @@ pub const ALL_PANTS: [Pants; 6] = [
pub enum Hand {
Bare = 0,
Cloth = 1,
Assassin = 2,
}
pub const ALL_HANDS: [Hand; 2] = [Hand::Bare, Hand::Cloth];
pub const ALL_HANDS: [Hand; 3] = [Hand::Bare, Hand::Cloth, Hand::Assassin];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)]
@ -540,8 +554,15 @@ pub enum Foot {
Dark = 1,
Sandal = 2,
Jester = 3,
Assassin = 4,
}
pub const ALL_FEET: [Foot; 4] = [Foot::Bare, Foot::Dark, Foot::Sandal, Foot::Jester];
pub const ALL_FEET: [Foot; 5] = [
Foot::Bare,
Foot::Dark,
Foot::Sandal,
Foot::Jester,
Foot::Assassin,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)]
@ -549,8 +570,14 @@ pub enum Shoulder {
None = 0,
Brown1 = 1,
Chain = 2,
Assassin = 3,
}
pub const ALL_SHOULDERS: [Shoulder; 3] = [Shoulder::None, Shoulder::Brown1, Shoulder::Chain];
pub const ALL_SHOULDERS: [Shoulder; 4] = [
Shoulder::None,
Shoulder::Brown1,
Shoulder::Chain,
Shoulder::Assassin,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)]