Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Armor names now end with left/right.

Browse Source 
Armor names no longer include their armor part.
This should be inferred from their folder.
This commit is contained in:
Adam Fogle 2019-10-04 18:57:55 -04:00
parent be53492e69
commit da54cf76bc
11 changed files with 96 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
assets/voxygen/voxel/armor/belt/belt_dark.vox → assets/voxygen/voxel/armor/belt/dark.vox
View File

0
assets/voxygen/voxel/armor/hand/hand_left.vox → assets/voxygen/voxel/armor/hand/default_left.vox
View File

0
assets/voxygen/voxel/armor/hand/hand_right.vox → assets/voxygen/voxel/armor/hand/default_right.vox
View File

0
assets/voxygen/voxel/armor/shoulder/shoulder_l_brown.vox → assets/voxygen/voxel/armor/shoulder/brown_left.vox
View File

0
assets/voxygen/voxel/armor/shoulder/shoulder_r_brown.vox → assets/voxygen/voxel/armor/shoulder/brown_right.vox
View File

0
assets/voxygen/voxel/armor/shoulder/shoulder_l_chain.vox → assets/voxygen/voxel/armor/shoulder/chain_left.vox
View File

0
assets/voxygen/voxel/armor/shoulder/shoulder_r_chain.vox → assets/voxygen/voxel/armor/shoulder/chain_right.vox
View File

24
assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
View File

@ -2,84 +2,84 @@
(Human, Male): (
offset: (-7.0, -4.0, -6.0),
belt: [
Some(("armor.belt.belt_dark", (0, 0, 0))),
Some(("armor.belt.dark", (0, 0, 0))),
Some(("armor.belt.cloth_turq", (0, 0, 0))),
]
),
(Human, Female): (
offset: (-7.0, -4.0, -6.0),
belt: [
Some(("armor.belt.belt_dark", (0, 0, 0))),
Some(("armor.belt.dark", (0, 0, 0))),
Some(("armor.belt.cloth_turq", (0, 0, 0))),
]
),
(Orc, Male): (
offset: (-8.0, -5.0, -6.75),
belt: [
Some(("armor.belt.belt_dark", (0, 0, 0))),
Some(("armor.belt.dark", (0, 0, 0))),
Some(("armor.belt.cloth_turq", (0, 0, 0))),
]
),
(Orc, Female): (
offset: (-8.0, -4.0, -6.0),
belt: [
Some(("armor.belt.belt_dark", (0, 0, 0))),
Some(("armor.belt.dark", (0, 0, 0))),
Some(("armor.belt.cloth_turq", (0, 0, 0))),
]
),
(Elf, Male): (
offset: (-8.0, -4.0, -6.0),
belt: [
Some(("armor.belt.belt_dark", (0, 0, 0))),
Some(("armor.belt.dark", (0, 0, 0))),
Some(("armor.belt.cloth_turq", (0, 0, 0))),
]
),
(Elf, Female): (
offset: (-8.0, -4.0, -6.0),
belt: [
Some(("armor.belt.belt_dark", (0, 0, 0))),
Some(("armor.belt.dark", (0, 0, 0))),
Some(("armor.belt.cloth_turq", (0, 0, 0))),
]
),
(Dwarf, Male): (
offset: (-6.0, -4.5, -6.0),
belt: [
Some(("armor.belt.belt_dark", (0, 0, 0))),
Some(("armor.belt.dark", (0, 0, 0))),
Some(("armor.belt.cloth_turq", (0, 0, 0))),
]
),
(Dwarf, Female): (
offset: (-6.0, -4.5, -6.0),
belt: [
Some(("armor.belt.belt_dark", (0, 0, 0))),
Some(("armor.belt.dark", (0, 0, 0))),
Some(("armor.belt.cloth_turq", (0, 0, 0))),
]
),
(Undead, Male): (
offset: (-5.0, -4.0, -6.75),
belt: [
Some(("armor.belt.belt_dark", (0, 0, 0))),
Some(("armor.belt.dark", (0, 0, 0))),
Some(("armor.belt.cloth_turq", (0, 0, 0))),
]
),
(Undead, Female): (
offset: (-5.0, -4.0, -6.75),
belt: [
Some(("armor.belt.belt_dark", (0, 0, 0))),
Some(("armor.belt.dark", (0, 0, 0))),
Some(("armor.belt.cloth_turq", (0, 0, 0))),
]
),
(Danari, Male): (
offset: (-9.0, -4.0, -7.5),
belt: [
Some(("armor.belt.belt_dark", (0, 0, 0))),
Some(("armor.belt.dark", (0, 0, 0))),
Some(("armor.belt.cloth_turq", (0, 0, 0))),
]
),
(Danari, Female): (
offset: (-9.0, -4.0, -7.5),
belt: [
Some(("armor.belt.belt_dark", (0, 0, 0))),
Some(("armor.belt.dark", (0, 0, 0))),
Some(("armor.belt.cloth_turq", (0, 0, 0))),
]
),

48
assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
View File

@ -6,8 +6,8 @@
Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
Some(("armor.hand.dark-0", (0, 0, 0))),
Some(("armor.hand.hand_left", (0, 0, 0))),
Some(("armor.hand.hand_right", (0, 0, 0))),
Some(("armor.hand.default_left", (0, 0, 0))),
Some(("armor.hand.default_right", (0, 0, 0))),
]
),
(Human, Female): (
@ -16,8 +16,8 @@
Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
Some(("armor.hand.dark-0", (0, 0, 0))),
Some(("armor.hand.hand_left", (0, 0, 0))),
Some(("armor.hand.hand_right", (0, 0, 0))),
Some(("armor.hand.default_left", (0, 0, 0))),
Some(("armor.hand.default_right", (0, 0, 0))),
]
),
(Orc, Male): (
@ -26,8 +26,8 @@
Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
Some(("armor.hand.dark-0", (0, 0, 0))),
Some(("armor.hand.hand_left", (0, 0, 0))),
Some(("armor.hand.hand_right", (0, 0, 0))),
Some(("armor.hand.default_left", (0, 0, 0))),
Some(("armor.hand.default_right", (0, 0, 0))),
]
),
(Orc, Female): (
@ -36,8 +36,8 @@
Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
Some(("armor.hand.dark-0", (0, 0, 0))),
Some(("armor.hand.hand_left", (0, 0, 0))),
Some(("armor.hand.hand_right", (0, 0, 0))),
Some(("armor.hand.default_left", (0, 0, 0))),
Some(("armor.hand.default_right", (0, 0, 0))),
]
),
(Elf, Male): (
@ -46,8 +46,8 @@
Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
Some(("armor.hand.dark-0", (0, 0, 0))),
Some(("armor.hand.hand_left", (0, 0, 0))),
Some(("armor.hand.hand_right", (0, 0, 0))),
Some(("armor.hand.default_left", (0, 0, 0))),
Some(("armor.hand.default_right", (0, 0, 0))),
]
),
(Elf, Female): (
@ -56,8 +56,8 @@
Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
Some(("armor.hand.dark-0", (0, 0, 0))),
Some(("armor.hand.hand_left", (0, 0, 0))),
Some(("armor.hand.hand_right", (0, 0, 0))),
Some(("armor.hand.default_left", (0, 0, 0))),
Some(("armor.hand.default_right", (0, 0, 0))),
]
),
(Dwarf, Male): (
@ -66,8 +66,8 @@
Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
Some(("armor.hand.dark-0", (0, 0, 0))),
Some(("armor.hand.hand_left", (0, 0, 0))),
Some(("armor.hand.hand_right", (0, 0, 0))),
Some(("armor.hand.default_left", (0, 0, 0))),
Some(("armor.hand.default_right", (0, 0, 0))),
]
),
(Dwarf, Female): (
@ -76,8 +76,8 @@
Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
Some(("armor.hand.dark-0", (0, 0, 0))),
Some(("armor.hand.hand_left", (0, 0, 0))),
Some(("armor.hand.hand_right", (0, 0, 0))),
Some(("armor.hand.default_left", (0, 0, 0))),
Some(("armor.hand.default_right", (0, 0, 0))),
]
),
(Undead, Male): (
@ -86,8 +86,8 @@
Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
Some(("armor.hand.dark-0", (0, 0, 0))),
Some(("armor.hand.hand_left", (0, 0, 0))),
Some(("armor.hand.hand_right", (0, 0, 0))),
Some(("armor.hand.default_left", (0, 0, 0))),
Some(("armor.hand.default_right", (0, 0, 0))),
]
),
(Undead, Female): (
@ -96,8 +96,8 @@
Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
Some(("armor.hand.dark-0", (0, 0, 0))),
Some(("armor.hand.hand_left", (0, 0, 0))),
Some(("armor.hand.hand_right", (0, 0, 0))),
Some(("armor.hand.default_left", (0, 0, 0))),
Some(("armor.hand.default_right", (0, 0, 0))),
]
),
(Danari, Male): (
@ -106,8 +106,8 @@
Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
Some(("armor.hand.dark-0", (0, 0, 0))),
Some(("armor.hand.hand_left", (0, 0, 0))),
Some(("armor.hand.hand_right", (0, 0, 0))),
Some(("armor.hand.default_left", (0, 0, 0))),
Some(("armor.hand.default_right", (0, 0, 0))),
]
),
(Danari, Female): (
@ -116,8 +116,8 @@
Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
Some(("armor.hand.dark-0", (0, 0, 0))),
Some(("armor.hand.hand_left", (0, 0, 0))),
Some(("armor.hand.hand_right", (0, 0, 0))),
Some(("armor.hand.default_left", (0, 0, 0))),
Some(("armor.hand.default_right", (0, 0, 0))),
]
),
// More here

97
assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
View File

@ -3,100 +3,109 @@
(Human, Male): (
offset: (-7.0, -4.0, -6.0),
shoulder: [
Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
Some(("armor.shoulder.brown_left", (0, 0, 0))),
Some(("armor.shoulder.chain_left", (0, 0, 0))),
Some(("armor.shoulder.brown_right", (0, 0, 0))),
Some(("armor.shoulder.chain_right", (0, 0, 0))),
]
),
(Human, Female): (
offset: (-7.0, -4.0, -6.0),
shoulder: [
Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
Some(("armor.shoulder.brown_left", (0, 0, 0))),
Some(("armor.shoulder.chain_left", (0, 0, 0))),
Some(("armor.shoulder.brown_right", (0, 0, 0))),
Some(("armor.shoulder.chain_right", (0, 0, 0))),
]
),
(Orc, Male): (
offset: (-8.0, -5.0, -6.75),
shoulder: [
Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
Some(("armor.shoulder.brown_left", (0, 0, 0))),
Some(("armor.shoulder.chain_left", (0, 0, 0))),
Some(("armor.shoulder.brown_right", (0, 0, 0))),
Some(("armor.shoulder.chain_right", (0, 0, 0))),
]
),
(Orc, Female): (
offset: (-8.0, -4.0, -6.0),
shoulder: [
Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
Some(("armor.shoulder.brown_left", (0, 0, 0))),
Some(("armor.shoulder.chain_left", (0, 0, 0))),
Some(("armor.shoulder.brown_right", (0, 0, 0))),
Some(("armor.shoulder.chain_right", (0, 0, 0))),
]
),
(Elf, Male): (
offset: (-8.0, -4.0, -6.0),
shoulder: [
Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
Some(("armor.shoulder.brown_left", (0, 0, 0))),
Some(("armor.shoulder.chain_left", (0, 0, 0))),
Some(("armor.shoulder.brown_right", (0, 0, 0))),
Some(("armor.shoulder.chain_right", (0, 0, 0))),
]
),
(Elf, Female): (
offset: (-8.0, -4.0, -6.0),
shoulder: [
Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
Some(("armor.shoulder.brown_left", (0, 0, 0))),
Some(("armor.shoulder.chain_left", (0, 0, 0))),
Some(("armor.shoulder.brown_right", (0, 0, 0))),
Some(("armor.shoulder.chain_right", (0, 0, 0))),
]
),
(Dwarf, Male): (
offset: (-6.0, -4.5, -6.0),
shoulder: [
Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
Some(("armor.shoulder.brown_left", (0, 0, 0))),
Some(("armor.shoulder.chain_left", (0, 0, 0))),
Some(("armor.shoulder.brown_right", (0, 0, 0))),
Some(("armor.shoulder.chain_right", (0, 0, 0))),
]
),
(Dwarf, Female): (
offset: (-6.0, -4.5, -6.0),
shoulder: [
Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
Some(("armor.shoulder.brown_left", (0, 0, 0))),
Some(("armor.shoulder.chain_left", (0, 0, 0))),
Some(("armor.shoulder.brown_right", (0, 0, 0))),
Some(("armor.shoulder.chain_right", (0, 0, 0))),
]
),
(Undead, Male): (
offset: (-5.0, -4.0, -6.75),
shoulder: [
Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
Some(("armor.shoulder.brown_left", (0, 0, 0))),
Some(("armor.shoulder.chain_left", (0, 0, 0))),
Some(("armor.shoulder.brown_right", (0, 0, 0))),
Some(("armor.shoulder.chain_right", (0, 0, 0))),
]
),
(Undead, Female): (
offset: (-5.0, -4.0, -6.75),
shoulder: [
Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
Some(("armor.shoulder.brown_left", (0, 0, 0))),
Some(("armor.shoulder.chain_left", (0, 0, 0))),
Some(("armor.shoulder.brown_right", (0, 0, 0))),
Some(("armor.shoulder.chain_right", (0, 0, 0))),
]
),
(Danari, Male): (
offset: (-9.0, -4.0, -7.5),
shoulder: [
Some(("armor.shoulder.brown_left", (0, 0, 0))),
Some(("armor.shoulder.chain_left", (0, 0, 0))),
Some(("armor.shoulder.brown_right", (0, 0, 0))),
Some(("armor.shoulder.chain_right", (0, 0, 0))),
]
),
(Danari, Female): (
offset: (-9.0, -4.0, -7.5),
shoulder: [
Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
Some(("armor.shoulder.brown_left", (0, 0, 0))),
Some(("armor.shoulder.chain_left", (0, 0, 0))),
Some(("armor.shoulder.brown_right", (0, 0, 0))),
Some(("armor.shoulder.chain_right", (0, 0, 0))),
]
),
// More here

14
voxygen/src/scene/figure/load.rs
View File

@ -236,7 +236,7 @@ pub fn mesh_belt(belt: Belt) -> Mesh<FigurePipeline> {
load_mesh(
match belt {
//Belt::Default => "figure/body/belt_male",
Belt::Dark => "armor.belt.belt_dark",
Belt::Dark => "armor.belt.dark",
},
Vec3::new(-4.0, -3.5, 2.0),
)
@ -277,8 +277,8 @@ pub fn mesh_left_hand(
) -> Mesh<FigurePipeline> {
let hand_segment = color_segment(
graceful_load_mat_segment(match hand {
Hand::Bare => "armor.hand.hand_left",
Hand::Dark => "armor.hand.hand_left",
Hand::Bare => "armor.hand.default_left",
Hand::Dark => "armor.hand.default_left",
}),
race.skin_color(skin),
race.hair_color(hair_color),
@ -297,8 +297,8 @@ pub fn mesh_right_hand(
) -> Mesh<FigurePipeline> {
let hand_segment = color_segment(
graceful_load_mat_segment(match hand {
Hand::Bare => "armor.hand.hand_right",
Hand::Dark => "armor.hand.hand_right",
Hand::Bare => "armor.hand.default_right",
Hand::Dark => "armor.hand.default_right",
}),
race.skin_color(skin),
race.hair_color(hair_color),
@ -379,7 +379,7 @@ pub fn mesh_left_shoulder(
let shoulder_segment = color_segment(
graceful_load_mat_segment(match shoulder {
Shoulder::None => return Mesh::new(),
Shoulder::Brown1 => "armor.shoulder.shoulder_l_brown",
Shoulder::Brown1 => "armor.shoulder.brown_left",
}),
race.skin_color(skin),
race.hair_color(hair_color),
@ -399,7 +399,7 @@ pub fn mesh_right_shoulder(
let shoulder_segment = color_segment(
graceful_load_mat_segment(match shoulder {
Shoulder::None => return Mesh::new(),
Shoulder::Brown1 => "armor.shoulder.shoulder_r_brown",
Shoulder::Brown1 => "armor.shoulder.brown_right",
}),
race.skin_color(skin),
race.hair_color(hair_color),