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

Remove None variant fromm armor types

Browse Source
This commit is contained in:
Imbris 2020-03-28 03:51:24 -04:00
parent f551c4a2c5
commit d3b5b1e637
59 changed files with 488 additions and 491 deletions

2
assets/common/items/armor/belt/assassin.ron
View File

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

2
assets/common/items/armor/belt/cloth_blue_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Soft and warm", description: "Soft and warm",
kind: Armor( kind: Armor(
kind: Belt(ClothBlue0), kind: Belt(ClothBlue0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/belt/cloth_green_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Soft and warm", description: "Soft and warm",
kind: Armor( kind: Armor(
kind: Belt(ClothGreen0), kind: Belt(ClothGreen0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/belt/cloth_purple_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Soft and warm", description: "Soft and warm",
kind: Armor( kind: Armor(
kind: Belt(ClothPurple0), kind: Belt(ClothPurple0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/belt/leather_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Swift like the wind.", description: "Swift like the wind.",
kind: Armor( kind: Armor(
kind: Belt(Leather0), kind: Belt(Leather0),
stats: 20, stats: (20),
), ),
) )

4
assets/common/items/armor/belt/plate_0.ron
View File

@ -1,8 +1,8 @@
Item( Item(
name: "Iron Belt", name: "Iron Belt",
description: "WIP", description: "WIP",
kind: Armor( kind: Armor(
kind: Belt(Plate0), kind: Belt(Plate0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/chest/assassin.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Only the best for a member of the creed.", description: "Only the best for a member of the creed.",
kind: Armor( kind: Armor(
kind: Chest(Assassin), kind: Chest(Assassin),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/chest/cloth_blue_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Soft and warm", description: "Soft and warm",
kind: Armor( kind: Armor(
kind: Chest(ClothBlue0), kind: Chest(ClothBlue0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/chest/cloth_green_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Soft and warm", description: "Soft and warm",
kind: Armor( kind: Armor(
kind: Chest(ClothGreen0), kind: Chest(ClothGreen0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/chest/cloth_purple_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Soft and warm", description: "Soft and warm",
kind: Armor( kind: Armor(
kind: Chest(ClothPurple0), kind: Chest(ClothPurple0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/chest/leather_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Swift like the wind.", description: "Swift like the wind.",
kind: Armor( kind: Armor(
kind: Chest(Leather0), kind: Chest(Leather0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/chest/plate_green_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Arrows to the stomach are soooo last update.", description: "Arrows to the stomach are soooo last update.",
kind: Armor( kind: Armor(
kind: Chest(PlateGreen0), kind: Chest(PlateGreen0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/foot/assassin.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Only the best for a member of the creed.", description: "Only the best for a member of the creed.",
kind: Armor( kind: Armor(
kind: Foot(Assassin), kind: Foot(Assassin),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/foot/cloth_blue_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Soft and warm", description: "Soft and warm",
kind: Armor( kind: Armor(
kind: Foot(ClothBlue0), kind: Foot(ClothBlue0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/foot/cloth_green_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Soft and warm", description: "Soft and warm",
kind: Armor( kind: Armor(
kind: Foot(ClothGreen0), kind: Foot(ClothGreen0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/foot/cloth_purple_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Soft and warm", description: "Soft and warm",
kind: Armor( kind: Armor(
kind: Foot(ClothPurple0), kind: Foot(ClothPurple0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/foot/leather_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Swift like the wind.", description: "Swift like the wind.",
kind: Armor( kind: Armor(
kind: Foot(Leather0), kind: Foot(Leather0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/foot/plate_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "WIP", description: "WIP",
kind: Armor( kind: Armor(
kind: Foot(Plate0), kind: Foot(Plate0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/hand/assassin.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Only the best for a member of the creed.", description: "Only the best for a member of the creed.",
kind: Armor( kind: Armor(
kind: Hand(Assassin), kind: Hand(Assassin),
stats: 20, stats: (20),
), ),
) )

4
assets/common/items/armor/hand/cloth_blue_0.ron
View File

@ -1,8 +1,8 @@
Item( Item(
name: "Blue Linen Wrists", name: "Blue Linen Wrists",
description: "WIP", description: "WIP",
kind: Armor( kind: Armor(
kind: Hand(ClothBlue0), kind: Hand(ClothBlue0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/hand/cloth_green_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "WIP", description: "WIP",
kind: Armor( kind: Armor(
kind: Hand(ClothGreen0), kind: Hand(ClothGreen0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/hand/cloth_purple_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "WIP", description: "WIP",
kind: Armor( kind: Armor(
kind: Hand(ClothPurple0), kind: Hand(ClothPurple0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/hand/leather_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Swift like the wind.", description: "Swift like the wind.",
kind: Armor( kind: Armor(
kind: Hand(Leather0), kind: Hand(Leather0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/hand/plate_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "WIP", description: "WIP",
kind: Armor( kind: Armor(
kind: Hand(Plate0), kind: Hand(Plate0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/pants/assassin.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Only the best for a member of the creed.", description: "Only the best for a member of the creed.",
kind: Armor( kind: Armor(
kind: Pants(Assassin), kind: Pants(Assassin),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/pants/cloth_blue_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "WIP", description: "WIP",
kind: Armor( kind: Armor(
kind: Pants(ClothBlue0), kind: Pants(ClothBlue0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/pants/cloth_green_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "WIP", description: "WIP",
kind: Armor( kind: Armor(
kind: Pants(ClothGreen0), kind: Pants(ClothGreen0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/pants/cloth_purple_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "WIP", description: "WIP",
kind: Armor( kind: Armor(
kind: Pants(ClothPurple0), kind: Pants(ClothPurple0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/pants/green_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "", description: "",
kind: Armor( kind: Armor(
kind: Pants(Green), kind: Pants(Green),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/pants/leather_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "", description: "",
kind: Armor( kind: Armor(
kind: Pants(Leather0), kind: Pants(Leather0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/pants/plate_green_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "WIP", description: "WIP",
kind: Armor( kind: Armor(
kind: Pants(PlateGreen0), kind: Pants(PlateGreen0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/shoulder/assassin.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Only the best for a member of the creed.", description: "Only the best for a member of the creed.",
kind: Armor( kind: Armor(
kind: Shoulder(Assassin), kind: Shoulder(Assassin),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/shoulder/cloth_blue_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "WIP", description: "WIP",
kind: Armor( kind: Armor(
kind: Shoulder(ClothBlue0), kind: Shoulder(ClothBlue0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/shoulder/cloth_green_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "WIP", description: "WIP",
kind: Armor( kind: Armor(
kind: Shoulder(ClothGreen0), kind: Shoulder(ClothGreen0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/shoulder/cloth_purple_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "WIP", description: "WIP",
kind: Armor( kind: Armor(
kind: Shoulder(ClothPurple0), kind: Shoulder(ClothPurple0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/shoulder/leather_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "", description: "",
kind: Armor( kind: Armor(
kind: Shoulder(Leather0), kind: Shoulder(Leather0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/shoulder/leather_1.ron
View File

@ -3,6 +3,6 @@ Item(
description: "Swift like the wind.", description: "Swift like the wind.",
kind: Armor( kind: Armor(
kind: Shoulder(Leather1), kind: Shoulder(Leather1),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/armor/shoulder/plate_0.ron
View File

@ -3,6 +3,6 @@ Item(
description: "A strong shoulder to lean on.", description: "A strong shoulder to lean on.",
kind: Armor( kind: Armor(
kind: Shoulder(Plate0), kind: Shoulder(Plate0),
stats: 20, stats: (20),
), ),
) )

2
assets/common/items/weapons/hammer_1.ron
View File

@ -4,7 +4,7 @@ Item(
\n \n
Power: 20", Power: 20",
kind: Tool( kind: Tool(
ToolData ( (
kind: Hammer(BasicHammer), kind: Hammer(BasicHammer),
equip_time_millis: 500, equip_time_millis: 500,
) )

2
assets/common/items/weapons/shield_1.ron
View File

@ -2,7 +2,7 @@ Item(
name: "A Shield", name: "A Shield",
description: "Legends tell this item is useless.", description: "Legends tell this item is useless.",
kind: Tool ( kind: Tool (
ToolData ( (
kind: Shield(BasicShield), kind: Shield(BasicShield),
equip_time_millis: 400, equip_time_millis: 400,
) )

2
assets/common/items/weapons/short_sword_0.ron
View File

@ -3,7 +3,7 @@ Item(
description: " description: "
Power: 15", Power: 15",
kind: Tool( kind: Tool(
ToolData ( (
kind: Sword(Short0), kind: Sword(Short0),
equip_time_millis: 400, equip_time_millis: 400,
) )

2
assets/common/items/weapons/staff_1.ron
View File

@ -4,7 +4,7 @@ Item(
Power: 6", Power: 6",
kind: Tool( kind: Tool(
ToolData ( (
kind: Staff(BasicStaff), kind: Staff(BasicStaff),
equip_time_millis: 200, equip_time_millis: 200,
) )

2
assets/common/items/weapons/staff_nature.ron
View File

@ -3,7 +3,7 @@ Item(
description: " Infused by the power of Nature. description: " Infused by the power of Nature.
Power: 25", Power: 25",
kind: Tool( kind: Tool(
ToolData ( (
kind: Staff(Sceptre), kind: Staff(Sceptre),
equip_time_millis: 400, equip_time_millis: 400,
) )

2
assets/common/items/weapons/starter_axe.ron
View File

@ -4,7 +4,7 @@ Item(
Power: 15", Power: 15",
kind: Tool( kind: Tool(
ToolData ( (
kind: Axe(BasicAxe), kind: Axe(BasicAxe),
equip_time_millis: 400, equip_time_millis: 400,
) )

2
assets/common/items/weapons/starter_bow.ron
View File

@ -4,7 +4,7 @@ Item(
Power: 15", Power: 15",
kind: Tool( kind: Tool(
ToolData ( (
kind: Bow(BasicBow), kind: Bow(BasicBow),
equip_time_millis: 400, equip_time_millis: 400,
) )

2
assets/common/items/weapons/starter_dagger.ron
View File

@ -4,7 +4,7 @@ Item(
Power: 15", Power: 15",
kind: Tool( kind: Tool(
ToolData ( (
kind: Dagger(BasicDagger), kind: Dagger(BasicDagger),
equip_time_millis: 300, equip_time_millis: 300,
) )

2
assets/common/items/weapons/starter_hammer.ron
View File

@ -4,7 +4,7 @@ Item(
Power: 15", Power: 15",
kind: Tool( kind: Tool(
ToolData ( (
kind: Hammer(BasicHammer), kind: Hammer(BasicHammer),
equip_time_millis: 500, equip_time_millis: 500,
) )

2
assets/common/items/weapons/starter_staff.ron
View File

@ -4,7 +4,7 @@ Item(
Power: 20", Power: 20",
kind: Tool( kind: Tool(
ToolData ( (
kind: Staff(BasicStaff), kind: Staff(BasicStaff),
equip_time_millis: 300, equip_time_millis: 300,
) )

2
assets/common/items/weapons/starter_sword.ron
View File

@ -4,7 +4,7 @@ Item(
Power: 15", Power: 15",
kind: Tool( kind: Tool(
ToolData ( (
kind: Sword(BasicSword), kind: Sword(BasicSword),
equip_time_millis: 300, equip_time_millis: 300,
) )

2
assets/common/items/weapons/wood_sword.ron
View File

@ -3,7 +3,7 @@ Item(
description: " description: "
Power: 15", Power: 15",
kind: Tool( kind: Tool(
ToolData ( (
kind: Sword(WoodTraining), kind: Sword(WoodTraining),
equip_time_millis: 400, equip_time_millis: 400,
) )

2
assets/common/items/weapons/zweihander_sword_0.ron
View File

@ -3,7 +3,7 @@ Item(
description: " description: "
Power: 15", Power: 15",
kind: Tool( kind: Tool(
ToolData ( (
kind: Sword(Zweihander0), kind: Sword(Zweihander0),
equip_time_millis: 500, equip_time_millis: 500,
) )

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

@ -1,51 +1,52 @@
({ ((
None:( default:(
vox_spec: ("armor.belt.belt_none", (-5.0, -3.5, 2.0)), vox_spec: ("armor.belt.belt_none", (-5.0, -3.5, 2.0)),
color: None color: None
), ),
Dark:( map: {
vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)), Dark:(
color: None vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)),
), color: None
TurqCloth:( ),
vox_spec: ("armor.belt.cloth_turq", (-4.0, -3.5, -6.0)), TurqCloth:(
color: None vox_spec: ("armor.belt.cloth_turq", (-4.0, -3.5, -6.0)),
), color: None
BloodCloth:( ),
vox_spec: ("armor.belt.cloth_blood", (-4.0, -3.5, -6.0)), BloodCloth:(
color: Some((29, 26, 33)) vox_spec: ("armor.belt.cloth_blood", (-4.0, -3.5, -6.0)),
), color: Some((29, 26, 33))
BlackCloth:( ),
vox_spec: ("armor.belt.cloth_black", (-4.0, -3.5, -6.0)), BlackCloth:(
color: Some((29, 26, 33)) vox_spec: ("armor.belt.cloth_black", (-4.0, -3.5, -6.0)),
), color: Some((29, 26, 33))
Assassin:( ),
vox_spec: ("armor.belt.assa", (-5.0, -3.5, 2.0)), Assassin:(
color: None vox_spec: ("armor.belt.assa", (-5.0, -3.5, 2.0)),
), color: None
Dark:( ),
vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)), Dark:(
color: None vox_spec: ("armor.belt.dark", (-4.0, -3.5, 2.0)),
), color: None
Plate0:( ),
vox_spec: ("armor.belt.plate-0", (-5.0, -3.5, 2.0)), Plate0:(
color: None 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)), Leather0:(
color: None vox_spec: ("armor.belt.leather-0", (-5.0, -3.5, 2.0)),
), color: None
ClothPurple0:( ),
vox_spec: ("armor.belt.cloth_purple-0", (-5.0, -3.5, 2.0)), ClothPurple0:(
color: None vox_spec: ("armor.belt.cloth_purple-0", (-5.0, -3.5, 2.0)),
), color: None
ClothBlue0:( ),
vox_spec: ("armor.belt.cloth_blue-0", (-5.0, -3.5, 2.0)), ClothBlue0:(
color: None vox_spec: ("armor.belt.cloth_blue-0", (-5.0, -3.5, 2.0)),
), color: None
ClothGreen0:( ),
vox_spec: ("armor.belt.cloth_green-0", (-5.0, -3.5, 2.0)), ClothGreen0:(
color: None vox_spec: ("armor.belt.cloth_green-0", (-5.0, -3.5, 2.0)),
), color: None
),
}) },
))

113
assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
View File

@ -1,59 +1,60 @@
({ ((
None: ( default: (
vox_spec: ("armor.chest.chest_none", (-7.0, -3.5, 2.0)), vox_spec: ("armor.chest.chest_none", (-7.0, -3.5, 2.0)),
color: None color: None
), ),
Blue: ( map: {
vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)), Blue: (
color: Some((44, 74, 109)) vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
), color: Some((44, 74, 109))
Brown: ( ),
vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)), Brown: (
color: Some((90, 49, 43)) vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
), color: Some((90, 49, 43))
Dark: ( ),
vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)), Dark: (
color: Some((73, 63, 59)) vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
), color: Some((73, 63, 59))
Green: ( ),
vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)), Green: (
color: Some((59, 95, 67)) vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
), color: Some((59, 95, 67))
Orange: ( ),
vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)), Orange: (
color: Some((109, 58, 58)) vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
), color: Some((109, 58, 58))
Midnight: ( ),
vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)), Midnight: (
color: Some((29, 26, 33)) vox_spec: ("armor.chest.grayscale", (-7.0, -3.5, 2.0)),
), color: Some((29, 26, 33))
Assassin: ( ),
vox_spec: ("armor.chest.assa", (-7.0, -3.5, 2.0)), Assassin: (
color: None vox_spec: ("armor.chest.assa", (-7.0, -3.5, 2.0)),
), color: None
Kimono: ( ),
vox_spec: ("armor.chest.cloth_red_kimono", (-7.0, -3.5, 2.0)), Kimono: (
color: None vox_spec: ("armor.chest.cloth_red_kimono", (-7.0, -3.5, 2.0)),
), color: None
PlateGreen0: ( ),
vox_spec: ("armor.chest.plate_green-0", (-7.0, -3.5, 2.0)), PlateGreen0: (
color: None 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)), Leather0: (
color: None vox_spec: ("armor.chest.leather-0", (-7.0, -3.5, 2.0)),
), color: None
ClothPurple0:( ),
vox_spec: ("armor.chest.cloth_purple-0", (-7.0, -3.5, 1.0)), ClothPurple0:(
color: None vox_spec: ("armor.chest.cloth_purple-0", (-7.0, -3.5, 1.0)),
), color: None
ClothBlue0:( ),
vox_spec: ("armor.chest.cloth_blue-0", (-7.0, -3.5, 1.0)), ClothBlue0:(
color: None vox_spec: ("armor.chest.cloth_blue-0", (-7.0, -3.5, 1.0)),
), color: None
ClothGreen0:( ),
vox_spec: ("armor.chest.cloth_green-0", (-7.0, -3.5, 1.0)), ClothGreen0:(
color: None vox_spec: ("armor.chest.cloth_green-0", (-7.0, -3.5, 1.0)),
), color: None
),
}) },
))

80
assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
View File

@ -1,42 +1,44 @@
({ ((
Bare: ( default: (
vox_spec: ("armor.foot.foot_none", (-2.5, -3.5, -9.0)), vox_spec: ("armor.foot.foot_none", (-2.5, -3.5, -9.0)),
color: None color: None
), ),
Dark: ( map: {
vox_spec: ("armor.foot.dark-0", (-2.5, -3.5, -9.0)), Dark: (
color: None vox_spec: ("armor.foot.dark-0", (-2.5, -3.5, -9.0)),
), color: None
Assassin: ( ),
vox_spec: ("armor.foot.assa", (-2.5, -3.5, -9.0)), Assassin: (
color: None vox_spec: ("armor.foot.assa", (-2.5, -3.5, -9.0)),
), color: None
Sandal: ( ),
vox_spec: ("armor.foot.cloth_sandals", (-2.5, -2.5, -9.0)), Sandal: (
color: None vox_spec: ("armor.foot.cloth_sandals", (-2.5, -2.5, -9.0)),
), color: None
Jester: ( ),
vox_spec: ("armor.foot.dark_jester-elf_shoe", (-2.5, -3.0, -9.0)), Jester: (
color: None 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)), Plate0: (
color: None 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)), Leather0: (
color: None vox_spec: ("armor.foot.leather-0", (-2.5, -3.5, -9.0)),
), color: None
ClothPurple0:( ),
vox_spec: ("armor.foot.cloth_purple-0", (-2.5, -3.5, -9.0)), ClothPurple0:(
color: None vox_spec: ("armor.foot.cloth_purple-0", (-2.5, -3.5, -9.0)),
), color: None
ClothBlue0:( ),
vox_spec: ("armor.foot.cloth_blue-0", (-2.5, -3.5, -9.0)), ClothBlue0:(
color: None vox_spec: ("armor.foot.cloth_blue-0", (-2.5, -3.5, -9.0)),
), color: None
ClothGreen0:( ),
vox_spec: ("armor.foot.cloth_green-0", (-2.5, -3.5, -9.0)), ClothGreen0:(
color: None vox_spec: ("armor.foot.cloth_green-0", (-2.5, -3.5, -9.0)),
), color: None
}) ),
},
))

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

@ -1,5 +1,5 @@
({ ((
Bare: ( default: (
left: ( left: (
vox_spec: ("armor.hand.hand_right_none", (-1.5, -1.5, -7.0)), vox_spec: ("armor.hand.hand_right_none", (-1.5, -1.5, -7.0)),
color: None color: None
@ -9,74 +9,76 @@
color: None color: None
) )
), ),
Assassin: ( map: {
left: ( Assassin: (
vox_spec: ("armor.hand.assa_right", (-1.5, -1.5, -7.0)), left: (
color: None vox_spec: ("armor.hand.assa_right", (-1.5, -1.5, -7.0)),
color: None
),
right: (
vox_spec: ("armor.hand.assa_right", (-1.5, -1.5, -7.0)),
color: None
)
), ),
right: ( Cloth: (
vox_spec: ("armor.hand.assa_right", (-1.5, -1.5, -7.0)), left: (
color: None vox_spec: ("armor.hand.cloth_basic_right", (-1.5, -1.5, -7.0)),
) color: None
), ),
Cloth: ( right: (
left: ( vox_spec: ("armor.hand.cloth_basic_right", (-1.5, -1.5, -7.0)),
vox_spec: ("armor.hand.cloth_basic_right", (-1.5, -1.5, -7.0)), color: None
color: None )
), ),
right: ( Plate0: (
vox_spec: ("armor.hand.cloth_basic_right", (-1.5, -1.5, -7.0)), left: (
color: None vox_spec: ("armor.hand.plate_right-0", (-1.5, -1.5, -7.0)),
) color: None
), ),
Plate0: ( right: (
left: ( vox_spec: ("armor.hand.plate_right-0", (-1.5, -1.5, -7.0)),
vox_spec: ("armor.hand.plate_right-0", (-1.5, -1.5, -7.0)), color: None
color: None )
), ),
right: ( Leather0: (
vox_spec: ("armor.hand.plate_right-0", (-1.5, -1.5, -7.0)), left: (
color: None vox_spec: ("armor.hand.leather_right-0", (-1.5, -1.5, -7.0)),
) color: None
), ),
Leather0: ( right: (
left: ( vox_spec: ("armor.hand.leather_right-0", (-1.5, -1.5, -7.0)),
vox_spec: ("armor.hand.leather_right-0", (-1.5, -1.5, -7.0)), color: None
color: None )
), ),
right: ( ClothPurple0: (
vox_spec: ("armor.hand.leather_right-0", (-1.5, -1.5, -7.0)), left: (
color: None vox_spec: ("armor.hand.cloth_purple_right-0", (-1.5, -1.5, -7.0)),
) color: None
), ),
ClothPurple0: ( right: (
left: ( vox_spec: ("armor.hand.cloth_purple_right-0", (-1.5, -1.5, -7.0)),
vox_spec: ("armor.hand.cloth_purple_right-0", (-1.5, -1.5, -7.0)), color: None
color: None )
), ),
right: ( ClothBlue0: (
vox_spec: ("armor.hand.cloth_purple_right-0", (-1.5, -1.5, -7.0)), left: (
color: None vox_spec: ("armor.hand.cloth_blue_right-0", (-1.5, -1.5, -7.0)),
) color: None
), ),
ClothBlue0: ( right: (
left: ( vox_spec: ("armor.hand.cloth_blue_right-0", (-1.5, -1.5, -7.0)),
vox_spec: ("armor.hand.cloth_blue_right-0", (-1.5, -1.5, -7.0)), color: None
color: None )
), ),
right: ( ClothGreen0: (
vox_spec: ("armor.hand.cloth_blue_right-0", (-1.5, -1.5, -7.0)), left: (
color: None vox_spec: ("armor.hand.cloth_green_right-0", (-1.5, -1.5, -7.0)),
) color: None
), ),
ClothGreen0: ( right: (
left: ( vox_spec: ("armor.hand.cloth_green_right-0", (-1.5, -1.5, -7.0)),
vox_spec: ("armor.hand.cloth_green_right-0", (-1.5, -1.5, -7.0)), color: None
color: None )
), ),
right: ( },
vox_spec: ("armor.hand.cloth_green_right-0", (-1.5, -1.5, -7.0)), ))
color: None
)
),
})

104
assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
View File

@ -1,54 +1,56 @@
({ ((
None: ( default: (
vox_spec: ("armor.pants.pants_none", (-5.0, -3.5, 1.0)), vox_spec: ("armor.pants.pants_none", (-5.0, -3.5, 1.0)),
color: Some((28, 66, 109)) color: Some((28, 66, 109))
), ),
Blue: ( map: {
vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)), Blue: (
color: Some((28, 66, 109)) vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
), color: Some((28, 66, 109))
Brown: ( ),
vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)), Brown: (
color: Some((54, 30, 26)) vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
), color: Some((54, 30, 26))
Dark: ( ),
vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)), Dark: (
color: Some((24, 19, 17)) vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
), color: Some((24, 19, 17))
Green: ( ),
vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)), Green: (
color: Some((49, 95, 59)) vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
), color: Some((49, 95, 59))
Orange: ( ),
vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)), Orange: (
color: Some((148, 52, 33)) vox_spec: ("armor.pants.grayscale", (-5.0, -3.5, 1.0)),
), color: Some((148, 52, 33))
Assassin: ( ),
vox_spec: ("armor.pants.assa", (-5.0, -3.5, 1.0)), Assassin: (
color: None vox_spec: ("armor.pants.assa", (-5.0, -3.5, 1.0)),
), color: None
Kimono: ( ),
vox_spec: ("armor.pants.cloth_red_kimono", (-5.0, -3.5, 0.0)), Kimono: (
color: None vox_spec: ("armor.pants.cloth_red_kimono", (-5.0, -3.5, 0.0)),
), color: None
PlateGreen0: ( ),
vox_spec: ("armor.pants.plate_green-0", (-5.0, -3.5, 1.0)), PlateGreen0: (
color: None 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)), Leather0: (
color: None vox_spec: ("armor.pants.leather-0", (-5.0, -3.5, 1.0)),
), color: None
ClothPurple0:( ),
vox_spec: ("armor.pants.cloth_purple-0", (-5.0, -3.5, 0.0)), ClothPurple0:(
color: None vox_spec: ("armor.pants.cloth_purple-0", (-5.0, -3.5, 0.0)),
), color: None
ClothBlue0:( ),
vox_spec: ("armor.pants.cloth_blue-0", (-5.0, -3.5, 0.0)), ClothBlue0:(
color: None vox_spec: ("armor.pants.cloth_blue-0", (-5.0, -3.5, 0.0)),
), color: None
ClothGreen0:( ),
vox_spec: ("armor.pants.cloth_green-0", (-5.0, -3.5, 0.0)), ClothGreen0:(
color: None vox_spec: ("armor.pants.cloth_green-0", (-5.0, -3.5, 0.0)),
), color: None
}) ),
},
))

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

@ -1,6 +1,6 @@
({ ((
//This shouldn't be the none option, but what is? //This shouldn't be the none option, but what is?
None: ( default: (
left: ( left: (
vox_spec: ("armor.empty", (-3.0, -3.5, 1.0)), vox_spec: ("armor.empty", (-3.0, -3.5, 1.0)),
color: None color: None
@ -10,104 +10,106 @@
color: None color: None
) )
), ),
Brown1: ( map: {
left: ( Brown1: (
vox_spec: ("armor.shoulder.brown_right", (-3.0, -3.5, 1.0)), left: (
color: None vox_spec: ("armor.shoulder.brown_right", (-3.0, -3.5, 1.0)),
color: None
),
right: (
vox_spec: ("armor.shoulder.brown_right", (-2.0, -3.5, 1.0)),
color: None
)
), ),
right: ( Assassin: (
vox_spec: ("armor.shoulder.brown_right", (-2.0, -3.5, 1.0)), left: (
color: None vox_spec: ("armor.shoulder.assa_right", (-4.0, -3.5, 1.0)),
) color: None
), ),
Assassin: ( right: (
left: ( vox_spec: ("armor.shoulder.assa_right", (-2.0, -3.5, 1.0)),
vox_spec: ("armor.shoulder.assa_right", (-4.0, -3.5, 1.0)), color: None
color: None )
), ),
right: ( Assassin: (
vox_spec: ("armor.shoulder.assa_right", (-2.0, -3.5, 1.0)), left: (
color: None vox_spec: ("armor.shoulder.assa_right", (-4.0, -3.5, 1.0)),
) color: None
), ),
Assassin: ( right: (
left: ( vox_spec: ("armor.shoulder.assa_right", (-2.0, -3.5, 1.0)),
vox_spec: ("armor.shoulder.assa_right", (-4.0, -3.5, 1.0)), color: None
color: None )
), ),
right: ( Chain: (
vox_spec: ("armor.shoulder.assa_right", (-2.0, -3.5, 1.0)), left: (
color: None vox_spec: ("armor.shoulder.chain_right-1", (-4.0, -3.5, 1.0)),
) color: None
), ),
Chain: ( right: (
left: ( vox_spec: ("armor.shoulder.chain_right-1", (-2.0, -3.5, 1.0)),
vox_spec: ("armor.shoulder.chain_right-1", (-4.0, -3.5, 1.0)), color: None
color: None )
), ),
right: ( Plate0: (
vox_spec: ("armor.shoulder.chain_right-1", (-2.0, -3.5, 1.0)), left: (
color: None vox_spec: ("armor.shoulder.plate_right-0", (-3.6, -3.5, 1.0)),
) color: None
), ),
Plate0: ( right: (
left: ( vox_spec: ("armor.shoulder.plate_right-0", (-2.6, -3.5, 1.0)),
vox_spec: ("armor.shoulder.plate_right-0", (-3.6, -3.5, 1.0)), color: None
color: None )
), ),
right: ( Leather0: (
vox_spec: ("armor.shoulder.plate_right-0", (-2.6, -3.5, 1.0)), left: (
color: None vox_spec: ("armor.shoulder.leather_right-0", (-3.2, -3.5, 1.0)),
) color: None
), ),
Leather0: ( right: (
left: ( vox_spec: ("armor.shoulder.leather_right-0", (-1.8, -3.5, 1.0)),
vox_spec: ("armor.shoulder.leather_right-0", (-3.2, -3.5, 1.0)), color: None
color: None )
), ),
right: ( Leather1: (
vox_spec: ("armor.shoulder.leather_right-0", (-1.8, -3.5, 1.0)), left: (
color: None vox_spec: ("armor.shoulder.leather_right-1", (-3.6, -4.5, 1.0)),
) color: None
), ),
Leather1: ( right: (
left: ( vox_spec: ("armor.shoulder.leather_right-1", (-2.6, -4.5, 1.0)),
vox_spec: ("armor.shoulder.leather_right-1", (-3.6, -4.5, 1.0)), color: None
color: None )
), ),
right: ( ClothPurple0: (
vox_spec: ("armor.shoulder.leather_right-1", (-2.6, -4.5, 1.0)), left: (
color: None vox_spec: ("armor.shoulder.cloth_purple_right-0", (-3.2, -3.5, 1.0)),
) color: None
), ),
ClothPurple0: ( right: (
left: ( vox_spec: ("armor.shoulder.cloth_purple_right-0", (-1.8, -3.5, 1.0)),
vox_spec: ("armor.shoulder.cloth_purple_right-0", (-3.2, -3.5, 1.0)), color: None
color: None )
), ),
right: ( ClothBlue0: (
vox_spec: ("armor.shoulder.cloth_purple_right-0", (-1.8, -3.5, 1.0)), left: (
color: None vox_spec: ("armor.shoulder.cloth_blue_left-0", (-3.2, -3.5, 1.0)),
) color: None
), ),
ClothBlue0: ( right: (
left: ( vox_spec: ("armor.shoulder.cloth_blue_right-0", (-1.8, -3.5, 1.0)),
vox_spec: ("armor.shoulder.cloth_blue_left-0", (-3.2, -3.5, 1.0)), color: None
color: None )
), ),
right: ( ClothGreen0: (
vox_spec: ("armor.shoulder.cloth_blue_right-0", (-1.8, -3.5, 1.0)), left: (
color: None vox_spec: ("armor.shoulder.cloth_green_left-0", (-3.2, -3.5, 1.0)),
) color: None
), ),
ClothGreen0: ( right: (
left: ( vox_spec: ("armor.shoulder.cloth_green_right-0", (-1.8, -3.5, 1.0)),
vox_spec: ("armor.shoulder.cloth_green_left-0", (-3.2, -3.5, 1.0)), color: None
color: None )
), ),
right: ( },
vox_spec: ("armor.shoulder.cloth_green_right-0", (-1.8, -3.5, 1.0)), ))
color: None
)
),
})

16
common/src/comp/inventory/item/armor.rs
View File

@ -1,7 +1,6 @@
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)] #[repr(u32)]
pub enum Chest { pub enum Chest {
None = 0,
Blue = 1, Blue = 1,
Brown = 2, Brown = 2,
Dark = 3, Dark = 3,
@ -16,8 +15,7 @@ pub enum Chest {
ClothBlue0 = 12, ClothBlue0 = 12,
ClothGreen0 = 13, ClothGreen0 = 13,
} }
pub const ALL_CHESTS: [Chest; 14] = [ pub const ALL_CHESTS: [Chest; 13] = [
Chest::None,
Chest::Blue, Chest::Blue,
Chest::Brown, Chest::Brown,
Chest::Dark, Chest::Dark,
@ -98,7 +96,6 @@ pub const ALL_PANTS: [Pants; 13] = [
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)] #[repr(u32)]
pub enum Hand { pub enum Hand {
Bare = 0,
Cloth = 1, Cloth = 1,
Assassin = 2, Assassin = 2,
Plate0 = 3, Plate0 = 3,
@ -107,8 +104,7 @@ pub enum Hand {
ClothBlue0 = 6, ClothBlue0 = 6,
ClothGreen0 = 7, ClothGreen0 = 7,
} }
pub const ALL_HANDS: [Hand; 8] = [ pub const ALL_HANDS: [Hand; 7] = [
Hand::Bare,
Hand::Cloth, Hand::Cloth,
Hand::Assassin, Hand::Assassin,
Hand::Plate0, Hand::Plate0,
@ -121,7 +117,6 @@ pub const ALL_HANDS: [Hand; 8] = [
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)] #[repr(u32)]
pub enum Foot { pub enum Foot {
Bare = 0,
Dark = 1, Dark = 1,
Sandal = 2, Sandal = 2,
Jester = 3, Jester = 3,
@ -132,8 +127,7 @@ pub enum Foot {
ClothBlue0 = 8, ClothBlue0 = 8,
ClothGreen0 = 9, ClothGreen0 = 9,
} }
pub const ALL_FEET: [Foot; 10] = [ pub const ALL_FEET: [Foot; 9] = [
Foot::Bare,
Foot::Dark, Foot::Dark,
Foot::Sandal, Foot::Sandal,
Foot::Jester, Foot::Jester,
@ -148,7 +142,6 @@ pub const ALL_FEET: [Foot; 10] = [
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)] #[repr(u32)]
pub enum Shoulder { pub enum Shoulder {
None = 0,
Brown1 = 1, Brown1 = 1,
Chain = 2, Chain = 2,
Assassin = 3, Assassin = 3,
@ -159,8 +152,7 @@ pub enum Shoulder {
ClothBlue0 = 8, ClothBlue0 = 8,
ClothGreen0 = 9, ClothGreen0 = 9,
} }
pub const ALL_SHOULDERS: [Shoulder; 10] = [ pub const ALL_SHOULDERS: [Shoulder; 9] = [
Shoulder::None,
Shoulder::Brown1, Shoulder::Brown1,
Shoulder::Chain, Shoulder::Chain,
Shoulder::Assassin, Shoulder::Assassin,

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

@ -234,19 +234,26 @@ impl HumHeadSpec {
// Armor spects should be in the same order, top to bottom. // Armor spects should be in the same order, top to bottom.
// These seem overly split up, but wanted to keep the armor seperated // These seem overly split up, but wanted to keep the armor seperated
// unlike head which is done above. // unlike head which is done above.
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct HumArmorShoulderSpec(HashMap<Shoulder, SidedArmorVoxSpec>); pub struct ArmorVoxSpecMap<K, S>
where
K: std::hash::Hash + std::cmp::Eq,
{
default: S,
map: HashMap<K, S>,
}
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct HumArmorChestSpec(HashMap<Chest, ArmorVoxSpec>); pub struct HumArmorShoulderSpec(ArmorVoxSpecMap<Shoulder, SidedArmorVoxSpec>);
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct HumArmorHandSpec(HashMap<Hand, SidedArmorVoxSpec>); pub struct HumArmorChestSpec(ArmorVoxSpecMap<Chest, ArmorVoxSpec>);
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct HumArmorBeltSpec(HashMap<Belt, ArmorVoxSpec>); pub struct HumArmorHandSpec(ArmorVoxSpecMap<Hand, SidedArmorVoxSpec>);
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct HumArmorPantsSpec(HashMap<Pants, ArmorVoxSpec>); pub struct HumArmorBeltSpec(ArmorVoxSpecMap<Belt, ArmorVoxSpec>);
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct HumArmorFootSpec(HashMap<Foot, ArmorVoxSpec>); pub struct HumArmorPantsSpec(ArmorVoxSpecMap<Pants, ArmorVoxSpec>);
#[derive(Serialize, Deserialize)]
pub struct HumArmorFootSpec(ArmorVoxSpecMap<Foot, ArmorVoxSpec>);
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct HumMainWeaponSpec(HashMap<ToolKind, ArmorVoxSpec>); pub struct HumMainWeaponSpec(HashMap<ToolKind, ArmorVoxSpec>);
@ -307,22 +314,20 @@ impl HumArmorShoulderSpec {
} }
fn mesh_shoulder(&self, body: &Body, loadout: &Loadout, flipped: bool) -> Mesh<FigurePipeline> { fn mesh_shoulder(&self, body: &Body, loadout: &Loadout, flipped: bool) -> Mesh<FigurePipeline> {
let shoulder = if let Some(ItemKind::Armor { let spec = if let Some(ItemKind::Armor {
kind: Armor::Shoulder(shoulder), kind: Armor::Shoulder(shoulder),
.. ..
}) = loadout.shoulder.as_ref().map(|i| &i.kind) }) = loadout.shoulder.as_ref().map(|i| &i.kind)
{ {
shoulder match self.0.map.get(&shoulder) {
Some(spec) => spec,
None => {
error!("No shoulder specification exists for {:?}", shoulder);
return load_mesh("not_found", Vec3::new(-3.0, -3.5, 0.1));
},
}
} else { } else {
&Shoulder::None &self.0.default
};
let spec = match self.0.get(&shoulder) {
Some(spec) => spec,
None => {
error!("No shoulder specification exists for {:?}", shoulder);
return load_mesh("not_found", Vec3::new(-3.0, -3.5, 0.1));
},
}; };
let shoulder_segment = color_segment( let shoulder_segment = color_segment(
@ -366,22 +371,20 @@ impl HumArmorChestSpec {
} }
pub fn mesh_chest(&self, body: &Body, loadout: &Loadout) -> Mesh<FigurePipeline> { pub fn mesh_chest(&self, body: &Body, loadout: &Loadout) -> Mesh<FigurePipeline> {
let chest = if let Some(ItemKind::Armor { let spec = if let Some(ItemKind::Armor {
kind: Armor::Chest(chest), kind: Armor::Chest(chest),
.. ..
}) = loadout.chest.as_ref().map(|i| &i.kind) }) = loadout.chest.as_ref().map(|i| &i.kind)
{ {
chest match self.0.map.get(&chest) {
Some(spec) => spec,
None => {
error!("No chest specification exists for {:?}", loadout.chest);
return load_mesh("not_found", Vec3::new(-7.0, -3.5, 2.0));
},
}
} else { } else {
&Chest::None &self.0.default
};
let spec = match self.0.get(&chest) {
Some(spec) => spec,
None => {
error!("No chest specification exists for {:?}", loadout.chest);
return load_mesh("not_found", Vec3::new(-7.0, -3.5, 2.0));
},
}; };
let color = |mat_segment| { let color = |mat_segment| {
@ -419,22 +422,20 @@ impl HumArmorHandSpec {
} }
fn mesh_hand(&self, body: &Body, loadout: &Loadout, flipped: bool) -> Mesh<FigurePipeline> { fn mesh_hand(&self, body: &Body, loadout: &Loadout, flipped: bool) -> Mesh<FigurePipeline> {
let hand = if let Some(ItemKind::Armor { let spec = if let Some(ItemKind::Armor {
kind: Armor::Hand(hand), kind: Armor::Hand(hand),
.. ..
}) = loadout.hand.as_ref().map(|i| &i.kind) }) = loadout.hand.as_ref().map(|i| &i.kind)
{ {
hand match self.0.map.get(&hand) {
Some(spec) => spec,
None => {
error!("No hand specification exists for {:?}", hand);
return load_mesh("not_found", Vec3::new(-1.5, -1.5, -7.0));
},
}
} else { } else {
&Hand::Bare &self.0.default
};
let spec = match self.0.get(&hand) {
Some(spec) => spec,
None => {
error!("No hand specification exists for {:?}", hand);
return load_mesh("not_found", Vec3::new(-1.5, -1.5, -7.0));
},
}; };
let hand_segment = color_segment( let hand_segment = color_segment(
@ -473,22 +474,20 @@ impl HumArmorBeltSpec {
} }
pub fn mesh_belt(&self, body: &Body, loadout: &Loadout) -> Mesh<FigurePipeline> { pub fn mesh_belt(&self, body: &Body, loadout: &Loadout) -> Mesh<FigurePipeline> {
let belt = if let Some(ItemKind::Armor { let spec = if let Some(ItemKind::Armor {
kind: Armor::Belt(belt), kind: Armor::Belt(belt),
.. ..
}) = loadout.belt.as_ref().map(|i| &i.kind) }) = loadout.belt.as_ref().map(|i| &i.kind)
{ {
belt match self.0.map.get(&belt) {
Some(spec) => spec,
None => {
error!("No belt specification exists for {:?}", belt);
return load_mesh("not_found", Vec3::new(-4.0, -3.5, 2.0));
},
}
} else { } else {
&Belt::None &self.0.default
};
let spec = match self.0.get(&belt) {
Some(spec) => spec,
None => {
error!("No belt specification exists for {:?}", belt);
return load_mesh("not_found", Vec3::new(-4.0, -3.5, 2.0));
},
}; };
let belt_segment = color_segment( let belt_segment = color_segment(
@ -509,22 +508,20 @@ impl HumArmorPantsSpec {
} }
pub fn mesh_pants(&self, body: &Body, loadout: &Loadout) -> Mesh<FigurePipeline> { pub fn mesh_pants(&self, body: &Body, loadout: &Loadout) -> Mesh<FigurePipeline> {
let pants = if let Some(ItemKind::Armor { let spec = if let Some(ItemKind::Armor {
kind: Armor::Pants(pants), kind: Armor::Pants(pants),
.. ..
}) = loadout.pants.as_ref().map(|i| &i.kind) }) = loadout.pants.as_ref().map(|i| &i.kind)
{ {
pants match self.0.map.get(&pants) {
Some(spec) => spec,
None => {
error!("No pants specification exists for {:?}", pants);
return load_mesh("not_found", Vec3::new(-5.0, -3.5, 1.0));
},
}
} else { } else {
&Pants::None &self.0.default
};
let spec = match self.0.get(&pants) {
Some(spec) => spec,
None => {
error!("No pants specification exists for {:?}", pants);
return load_mesh("not_found", Vec3::new(-5.0, -3.5, 1.0));
},
}; };
let color = |mat_segment| { let color = |mat_segment| {
@ -562,22 +559,20 @@ impl HumArmorFootSpec {
} }
fn mesh_foot(&self, body: &Body, loadout: &Loadout, flipped: bool) -> Mesh<FigurePipeline> { fn mesh_foot(&self, body: &Body, loadout: &Loadout, flipped: bool) -> Mesh<FigurePipeline> {
let foot = if let Some(ItemKind::Armor { let spec = if let Some(ItemKind::Armor {
kind: Armor::Foot(foot), kind: Armor::Foot(foot),
.. ..
}) = loadout.foot.as_ref().map(|i| &i.kind) }) = loadout.foot.as_ref().map(|i| &i.kind)
{ {
foot match self.0.map.get(&foot) {
Some(spec) => spec,
None => {
error!("No foot specification exists for {:?}", foot);
return load_mesh("not_found", Vec3::new(-2.5, -3.5, -9.0));
},
}
} else { } else {
&Foot::Bare &self.0.default
};
let spec = match self.0.get(&foot) {
Some(spec) => spec,
None => {
error!("No foot specification exists for {:?}", foot);
return load_mesh("not_found", Vec3::new(-2.5, -3.5, -9.0));
},
}; };
let foot_segment = color_segment( let foot_segment = color_segment(