swift leather armour parts

This commit is contained in:
Pfauenauge90 2020-03-19 14:17:53 +01:00
parent 2b22b84a33
commit d863e12235
23 changed files with 136 additions and 11 deletions

View File

@ -0,0 +1,8 @@
Item(
name: "Swift Belt",
description: "",
kind: Armor(
kind: Belt(Leather0),
stats: 20,
),
)

View File

@ -0,0 +1,8 @@
Item(
name: "Swift Chest",
description: "",
kind: Armor(
kind: Chest(Leather0),
stats: 20,
),
)

View File

@ -0,0 +1,8 @@
Item(
name: "Swift Boots",
description: "",
kind: Armor(
kind: Foot(Leather0),
stats: 20,
),
)

View File

@ -0,0 +1,8 @@
Item(
name: "Swift Gloves",
description: "Only the best for a member of the creed.",
kind: Armor(
kind: Hand(Leather0),
stats: 20,
),
)

View File

@ -1,6 +1,6 @@
Item(
name: "Green Camo Pants",
description: "Perfect for hunting.",
name: "Hunting Pants",
description: "",
kind: Armor(
kind: Pants(Green),
stats: 20,

View File

@ -0,0 +1,8 @@
Item(
name: "Swift Pants",
description: "",
kind: Armor(
kind: Pants(Leather0),
stats: 20,
),
)

View File

@ -0,0 +1,8 @@
Item(
name: "Swift Shoulderpads",
description: "",
kind: Armor(
kind: Shoulder(Leather1),
stats: 20,
),
)

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
assets/voxygen/voxel/armor/hand/leather_left-0.vox (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/voxygen/voxel/armor/hand/leather_right-0.vox (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

View File

@ -31,5 +31,9 @@
vox_spec: ("armor.belt.plate-0", (-5.0, -3.5, 2.0)),
color: None
),
Leather0:(
vox_spec: ("armor.belt.leather-0", (-5.0, -3.5, 2.0)),
color: None
),
})

View File

@ -39,5 +39,9 @@
vox_spec: ("armor.chest.plate_green-0", (-7.0, -3.5, 2.0)),
color: None
),
Leather0: (
vox_spec: ("armor.chest.leather-0", (-7.0, -3.5, 2.0)),
color: None
),
})

View File

@ -23,4 +23,8 @@
vox_spec: ("armor.foot.plate-0", (-2.5, -3.5, -9.0)),
color: None
),
Leather0: (
vox_spec: ("armor.foot.leather-0", (-2.5, -3.5, -9.0)),
color: None
),
})

View File

@ -39,4 +39,14 @@
color: None
)
),
Leather0: (
left: (
vox_spec: ("armor.hand.leather_left-0", (-1.5, -1.5, -7.0)),
color: None
),
right: (
vox_spec: ("armor.hand.leather_right-0", (-1.5, -1.5, -7.0)),
color: None
)
),
})

View File

@ -35,4 +35,8 @@
vox_spec: ("armor.pants.plate_green-0", (-5.0, -3.5, 1.0)),
color: None
),
Leather0: (
vox_spec: ("armor.pants.leather-0", (-5.0, -3.5, 1.0)),
color: None
),
})

View File

@ -69,5 +69,15 @@
vox_spec: ("armor.shoulder.leather_right-0", (-2.6, -3.5, 1.0)),
color: None
)
),
Leather1: (
left: (
vox_spec: ("armor.shoulder.leather_left-1", (-3.6, -4.5, 1.0)),
color: None
),
right: (
vox_spec: ("armor.shoulder.leather_right-1", (-2.6, -4.5, 1.0)),
color: None
)
),
})

View File

@ -484,8 +484,9 @@ pub enum Chest {
Kimono = 7,
Assassin = 8,
PlateGreen0 = 9,
Leather0 = 10,
}
pub const ALL_CHESTS: [Chest; 10] = [
pub const ALL_CHESTS: [Chest; 11] = [
Chest::None,
Chest::Blue,
Chest::Brown,
@ -496,6 +497,7 @@ pub const ALL_CHESTS: [Chest; 10] = [
Chest::Kimono,
Chest::Assassin,
Chest::PlateGreen0,
Chest::Leather0,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@ -508,8 +510,9 @@ pub enum Belt {
BlackCloth = 4,
Assassin = 5,
Plate0 = 6,
Leather0 = 7,
}
pub const ALL_BELTS: [Belt; 7] = [
pub const ALL_BELTS: [Belt; 8] = [
Belt::None,
Belt::Dark,
Belt::TurqCloth,
@ -517,6 +520,7 @@ pub const ALL_BELTS: [Belt; 7] = [
Belt::BlackCloth,
Belt::Assassin,
Belt::Plate0,
Belt::Leather0,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@ -531,8 +535,9 @@ pub enum Pants {
Kimono = 6,
Assassin = 7,
PlateGreen0 = 8,
Leather0 = 9,
}
pub const ALL_PANTS: [Pants; 9] = [
pub const ALL_PANTS: [Pants; 10] = [
Pants::None,
Pants::Blue,
Pants::Brown,
@ -542,6 +547,7 @@ pub const ALL_PANTS: [Pants; 9] = [
Pants::Kimono,
Pants::Assassin,
Pants::PlateGreen0,
Pants::Leather0,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@ -551,8 +557,15 @@ pub enum Hand {
Cloth = 1,
Assassin = 2,
Plate0 = 3,
Leather0 = 4,
}
pub const ALL_HANDS: [Hand; 4] = [Hand::Bare, Hand::Cloth, Hand::Assassin, Hand::Plate0];
pub const ALL_HANDS: [Hand; 5] = [
Hand::Bare,
Hand::Cloth,
Hand::Assassin,
Hand::Plate0,
Hand::Leather0,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)]
@ -563,14 +576,16 @@ pub enum Foot {
Jester = 3,
Assassin = 4,
Plate0 = 5,
Leather0 = 6,
}
pub const ALL_FEET: [Foot; 6] = [
pub const ALL_FEET: [Foot; 7] = [
Foot::Bare,
Foot::Dark,
Foot::Sandal,
Foot::Jester,
Foot::Assassin,
Foot::Plate0,
Foot::Leather0,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@ -582,14 +597,16 @@ pub enum Shoulder {
Assassin = 3,
Plate0 = 4,
Leather0 = 5,
Leather1 = 6,
}
pub const ALL_SHOULDERS: [Shoulder; 6] = [
pub const ALL_SHOULDERS: [Shoulder; 7] = [
Shoulder::None,
Shoulder::Brown1,
Shoulder::Chain,
Shoulder::Assassin,
Shoulder::Plate0,
Shoulder::Leather0,
Shoulder::Leather1,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]

View File

@ -218,10 +218,10 @@ impl<'a> System<'a> for Sys {
active_item,
second_item: None,
shoulder: Some(assets::load_expect_cloned(
"common.items.armor.shoulder_plate-0",
"common.items.armor.shoulder_leather-0",
)),
chest: Some(assets::load_expect_cloned(
"common.items.armor.chest.chest_plate_green-0",
"common.items.armor.chest.chest_leather-0",
)),
belt: Some(assets::load_expect_cloned(
"common.items.armor.belt_plate-0",
@ -233,7 +233,7 @@ impl<'a> System<'a> for Sys {
"common.items.armor.pants_plate_green-0",
)),
foot: Some(assets::load_expect_cloned(
"common.items.armor.foot_plate-0",
"common.items.armor.foot_leather-0",
)),
},
comp::Alignment::Enemy => comp::Loadout {