mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
added seven new shoulder armour types
This commit is contained in:
parent
2ca30653f6
commit
9887e5d45d
8
assets/common/items/armor/shoulder/cloth_blue_1.ron
Normal file
8
assets/common/items/armor/shoulder/cloth_blue_1.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Blue Cloth Pads",
|
||||
description: "Simple shoulderpads made from blue cloth.\n\n<Right-click to use>",
|
||||
kind: Armor(
|
||||
kind: Shoulder(ClothBlue1),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/shoulder/iron_spikes.ron
Normal file
8
assets/common/items/armor/shoulder/iron_spikes.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Iron Spiked Pauldrons",
|
||||
description: "Iron shoulder pads with spikes attached.\n\n<Right-click to use>",
|
||||
kind: Armor(
|
||||
kind: Shoulder(IronSpikes),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/shoulder/leather_iron_0.ron
Normal file
8
assets/common/items/armor/shoulder/leather_iron_0.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Iron and Leather Spaulders",
|
||||
description: "Robust spaulders made from iron and leather.\n\n<Right-click to use>",
|
||||
kind: Armor(
|
||||
kind: Shoulder(IronLeather0),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/shoulder/leather_iron_1.ron
Normal file
8
assets/common/items/armor/shoulder/leather_iron_1.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Iron and Leather Spaulders",
|
||||
description: "Robust spaulders made from iron and leather.\n\n<Right-click to use>",
|
||||
kind: Armor(
|
||||
kind: Shoulder(IronLeather1),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/shoulder/leather_iron_2.ron
Normal file
8
assets/common/items/armor/shoulder/leather_iron_2.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Iron and Leather Spaulders",
|
||||
description: "Robust spaulders made from iron and leather.\n\n<Right-click to use>",
|
||||
kind: Armor(
|
||||
kind: Shoulder(IronLeather2),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/shoulder/leather_iron_3.ron
Normal file
8
assets/common/items/armor/shoulder/leather_iron_3.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Iron and Leather Spaulders",
|
||||
description: "Robust spaulders made from iron and leather.\n\n<Right-click to use>",
|
||||
kind: Armor(
|
||||
kind: Shoulder(IronLeather3),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
8
assets/common/items/armor/shoulder/leather_strips.ron
Normal file
8
assets/common/items/armor/shoulder/leather_strips.ron
Normal file
@ -0,0 +1,8 @@
|
||||
Item(
|
||||
name: "Leather Strips",
|
||||
description: "Shoulder wraps made from leather strips.\n\n<Right-click to use.>",
|
||||
kind: Armor(
|
||||
kind: Shoulder(LeatherStrips),
|
||||
stats: (20),
|
||||
),
|
||||
)
|
@ -571,11 +571,35 @@
|
||||
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
|
||||
),
|
||||
Armor(Shoulder(ClothPurple0)): VoxTrans(
|
||||
"voxel.armor.shoulder.cloth_purple_right-1",
|
||||
"voxel.armor.shoulder.cloth_purple_right-0",
|
||||
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Shoulder(ClothPurple0)): VoxTrans(
|
||||
"voxel.armor.shoulder.cloth_purple_right-0",
|
||||
Armor(Shoulder(ClothBlue1)): VoxTrans(
|
||||
"voxel.armor.shoulder.cloth_blue_right-1",
|
||||
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Shoulder(IronSpikes)): VoxTrans(
|
||||
"voxel.armor.shoulder.iron_spikes_right",
|
||||
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Shoulder(IronLeather3)): VoxTrans(
|
||||
"voxel.armor.shoulder.leather_iron_right-3",
|
||||
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Shoulder(IronLeather2)): VoxTrans(
|
||||
"voxel.armor.shoulder.leather_iron_right-2",
|
||||
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Shoulder(IronLeather1)): VoxTrans(
|
||||
"voxel.armor.shoulder.leather_iron_right-1",
|
||||
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Shoulder(IronLeather0)): VoxTrans(
|
||||
"voxel.armor.shoulder.leather_iron_right-0",
|
||||
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
|
||||
),
|
||||
Armor(Shoulder(LeatherStrips)): VoxTrans(
|
||||
"voxel.armor.shoulder.leather_strips_right",
|
||||
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
|
||||
),
|
||||
// Backs
|
||||
|
BIN
assets/voxygen/voxel/armor/shoulder/cloth_blue_left-1.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/shoulder/cloth_blue_left-1.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/shoulder/cloth_blue_right-1.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/shoulder/cloth_blue_right-1.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/shoulder/iron_spikes_left.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/shoulder/iron_spikes_left.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/shoulder/iron_spikes_right.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/shoulder/iron_spikes_right.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/shoulder/leather_iron_left-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/shoulder/leather_iron_left-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/shoulder/leather_iron_left-1.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/shoulder/leather_iron_left-1.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/shoulder/leather_iron_left-2.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/shoulder/leather_iron_left-2.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/shoulder/leather_iron_left-3.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/shoulder/leather_iron_left-3.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/shoulder/leather_iron_right-0.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/shoulder/leather_iron_right-0.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/shoulder/leather_iron_right-1.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/shoulder/leather_iron_right-1.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/shoulder/leather_iron_right-2.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/shoulder/leather_iron_right-2.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/shoulder/leather_iron_right-3.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/shoulder/leather_iron_right-3.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/shoulder/leather_strips_left.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/shoulder/leather_strips_left.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/voxel/armor/shoulder/leather_strips_right.vox
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/voxel/armor/shoulder/leather_strips_right.vox
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -151,5 +151,75 @@
|
||||
color: None
|
||||
)
|
||||
),
|
||||
ClothBlue1: (
|
||||
left: (
|
||||
vox_spec: ("armor.shoulder.cloth_blue_left-1", (-4.0, -2.5, -0.5)),
|
||||
color: None
|
||||
),
|
||||
right: (
|
||||
vox_spec: ("armor.shoulder.cloth_blue_right-1", (-1.0, -2.5, -0.5)),
|
||||
color: None
|
||||
)
|
||||
),
|
||||
IronSpikes: (
|
||||
left: (
|
||||
vox_spec: ("armor.shoulder.iron_spikes_left", (-5.5, -3.8, -2.0)),
|
||||
color: None
|
||||
),
|
||||
right: (
|
||||
vox_spec: ("armor.shoulder.iron_spikes_right", (-1.5, -3.8, -2.0)),
|
||||
color: None
|
||||
)
|
||||
),
|
||||
IronLeather3: (
|
||||
left: (
|
||||
vox_spec: ("armor.shoulder.leather_iron_left-3", (-4.0, -2.5, -1.0)),
|
||||
color: None
|
||||
),
|
||||
right: (
|
||||
vox_spec: ("armor.shoulder.leather_iron_right-3", (-2.0, -2.5, -1.0)),
|
||||
color: None
|
||||
)
|
||||
),
|
||||
IronLeather2: (
|
||||
left: (
|
||||
vox_spec: ("armor.shoulder.leather_iron_left-2", (-5.0, -2.5, -0.5)),
|
||||
color: None
|
||||
),
|
||||
right: (
|
||||
vox_spec: ("armor.shoulder.leather_iron_right-2", (-2.0, -2.5, -0.5)),
|
||||
color: None
|
||||
)
|
||||
),
|
||||
IronLeather1: (
|
||||
left: (
|
||||
vox_spec: ("armor.shoulder.leather_iron_left-1", (-5.0, -2.5, -0.5)),
|
||||
color: None
|
||||
),
|
||||
right: (
|
||||
vox_spec: ("armor.shoulder.leather_iron_right-1", (-2.0, -2.5, -0.5)),
|
||||
color: None
|
||||
)
|
||||
),
|
||||
IronLeather0: (
|
||||
left: (
|
||||
vox_spec: ("armor.shoulder.leather_iron_left-0", (-6.0, -2.5, -0.5)),
|
||||
color: None
|
||||
),
|
||||
right: (
|
||||
vox_spec: ("armor.shoulder.leather_iron_right-0", (-2.0, -2.5, -0.5)),
|
||||
color: None
|
||||
)
|
||||
),
|
||||
LeatherStrips: (
|
||||
left: (
|
||||
vox_spec: ("armor.shoulder.leather_strips_left", (-3.0, -2.5, -2.0)),
|
||||
color: None
|
||||
),
|
||||
right: (
|
||||
vox_spec: ("armor.shoulder.leather_strips_right", (-2.0, -2.5, -2.0)),
|
||||
color: None
|
||||
)
|
||||
),
|
||||
},
|
||||
))
|
||||
|
@ -219,8 +219,15 @@ pub enum Shoulder {
|
||||
CultistBlue = 11,
|
||||
Steel0 = 12,
|
||||
Leather2 = 13,
|
||||
ClothBlue1 = 14,
|
||||
IronSpikes = 15,
|
||||
IronLeather0 = 16,
|
||||
IronLeather1 = 17,
|
||||
IronLeather2 = 18,
|
||||
IronLeather3 = 19,
|
||||
LeatherStrips = 20,
|
||||
}
|
||||
pub const ALL_SHOULDERS: [Shoulder; 13] = [
|
||||
pub const ALL_SHOULDERS: [Shoulder; 20] = [
|
||||
Shoulder::Brown1,
|
||||
Shoulder::Chain,
|
||||
Shoulder::Assassin,
|
||||
@ -234,6 +241,13 @@ pub const ALL_SHOULDERS: [Shoulder; 13] = [
|
||||
Shoulder::CultistBlue,
|
||||
Shoulder::Steel0,
|
||||
Shoulder::Leather2,
|
||||
Shoulder::ClothBlue1,
|
||||
Shoulder::IronSpikes,
|
||||
Shoulder::IronLeather0,
|
||||
Shoulder::IronLeather1,
|
||||
Shoulder::IronLeather2,
|
||||
Shoulder::IronLeather3,
|
||||
Shoulder::LeatherStrips,
|
||||
];
|
||||
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
||||
#[repr(u32)]
|
||||
|
Loading…
Reference in New Issue
Block a user