Added 2 sets of armour.

This commit is contained in:
Silentium 2020-05-17 19:02:59 +00:00 committed by Justin Shipsey
parent 9693fd33ae
commit 1673a25e8b
37 changed files with 305 additions and 10 deletions

View File

@ -83,6 +83,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added a popup when setting your character's waypoint - Added a popup when setting your character's waypoint
- Added dungeon arenas - Added dungeon arenas
- Added dungeon bosses and rare boss loot - Added dungeon bosses and rare boss loot
- Added 2 sets of armour. One Steel and one Leather.
### Changed ### Changed

View File

@ -0,0 +1,8 @@
Item(
name: "Leather Belt",
description: "A belt made from simple leather.",
kind: Armor(
kind: Belt(Leather2),
stats: (20),
),
)

View File

@ -0,0 +1,8 @@
Item(
name: "Steel Belt",
description: "A belt made from Steel.",
kind: Armor(
kind: Belt(Steel0),
stats: (20),
),
)

View File

@ -0,0 +1,8 @@
Item(
name: "Leather Cuirass",
description: "A cuirass made of simple leather",
kind: Armor(
kind: Chest(Leather2),
stats: (20),
),
)

View File

@ -0,0 +1,8 @@
Item(
name: "Steel Cuirass",
description: "A cuirass of steel plate",
kind: Armor(
kind: Chest(Steel0),
stats: (20),
),
)

View File

@ -0,0 +1,8 @@
Item(
name: "Leather Boots",
description: "Boots made of simple leather",
kind: Armor(
kind: Foot(Leather2),
stats: (20),
),
)

View File

@ -0,0 +1,8 @@
Item(
name: "Steel Boots",
description: "Boots plated in steel",
kind: Armor(
kind: Foot(Steel0),
stats: (20),
),
)

View File

@ -0,0 +1,8 @@
Item(
name: "Leather Gloves",
description: "Gloves made of simple leather",
kind: Armor(
kind: Hand(Leather2),
stats: (20),
),
)

View File

@ -0,0 +1,8 @@
Item(
name: "Steel Gauntlets",
description: "Gauntlets made of steel",
kind: Armor(
kind: Hand(Steel0),
stats: (20),
),
)

View File

@ -0,0 +1,8 @@
Item(
name: "Leather Leg Armour",
description: "Leg armour made of simple leather",
kind: Armor(
kind: Pants(Leather2),
stats: (20),
),
)

View File

@ -0,0 +1,8 @@
Item(
name: "Steel Chausses",
description: "Leg armour made of steel plates",
kind: Armor(
kind: Pants(Steel0),
stats: (20),
),
)

View File

@ -0,0 +1,8 @@
Item(
name: "Leather Shoulder Pad",
description: "A simple shoulder pad made of leather",
kind: Armor(
kind: Shoulder(Leather2),
stats: (20),
),
)

View File

@ -0,0 +1,8 @@
Item(
name: "Steel Shoulder Pad",
description: "A simple shoulder pad made of steel",
kind: Armor(
kind: Shoulder(Steel0),
stats: (20),
),
)

View File

@ -263,6 +263,31 @@
"voxel.armor.shoulder.plate_right-0", "voxel.armor.shoulder.plate_right-0",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
), ),
//Steel0 Armor
Armor(Chest(Steel0)): VoxTrans(
"voxel.armor.chest.steel-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Pants(Steel0)): VoxTrans(
"voxel.armor.pants.steel-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Belt(Steel0)): VoxTrans(
"voxel.armor.belt.steel-0",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
),
Armor(Foot(Steel0)): VoxTrans(
"voxel.armor.foot.steel-0",
(0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
),
Armor(Hand(Steel0)): VoxTrans(
"voxel.armor.hand.steel_right-0",
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
),
Armor(Shoulder(Steel0)): VoxTrans(
"voxel.armor.shoulder.steel_right-0",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
//Leather0 Armor //Leather0 Armor
Armor(Chest(Leather0)): VoxTrans( Armor(Chest(Leather0)): VoxTrans(
"voxel.armor.chest.leather-0", "voxel.armor.chest.leather-0",
@ -284,12 +309,38 @@
"voxel.armor.hand.leather_right-0", "voxel.armor.hand.leather_right-0",
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0, (0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
), ),
Armor(Shoulder(Leather0)): VoxTrans(
"voxel.armor.shoulder.leather_right-0",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
//Leather1 Armor
Armor(Shoulder(Leather1)): VoxTrans( Armor(Shoulder(Leather1)): VoxTrans(
"voxel.armor.shoulder.leather_right-1", "voxel.armor.shoulder.leather_right-1",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
), ),
Armor(Shoulder(Leather0)): VoxTrans( //Leather2 Armor
"voxel.armor.shoulder.leather_right-0", Armor(Chest(Leather2)): VoxTrans(
"voxel.armor.chest.leather-2",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Pants(Leather2)): VoxTrans(
"voxel.armor.pants.leather-2",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2,
),
Armor(Belt(Leather2)): VoxTrans(
"voxel.armor.belt.leather-2",
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.8,
),
Armor(Foot(Leather2)): VoxTrans(
"voxel.armor.foot.leather-2",
(0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
),
Armor(Hand(Leather2)): VoxTrans(
"voxel.armor.hand.leather_right-2",
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
),
Armor(Shoulder(Leather2)): VoxTrans(
"voxel.armor.shoulder.leather_right-2",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2, (0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
), ),
//Linen Cloth //Linen Cloth

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

View File

@ -52,5 +52,13 @@
vox_spec: ("armor.belt.cultist", (-5.0, -3.5, 1.0)), vox_spec: ("armor.belt.cultist", (-5.0, -3.5, 1.0)),
color: None color: None
), ),
Leather2:(
vox_spec: ("armor.belt.leather-2", (-5.0, -3.5, 2.0)),
color: None
),
Steel0:(
vox_spec: ("armor.belt.steel-0", (-5.0, -4.5, 2.0)),
color: None
),
}, },
)) ))

View File

@ -110,5 +110,14 @@
vox_spec: ("armor.chest.cultist", (-7.0, -3.5, 2.0)), vox_spec: ("armor.chest.cultist", (-7.0, -3.5, 2.0)),
color: Some((57, 81, 132)) color: Some((57, 81, 132))
), ),
Steel0:(
vox_spec: ("armor.chest.steel-0", (-8.0, -4.5, 2.0)),
color: None
),
Leather2:(
vox_spec: ("armor.chest.leather-2", (-7.0, -3.5, 2.0)),
color: None
),
}, },
)) )
)

View File

@ -44,5 +44,13 @@
vox_spec: ("armor.foot.cultist", (-2.5, -3.5, -9.0)), vox_spec: ("armor.foot.cultist", (-2.5, -3.5, -9.0)),
color: None color: None
), ),
Steel0:(
vox_spec: ("armor.foot.steel-0", (-2.5, -3.5, -9.0)),
color: None
),
Leather2:(
vox_spec: ("armor.foot.leather-2", (-2.5, -3.5, -9.0)),
color: None
),
}, },
)) ))

View File

@ -100,6 +100,25 @@
color: Some((57, 81, 132)) color: Some((57, 81, 132))
) )
), ),
Steel0: (
left: (
vox_spec: ("armor.hand.steel_left-0", (-1.5, -1.5, -7.0)),
color: None
),
right: (
vox_spec: ("armor.hand.steel_right-0", (-1.5, -1.5, -7.0)),
color: None
)
),
Leather2: (
left: (
vox_spec: ("armor.hand.leather_left-2", (-1.5, -1.5, -7.0)),
color: None
),
right: (
vox_spec: ("armor.hand.leather_right-2", (-1.5, -1.5, -7.0)),
color: None
)
),
}, },
)) ))

View File

@ -68,5 +68,13 @@
vox_spec: ("armor.pants.cultist", (-5.0, -3.5, 1.0)), vox_spec: ("armor.pants.cultist", (-5.0, -3.5, 1.0)),
color: Some((57, 81, 132)) color: Some((57, 81, 132))
), ),
Steel0:(
vox_spec: ("armor.pants.steel-0", (-6.0, -4.5, 1.0)),
color: None
),
Leather2:(
vox_spec: ("armor.pants.leather-2", (-5.0, -3.5, 1.0)),
color: None
),
}, },
)) ))

View File

@ -131,5 +131,25 @@
color: Some((57, 81, 132)) color: Some((57, 81, 132))
) )
), ),
Steel0: (
left: (
vox_spec: ("armor.shoulder.steel_left-0", (-5.0, -4.5 , 0.0)),
color: None
),
right: (
vox_spec: ("armor.shoulder.steel_right-0", (-1.0, -4.5, 0.0)),
color: None
)
),
Leather2: (
left: (
vox_spec: ("armor.shoulder.leather_left-2", (-5.0, -3.8, -0.9)),
color: None
),
right: (
vox_spec: ("armor.shoulder.leather_right-2", (-1.0, -3.8, -0.9)),
color: None
)
),
}, },
)) ))

View File

@ -27,8 +27,10 @@ pub enum Chest {
WorkerOrange1 = 24, WorkerOrange1 = 24,
CultistPurple = 25, CultistPurple = 25,
CultistBlue = 26, CultistBlue = 26,
Steel0 = 27,
Leather2 = 28,
} }
pub const ALL_CHESTS: [Chest; 26] = [ pub const ALL_CHESTS: [Chest; 28] = [
Chest::Blue, Chest::Blue,
Chest::Brown, Chest::Brown,
Chest::Dark, Chest::Dark,
@ -55,6 +57,8 @@ pub const ALL_CHESTS: [Chest; 26] = [
Chest::WorkerOrange1, Chest::WorkerOrange1,
Chest::CultistPurple, Chest::CultistPurple,
Chest::CultistBlue, Chest::CultistBlue,
Chest::Steel0,
Chest::Leather2,
]; ];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@ -72,8 +76,11 @@ pub enum Belt {
ClothBlue0 = 9, ClothBlue0 = 9,
ClothGreen0 = 10, ClothGreen0 = 10,
Cultist = 11, Cultist = 11,
Leather2 = 12,
Steel0 = 13,
} }
pub const ALL_BELTS: [Belt; 12] = [
pub const ALL_BELTS: [Belt; 14] = [
Belt::None, Belt::None,
Belt::Dark, Belt::Dark,
Belt::TurqCloth, Belt::TurqCloth,
@ -86,6 +93,8 @@ pub const ALL_BELTS: [Belt; 12] = [
Belt::ClothBlue0, Belt::ClothBlue0,
Belt::ClothGreen0, Belt::ClothGreen0,
Belt::Cultist, Belt::Cultist,
Belt::Leather2,
Belt::Steel0,
]; ];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@ -108,8 +117,10 @@ pub enum Pants {
WorkerBlue0 = 14, WorkerBlue0 = 14,
CultistPurple = 15, CultistPurple = 15,
CultistBlue = 16, CultistBlue = 16,
Steel0 = 17,
Leather2 = 18,
} }
pub const ALL_PANTS: [Pants; 17] = [ pub const ALL_PANTS: [Pants; 19] = [
Pants::None, Pants::None,
Pants::Blue, Pants::Blue,
Pants::Brown, Pants::Brown,
@ -127,6 +138,8 @@ pub const ALL_PANTS: [Pants; 17] = [
Pants::WorkerBlue0, Pants::WorkerBlue0,
Pants::CultistPurple, Pants::CultistPurple,
Pants::CultistBlue, Pants::CultistBlue,
Pants::Steel0,
Pants::Leather2,
]; ];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@ -141,8 +154,10 @@ pub enum Hand {
ClothGreen0 = 7, ClothGreen0 = 7,
CultistPurple = 8, CultistPurple = 8,
CultistBlue = 9, CultistBlue = 9,
Steel0 = 10,
Leather2 = 11,
} }
pub const ALL_HANDS: [Hand; 9] = [ pub const ALL_HANDS: [Hand; 11] = [
Hand::Cloth, Hand::Cloth,
Hand::Assassin, Hand::Assassin,
Hand::Plate0, Hand::Plate0,
@ -152,6 +167,8 @@ pub const ALL_HANDS: [Hand; 9] = [
Hand::ClothGreen0, Hand::ClothGreen0,
Hand::CultistPurple, Hand::CultistPurple,
Hand::CultistBlue, Hand::CultistBlue,
Hand::Steel0,
Hand::Leather2,
]; ];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@ -167,8 +184,11 @@ pub enum Foot {
ClothBlue0 = 8, ClothBlue0 = 8,
ClothGreen0 = 9, ClothGreen0 = 9,
Cultist = 10, Cultist = 10,
Steel0 = 11,
Leather2 = 12,
} }
pub const ALL_FEET: [Foot; 10] = [
pub const ALL_FEET: [Foot; 12] = [
Foot::Dark, Foot::Dark,
Foot::Sandal0, Foot::Sandal0,
Foot::Jester, Foot::Jester,
@ -179,6 +199,8 @@ pub const ALL_FEET: [Foot; 10] = [
Foot::ClothBlue0, Foot::ClothBlue0,
Foot::ClothGreen0, Foot::ClothGreen0,
Foot::Cultist, Foot::Cultist,
Foot::Steel0,
Foot::Leather2,
]; ];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@ -195,8 +217,10 @@ pub enum Shoulder {
ClothGreen0 = 9, ClothGreen0 = 9,
CultistPurple = 10, CultistPurple = 10,
CultistBlue = 11, CultistBlue = 11,
Steel0 = 12,
Leather2 = 13,
} }
pub const ALL_SHOULDERS: [Shoulder; 11] = [ pub const ALL_SHOULDERS: [Shoulder; 13] = [
Shoulder::Brown1, Shoulder::Brown1,
Shoulder::Chain, Shoulder::Chain,
Shoulder::Assassin, Shoulder::Assassin,
@ -208,6 +232,8 @@ pub const ALL_SHOULDERS: [Shoulder; 11] = [
Shoulder::ClothGreen0, Shoulder::ClothGreen0,
Shoulder::CultistPurple, Shoulder::CultistPurple,
Shoulder::CultistBlue, Shoulder::CultistBlue,
Shoulder::Steel0,
Shoulder::Leather2,
]; ];
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)] #[repr(u32)]