plate armour

This commit is contained in:
Pfauenauge90 2020-03-05 16:35:26 +01:00 committed by timokoesters
parent 6cb68fabea
commit 913393963a
22 changed files with 147 additions and 17 deletions

View File

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

View File

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

View File

@ -0,0 +1,8 @@
Item(
name: "Assassin Shoulder Guard",
description: "Only the best for a member of the creed.",
kind: Armor(
kind: Shoulder(Assassin),
stats: 20,
),
)

View File

@ -0,0 +1,8 @@
Item(
name: "Iron Chestplate",
description: "Arrows to the stomach are soooo last update.",
kind: Armor(
kind: Chest(Plate),
stats: 20,
),
)

View File

@ -0,0 +1,8 @@
Item(
name: "Assassin Shoulder Guard",
description: "Only the best for a member of the creed.",
kind: Armor(
kind: Shoulder(Assassin),
stats: 20,
),
)

View File

@ -47,7 +47,7 @@
),
Armor(Belt(Assassin)): VoxTrans(
"voxel.armor.belt.assa",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.1,
),
Armor(Foot(Assassin)): VoxTrans(
"voxel.armor.foot.assa",
@ -62,8 +62,28 @@
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
// Starting Armor - Plate
Armor(Chest(Plate)): VoxTrans(
"voxel.armor.chest.plate",
Armor(Chest(PlateGreen0)): VoxTrans(
"voxel.armor.chest.plate_green-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Pants((PlateGreen0)): VoxTrans(
"voxel.armor.pants.plate_green-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Belt(Plate0)): VoxTrans(
"voxel.armor.belt.plate-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.1,
),
Armor(Foot(Plate0)): VoxTrans(
"voxel.armor.foot.plate-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Hand(Plate0)): VoxTrans(
"voxel.armor.hand.plate_left-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Shoulder(Plate0)): VoxTrans(
"voxel.armor.shoulder.plate_left-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
// Consumables

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

View File

@ -18,5 +18,13 @@
Assassin:(
vox_spec: ("armor.belt.assa", (-5.0, -3.5, 2.0)),
color: None
)
),
Dark:(
vox_spec: ("armor.belt.plate-0", (-4.0, -3.5, 2.0)),
color: None
),
Plate0:(
vox_spec: ("armor.belt.plate-0", (-4.0, -3.5, 2.0)),
color: None
),
})

View File

@ -31,8 +31,8 @@
vox_spec: ("armor.chest.cloth_red_kimono", (-7.0, -3.5, 2.0)),
color: None
),
Plate: (
vox_spec: ("armor.chest.plate", (-7.0, -3.5, 2.0)),
PlateGreen0: (
vox_spec: ("armor.chest.plate_green-0", (-7.0, -3.5, 2.0)),
color: None
)
})

View File

@ -19,5 +19,9 @@
Jester: (
vox_spec: ("armor.foot.dark_jester-elf_shoe", (-2.5, -3.0, -9.0)),
color: None
)
),
Plate0: (
vox_spec: ("armor.foot.plate-0", (-2.5, -3.5, -9.0)),
color: None
),
})

View File

@ -28,5 +28,15 @@
vox_spec: ("armor.hand.cloth_basic_right", (-1.5, -1.5, -7.0)),
color: None
)
)
),
Plate0: (
left: (
vox_spec: ("armor.hand.plate_left-0", (-1.5, -1.5, -7.0)),
color: None
),
right: (
vox_spec: ("armor.hand.plate_right-0", (-1.5, -1.5, -7.0)),
color: None
)
),
})

View File

@ -26,5 +26,13 @@
Kimono: (
vox_spec: ("armor.pants.cloth_red_kimono", (-5.0, -3.5, 0.0)),
color: None
)
),
Assassin: (
vox_spec: ("armor.pants.plate-0", (-5.0, -3.5, 1.0)),
color: None
),
PlateGreen0: (
vox_spec: ("armor.pants.plate_green-0", (-5.0, -3.5, 1.0)),
color: None
),
})

View File

@ -39,5 +39,15 @@
vox_spec: ("armor.shoulder.chain_right-1", (-2.0, -3.5, 0.1)),
color: None
)
)
),
Plate0: (
left: (
vox_spec: ("armor.shoulder.plate_left-0", (-4.0, -3.5, 0.1)),
color: None
),
right: (
vox_spec: ("armor.shoulder.plate_right-0", (-2.0, -3.5, 0.1)),
color: None
)
),
})

View File

@ -488,7 +488,7 @@ pub enum Chest {
Midnight = 5,
Kimono = 6,
Assassin = 7,
Plate = 8,
PlateGreen0 = 8,
}
pub const ALL_CHESTS: [Chest; 9] = [
Chest::Blue,
@ -499,7 +499,7 @@ pub const ALL_CHESTS: [Chest; 9] = [
Chest::Midnight,
Chest::Kimono,
Chest::Assassin,
Chest::Plate,
Chest::PlateGreen0,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@ -510,13 +510,15 @@ pub enum Belt {
BloodCloth = 2,
BlackCloth = 3,
Assassin = 4,
Plate0 = 5,
}
pub const ALL_BELTS: [Belt; 5] = [
pub const ALL_BELTS: [Belt; 6] = [
Belt::Dark,
Belt::TurqCloth,
Belt::BloodCloth,
Belt::BlackCloth,
Belt::Assassin,
Belt::Plate0,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@ -529,8 +531,9 @@ pub enum Pants {
Orange = 4,
Kimono = 5,
Assassin = 6,
PlateGreen0 = 7,
}
pub const ALL_PANTS: [Pants; 7] = [
pub const ALL_PANTS: [Pants; 8] = [
Pants::Blue,
Pants::Brown,
Pants::Dark,
@ -538,6 +541,7 @@ pub const ALL_PANTS: [Pants; 7] = [
Pants::Orange,
Pants::Kimono,
Pants::Assassin,
Pants::PlateGreen0,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@ -546,8 +550,9 @@ pub enum Hand {
Bare = 0,
Cloth = 1,
Assassin = 2,
Plate0 = 3,
}
pub const ALL_HANDS: [Hand; 3] = [Hand::Bare, Hand::Cloth, Hand::Assassin];
pub const ALL_HANDS: [Hand; 4] = [Hand::Bare, Hand::Cloth, Hand::Assassin, Hand::Plate0];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)]
@ -557,13 +562,15 @@ pub enum Foot {
Sandal = 2,
Jester = 3,
Assassin = 4,
Plate0 = 5,
}
pub const ALL_FEET: [Foot; 5] = [
pub const ALL_FEET: [Foot; 6] = [
Foot::Bare,
Foot::Dark,
Foot::Sandal,
Foot::Jester,
Foot::Assassin,
Foot::Plate0,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@ -573,12 +580,14 @@ pub enum Shoulder {
Brown1 = 1,
Chain = 2,
Assassin = 3,
Plate0 = 4,
}
pub const ALL_SHOULDERS: [Shoulder; 4] = [
pub const ALL_SHOULDERS: [Shoulder; 5] = [
Shoulder::None,
Shoulder::Brown1,
Shoulder::Chain,
Shoulder::Assassin,
Shoulder::Plate0,
];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]