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

Merge branch 'armor_offset_fixes' into 'master'

Browse Source 
fixed armor offsets to enable mix'n'match armor

See merge request veloren/veloren!4218
This commit is contained in:
flo 2023-12-20 12:05:58 +00:00
commit f62e3d6124
6 changed files with 148 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,11 +29,11 @@
color: None color: None
), ),
"common.items.armor.boreal.belt": ( "common.items.armor.boreal.belt": (
vox_spec: ("armor.boreal.belt", (-4.0, -3.0, 2.0)), vox_spec: ("armor.boreal.belt", (-4.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.brinestone.belt": ( "common.items.armor.brinestone.belt": (
vox_spec: ("armor.brinestone.belt", (-4.0, -3.0, 2.0)), vox_spec: ("armor.brinestone.belt", (-4.0, -3.5, 1.0)),
color: None color: None
), ),
"common.items.armor.cloth_purple.belt": ( "common.items.armor.cloth_purple.belt": (
@ -101,15 +101,15 @@
color: None color: None
), ),
"common.items.armor.hide.carapace.belt":( "common.items.armor.hide.carapace.belt":(
vox_spec: ("armor.hide.carapace.belt", (-4.0, -4.0, 1.5)), vox_spec: ("armor.hide.carapace.belt", (-4.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.hide.primal.belt":( "common.items.armor.hide.primal.belt":(
vox_spec: ("armor.hide.primal.belt", (-4.0, -4.0, 1.0)), vox_spec: ("armor.hide.primal.belt", (-4.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.hide.dragonscale.belt":( "common.items.armor.hide.dragonscale.belt":(
vox_spec: ("armor.hide.dragonscale.belt", (-4.0, -3.5, 1.5)), vox_spec: ("armor.hide.dragonscale.belt", (-4.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.savage.belt":( "common.items.armor.savage.belt":(
@ -137,43 +137,43 @@
color: None color: None
), ),
"common.items.armor.cloth.linen.belt":( "common.items.armor.cloth.linen.belt":(
vox_spec: ("armor.cloth.linen.belt", (-4.0, -4.0, 0.0)), vox_spec: ("armor.cloth.linen.belt", (-4.0, -3.5, 0.0)),
color: None color: None
), ),
"common.items.armor.cloth.woolen.belt":( "common.items.armor.cloth.woolen.belt":(
vox_spec: ("armor.cloth.woolen.belt", (-4.0, -4.0, 1.0)), vox_spec: ("armor.cloth.woolen.belt", (-4.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.cloth.silken.belt":( "common.items.armor.cloth.silken.belt":(
vox_spec: ("armor.cloth.silken.belt", (-4.0, -3.5, -3.0)), vox_spec: ("armor.cloth.silken.belt", (-4.0, -3.5, -2.0)),
color: None color: None
), ),
"common.items.armor.cloth.druid.belt":( "common.items.armor.cloth.druid.belt":(
vox_spec: ("armor.cloth.druid.belt", (-4.0, -4.0, -0.5)), vox_spec: ("armor.cloth.druid.belt", (-4.0, -3.5, -1.0)),
color: None color: None
), ),
"common.items.armor.cloth.moonweave.belt":( "common.items.armor.cloth.moonweave.belt":(
vox_spec: ("armor.cloth.moonweave.belt", (-4.0, -3.5, 1.0)), vox_spec: ("armor.cloth.moonweave.belt", (-4.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.cloth.sunsilk.belt":( "common.items.armor.cloth.sunsilk.belt":(
vox_spec: ("armor.cloth.sunsilk.belt", (-4.0, -3.5, -2.5)), vox_spec: ("armor.cloth.sunsilk.belt", (-4.0, -3.5, -2.0)),
color: None color: None
), ),
"common.items.armor.mail.bronze.belt":( "common.items.armor.mail.bronze.belt":(
vox_spec: ("armor.mail.bronze.belt", (-4.0, -4.0, 2.0)), vox_spec: ("armor.mail.bronze.belt", (-4.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.mail.iron.belt":( "common.items.armor.mail.iron.belt":(
vox_spec: ("armor.mail.iron.belt", (-4.0, -4.0, 2.0)), vox_spec: ("armor.mail.iron.belt", (-4.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.mail.steel.belt":( "common.items.armor.mail.steel.belt":(
vox_spec: ("armor.mail.steel.belt", (-5.0, -4.0, 1.0)), vox_spec: ("armor.mail.steel.belt", (-5.0, -4.5, 2.0)),
color: None color: None
), ),
"common.items.armor.mail.cobalt.belt":( "common.items.armor.mail.cobalt.belt":(
vox_spec: ("armor.mail.cobalt.belt", (-5.0, -4.0, 1.0)), vox_spec: ("armor.mail.cobalt.belt", (-5.0, -4.5, 2.0)),
color: None color: None
), ),
"common.items.armor.mail.bloodsteel.belt":( "common.items.armor.mail.bloodsteel.belt":(

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

@ -37,7 +37,7 @@
color: None color: None
), ),
"common.items.armor.brinestone.chest": ( "common.items.armor.brinestone.chest": (
vox_spec: ("armor.brinestone.chest", (-7.0, -3.5, 0.0)), vox_spec: ("armor.brinestone.chest", (-7.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.assassin.chest": ( "common.items.armor.assassin.chest": (
@ -171,15 +171,15 @@
color: None color: None
), ),
"common.items.armor.hide.carapace.chest": ( "common.items.armor.hide.carapace.chest": (
vox_spec: ("armor.hide.carapace.chest", (-7.0, -3.5, 1.5)), vox_spec: ("armor.hide.carapace.chest", (-7.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.hide.primal.chest": ( "common.items.armor.hide.primal.chest": (
vox_spec: ("armor.hide.primal.chest", (-7.0, -3.5, 0.5)), vox_spec: ("armor.hide.primal.chest", (-7.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.hide.dragonscale.chest": ( "common.items.armor.hide.dragonscale.chest": (
vox_spec: ("armor.hide.dragonscale.chest", (-7.0, -3.5, 1.5)), vox_spec: ("armor.hide.dragonscale.chest", (-7.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.savage.chest": ( "common.items.armor.savage.chest": (
@ -207,51 +207,51 @@
color: None color: None
), ),
"common.items.armor.cloth.linen.chest": ( "common.items.armor.cloth.linen.chest": (
vox_spec: ("armor.cloth.linen.chest", (-7.0, -4.0, 2.0)), vox_spec: ("armor.cloth.linen.chest", (-7.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.cloth.woolen.chest": ( "common.items.armor.cloth.woolen.chest": (
vox_spec: ("armor.cloth.woolen.chest", (-7.0, -4.0, 1.0)), vox_spec: ("armor.cloth.woolen.chest", (-7.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.cloth.silken.chest": ( "common.items.armor.cloth.silken.chest": (
vox_spec: ("armor.cloth.silken.chest", (-7.0, -4.0, 1.0)), vox_spec: ("armor.cloth.silken.chest", (-7.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.cloth.druid.chest": ( "common.items.armor.cloth.druid.chest": (
vox_spec: ("armor.cloth.druid.chest", (-7.0, -4.0, 2.0)), vox_spec: ("armor.cloth.druid.chest", (-7.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.cloth.moonweave.chest": ( "common.items.armor.cloth.moonweave.chest": (
vox_spec: ("armor.cloth.moonweave.chest", (-7.0, -4.0, 1.0)), vox_spec: ("armor.cloth.moonweave.chest", (-7.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.cloth.sunsilk.chest": ( "common.items.armor.cloth.sunsilk.chest": (
vox_spec: ("armor.cloth.sunsilk.chest", (-7.0, -4.0, 1.0)), vox_spec: ("armor.cloth.sunsilk.chest", (-7.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.mail.bronze.chest": ( "common.items.armor.mail.bronze.chest": (
vox_spec: ("armor.mail.bronze.chest", (-7.0, -4.0, 2.0)), vox_spec: ("armor.mail.bronze.chest", (-7.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.mail.iron.chest": ( "common.items.armor.mail.iron.chest": (
vox_spec: ("armor.mail.iron.chest", (-7.0, -4.0, 2.0)), vox_spec: ("armor.mail.iron.chest", (-7.0, -3.5, 2.0)),
color: None color: None
), ),
"common.items.armor.mail.steel.chest": ( "common.items.armor.mail.steel.chest": (
vox_spec: ("armor.mail.steel.chest", (-8.0, -4.0, 1.0)), vox_spec: ("armor.mail.steel.chest", (-8.0, -4.5, 2.0)),
color: None color: None
), ),
"common.items.armor.mail.cobalt.chest": ( "common.items.armor.mail.cobalt.chest": (
vox_spec: ("armor.mail.cobalt.chest", (-8.0, -4.0, 1.0)), vox_spec: ("armor.mail.cobalt.chest", (-8.0, -4.5, 2.0)),
color: None color: None
), ),
"common.items.armor.mail.bloodsteel.chest": ( "common.items.armor.mail.bloodsteel.chest": (
vox_spec: ("armor.mail.bloodsteel.chest", (-8.0, -4.0, 1.0)), vox_spec: ("armor.mail.bloodsteel.chest", (-8.0, -4.5, 2.0)),
color: None color: None
), ),
"common.items.armor.mail.orichalcum.chest": ( "common.items.armor.mail.orichalcum.chest": (
vox_spec: ("armor.mail.orichalcum", (-7.0, -4.0, 1.0), 0), vox_spec: ("armor.mail.orichalcum", (-7.0, -3.5, 2.0), 0),
color: None color: None
), ),
"common.items.armor.cardinal.chest": ( "common.items.armor.cardinal.chest": (

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

@ -29,7 +29,7 @@
color: None color: None
), ),
"common.items.armor.brinestone.foot": ( "common.items.armor.brinestone.foot": (
vox_spec: ("armor.brinestone.foot", (-2.5, -3.5, -2.0)), vox_spec: ("armor.brinestone.foot", (-2.5, -4.5, -2.0)),
color: None color: None
), ),
"common.items.armor.cloth_blue.foot": ( "common.items.armor.cloth_blue.foot": (
@ -97,7 +97,7 @@
color: None color: None
), ),
"common.items.armor.hide.scale.foot": ( "common.items.armor.hide.scale.foot": (
vox_spec: ("armor.hide.scale.foot", (-2.5, -3.5, -2.0)), vox_spec: ("armor.hide.scale.foot", (-2.5, -4.5, -2.0)),
color: None color: None
), ),
"common.items.armor.hide.carapace.foot": ( "common.items.armor.hide.carapace.foot": (
@ -105,7 +105,7 @@
color: None color: None
), ),
"common.items.armor.hide.primal.foot": ( "common.items.armor.hide.primal.foot": (
vox_spec: ("armor.hide.primal.foot", (-2.5, -3.5, -2.0)), vox_spec: ("armor.hide.primal.foot", (-2.5, -4.5, -2.0)),
color: None color: None
), ),
"common.items.armor.hide.dragonscale.foot": ( "common.items.armor.hide.dragonscale.foot": (
@ -161,15 +161,15 @@
color: None color: None
), ),
"common.items.armor.mail.cobalt.foot": ( "common.items.armor.mail.cobalt.foot": (
vox_spec: ("armor.mail.cobalt.foot", (-2.5, -3.5, -2.0)), vox_spec: ("armor.mail.cobalt.foot", (-2.5, -4.5, -2.0)),
color: None color: None
), ),
"common.items.armor.mail.bloodsteel.foot": ( "common.items.armor.mail.bloodsteel.foot": (
vox_spec: ("armor.mail.bloodsteel.foot", (-2.5, -3.5, -2.0)), vox_spec: ("armor.mail.bloodsteel.foot", (-2.5, -4.5, -2.0)),
color: None color: None
), ),
"common.items.armor.mail.orichalcum.foot": ( "common.items.armor.mail.orichalcum.foot": (
vox_spec: ("armor.mail.orichalcum", (-2.5, -3.5, -2.0), 3), vox_spec: ("armor.mail.orichalcum", (-2.5, -4.5, -2.0), 3),
color: None color: None
), ),
"common.items.armor.cardinal.foot": ( "common.items.armor.cardinal.foot": (

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

@ -42,21 +42,21 @@
), ),
"common.items.armor.boreal.hand": ( "common.items.armor.boreal.hand": (
left: ( left: (
vox_spec: ("armor.boreal.hand", (-2.0, -1.5, -3.0)), vox_spec: ("armor.boreal.hand", (-2.5, -1.5, -2.5)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.boreal.hand", (-2.0, -1.5, -3.0)), vox_spec: ("armor.boreal.hand", (-1.5, -1.5, -2.5)),
color: None color: None
) )
), ),
"common.items.armor.brinestone.hand": ( "common.items.armor.brinestone.hand": (
left: ( left: (
vox_spec: ("armor.brinestone.hand", (-3.5, -1.5, -4.0)), vox_spec: ("armor.brinestone.hand", (-3.5, -1.5, -3.5)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.brinestone.hand", (-1.5, -1.5, -4.0)), vox_spec: ("armor.brinestone.hand", (-1.5, -1.5, -3.5)),
color: None color: None
) )
), ),
@ -92,11 +92,11 @@
), ),
"common.items.armor.cultist.hand": ( "common.items.armor.cultist.hand": (
left: ( left: (
vox_spec: ("armor.cultist.hand", (-3.0, -1.5, -2.5)), vox_spec: ("armor.cultist.hand", (-2.5, -2.5, -2.5)),
color: Some((30, 0, 64)) color: Some((30, 0, 64))
), ),
right: ( right: (
vox_spec: ("armor.cultist.hand", (-2.0, -1.5, -2.5)), vox_spec: ("armor.cultist.hand", (-2.2, -2.5, -2.5)),
color: Some((30, 0, 64)) color: Some((30, 0, 64))
) )
), ),
@ -122,7 +122,7 @@
), ),
"common.items.armor.twigsleaves.hand": ( "common.items.armor.twigsleaves.hand": (
left: ( left: (
vox_spec: ("armor.twigsleaves.hand", (-1.5, -1.5, -2.5)), vox_spec: ("armor.twigsleaves.hand", (-2.5, -1.5, -2.5)),
color: None color: None
), ),
right: ( right: (
@ -132,7 +132,7 @@
), ),
"common.items.armor.twigsflowers.hand": ( "common.items.armor.twigsflowers.hand": (
left: ( left: (
vox_spec: ("armor.twigsflowers.hand", (-1.5, -1.5, -2.5)), vox_spec: ("armor.twigsflowers.hand", (-2.5, -1.5, -2.5)),
color: None color: None
), ),
right: ( right: (
@ -222,31 +222,31 @@
), ),
"common.items.armor.hide.carapace.hand": ( "common.items.armor.hide.carapace.hand": (
left: ( left: (
vox_spec: ("armor.hide.carapace.hand", (-3.5, -2.5, -3.0)), vox_spec: ("armor.hide.carapace.hand", (-3.5, -2.5, -3.5)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.hide.carapace.hand", (-1.5, -2.5, -3.0)), vox_spec: ("armor.hide.carapace.hand", (-1.5, -2.5, -3.5)),
color: None color: None
) )
), ),
"common.items.armor.hide.primal.hand": ( "common.items.armor.hide.primal.hand": (
left: ( left: (
vox_spec: ("armor.hide.primal.hand", (-3.5, -3.5, -4.0)), vox_spec: ("armor.hide.primal.hand", (-3.5, -2.5, -3.5)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.hide.primal.hand", (-1.5, -3.5, -4.0)), vox_spec: ("armor.hide.primal.hand", (-1.5, -2.5, -3.5)),
color: None color: None
) )
), ),
"common.items.armor.hide.dragonscale.hand": ( "common.items.armor.hide.dragonscale.hand": (
left: ( left: (
vox_spec: ("armor.hide.dragonscale.hand", (-5.0, -1.5, -3.5)), vox_spec: ("armor.hide.dragonscale.hand", (-5.5, -1.5, -3.5)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.hide.dragonscale.hand", (-2.0, -1.5, -3.5)), vox_spec: ("armor.hide.dragonscale.hand", (-1.5, -1.5, -3.5)),
color: None color: None
) )
), ),
@ -292,121 +292,121 @@
), ),
"common.items.armor.cloth.linen.hand": ( "common.items.armor.cloth.linen.hand": (
left: ( left: (
vox_spec: ("armor.cloth.linen.hand", (-1.5, -2.0, -3.0)), vox_spec: ("armor.cloth.linen.hand", (-1.5, -1.5, -2.5)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.cloth.linen.hand", (-1.5, -2.0, -3.0)), vox_spec: ("armor.cloth.linen.hand", (-1.5, -1.5, -2.5)),
color: None color: None
) )
), ),
"common.items.armor.cloth.woolen.hand": ( "common.items.armor.cloth.woolen.hand": (
left: ( left: (
vox_spec: ("armor.cloth.woolen.hand", (-2.5, -2.5, -3.5)), vox_spec: ("armor.cloth.woolen.hand", (-2.5, -2.5, -2.5)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.cloth.woolen.hand", (-2.5, -2.5, -3.5)), vox_spec: ("armor.cloth.woolen.hand", (-2.5, -2.5, -2.5)),
color: None color: None
) )
), ),
"common.items.armor.cloth.silken.hand": ( "common.items.armor.cloth.silken.hand": (
left: ( left: (
vox_spec: ("armor.cloth.silken.hand", (-2.5, -2.5, -4.0)), vox_spec: ("armor.cloth.silken.hand", (-2.5, -2.5, -3.5)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.cloth.silken.hand", (-1.5, -2.5, -4.0)), vox_spec: ("armor.cloth.silken.hand", (-1.5, -2.5, -3.5)),
color: None color: None
) )
), ),
"common.items.armor.cloth.druid.hand": ( "common.items.armor.cloth.druid.hand": (
left: ( left: (
vox_spec: ("armor.cloth.druid.hand", (-2.5, -1.0, -3.0)), vox_spec: ("armor.cloth.druid.hand", (-1.5, -1.5, -2.5)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.cloth.druid.hand", (-1.5, -1.0, -3.0)), vox_spec: ("armor.cloth.druid.hand", (-1.5, -1.5, -2.5)),
color: None color: None
) )
), ),
"common.items.armor.cloth.moonweave.hand": ( "common.items.armor.cloth.moonweave.hand": (
left: ( left: (
vox_spec: ("armor.cloth.moonweave.hand", (-2.5, -2.0, -4.0)), vox_spec: ("armor.cloth.moonweave.hand", (-1.5, -1.5, -2.5)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.cloth.moonweave.hand", (-1.5, -2.0, -4.0)), vox_spec: ("armor.cloth.moonweave.hand", (-1.5, -1.5, -2.5)),
color: None color: None
) )
), ),
"common.items.armor.cloth.sunsilk.hand": ( "common.items.armor.cloth.sunsilk.hand": (
left: ( left: (
vox_spec: ("armor.cloth.sunsilk.hand", (-2.5, -2.5, -4.0)), vox_spec: ("armor.cloth.sunsilk.hand", (-2.5, -2.5, -3.5)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.cloth.sunsilk.hand", (-1.5, -2.5, -4.0)), vox_spec: ("armor.cloth.sunsilk.hand", (-1.5, -2.5, -3.5)),
color: None color: None
) )
), ),
"common.items.armor.mail.bronze.hand": ( "common.items.armor.mail.bronze.hand": (
left: ( left: (
vox_spec: ("armor.mail.bronze.hand", (-2.5, -2.0, -3.0)), vox_spec: ("armor.mail.bronze.hand", (-1.5, -1.5, -2.5)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.mail.bronze.hand", (-1.5, -2.0, -3.0)), vox_spec: ("armor.mail.bronze.hand", (-1.5, -1.5, -2.5)),
color: None color: None
) )
), ),
"common.items.armor.mail.iron.hand": ( "common.items.armor.mail.iron.hand": (
left: ( left: (
vox_spec: ("armor.mail.iron.hand", (-1.5, -1.5, -3.0)), vox_spec: ("armor.mail.iron.hand", (-1.5, -1.5, -2.5)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.mail.iron.hand", (-1.5, -1.5, -3.0)), vox_spec: ("armor.mail.iron.hand", (-1.5, -1.5, -2.5)),
color: None color: None
) )
), ),
"common.items.armor.mail.steel.hand": ( "common.items.armor.mail.steel.hand": (
left: ( left: (
vox_spec: ("armor.mail.steel.hand", (-2.5, -1.0, -4.0)), vox_spec: ("armor.mail.steel.hand", (-1.5, -1.5, -2.5)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.mail.steel.hand", (-1.5, -1.0, -4.0)), vox_spec: ("armor.mail.steel.hand", (-1.5, -1.5, -2.5)),
color: None color: None
) )
), ),
"common.items.armor.mail.cobalt.hand": ( "common.items.armor.mail.cobalt.hand": (
left: ( left: (
vox_spec: ("armor.mail.cobalt.hand", (-2.5, -2.0, -4.0)), vox_spec: ("armor.mail.cobalt.hand", (-3.5, -2.5, -2.5)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.mail.cobalt.hand", (-1.5, -2.0, -4.0)), vox_spec: ("armor.mail.cobalt.hand", (-1.5, -2.5, -2.5)),
color: None color: None
) )
), ),
"common.items.armor.mail.bloodsteel.hand": ( "common.items.armor.mail.bloodsteel.hand": (
left: ( left: (
vox_spec: ("armor.mail.bloodsteel.hand", (-5.0, -1.0, -4.0)), vox_spec: ("armor.mail.bloodsteel.hand", (-4.5, -2.5, -2.5)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.mail.bloodsteel.hand", (-1.0, -1.0, -4.0)), vox_spec: ("armor.mail.bloodsteel.hand", (-1.5, -2.5, -2.5)),
color: None color: None
) )
), ),
"common.items.armor.mail.orichalcum.hand": ( "common.items.armor.mail.orichalcum.hand": (
left: ( left: (
vox_spec: ("armor.mail.orichalcum", (-4.5, -2.0, -4.0), 4), vox_spec: ("armor.mail.orichalcum", (-4.5, -2.5, -3.5), 4),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.mail.orichalcum", (-1.5, -2.0, -4.0), 4), vox_spec: ("armor.mail.orichalcum", (-1.5, -2.5, -3.5), 4),
color: None color: None
) )
), ),

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

@ -41,7 +41,7 @@
color: None color: None
), ),
"common.items.armor.brinestone.pants": ( "common.items.armor.brinestone.pants": (
vox_spec: ("armor.brinestone.pants", (-7.0, -3.5, 0.0)), vox_spec: ("armor.brinestone.pants", (-7.0, -3.5, -1.0)),
color: None color: None
), ),
"common.items.npc_armor.pants.plate_red": ( "common.items.npc_armor.pants.plate_red": (
@ -125,19 +125,19 @@
color: None color: None
), ),
"common.items.armor.hide.scale.pants": ( "common.items.armor.hide.scale.pants": (
vox_spec: ("armor.hide.scale.pants", (-5.0, -4.0, 0.0)), vox_spec: ("armor.hide.scale.pants", (-5.0, -3.5, 0.0)),
color: None color: None
), ),
"common.items.armor.hide.carapace.pants": ( "common.items.armor.hide.carapace.pants": (
vox_spec: ("armor.hide.carapace.pants", (-6.0, -4.0, 0.5)), vox_spec: ("armor.hide.carapace.pants", (-6.0, -3.5, 1.0)),
color: None color: None
), ),
"common.items.armor.hide.primal.pants": ( "common.items.armor.hide.primal.pants": (
vox_spec: ("armor.hide.primal.pants", (-6.0, -4.0, 0.0)), vox_spec: ("armor.hide.primal.pants", (-6.0, -3.5, 1.0)),
color: None color: None
), ),
"common.items.armor.hide.dragonscale.pants": ( "common.items.armor.hide.dragonscale.pants": (
vox_spec: ("armor.hide.dragonscale.pants", (-5.0, -3.5, -1.5)), vox_spec: ("armor.hide.dragonscale.pants", (-5.0, -3.5, -1.0)),
color: None color: None
), ),
"common.items.armor.savage.pants": ( "common.items.armor.savage.pants": (
@ -165,51 +165,51 @@
color: None color: None
), ),
"common.items.armor.cloth.linen.pants": ( "common.items.armor.cloth.linen.pants": (
vox_spec: ("armor.cloth.linen.pants", (-5.0, -4.0, 0.5)), vox_spec: ("armor.cloth.linen.pants", (-5.0, -3.5, 0.0)),
color: None color: None
), ),
"common.items.armor.cloth.woolen.pants": ( "common.items.armor.cloth.woolen.pants": (
vox_spec: ("armor.cloth.woolen.pants", (-6.0, -5.0, 0.5)), vox_spec: ("armor.cloth.woolen.pants", (-6.0, -4.5, 1.0)),
color: None color: None
), ),
"common.items.armor.cloth.silken.pants": ( "common.items.armor.cloth.silken.pants": (
vox_spec: ("armor.cloth.silken.pants", (-5.0, -4.0, 0.5)), vox_spec: ("armor.cloth.silken.pants", (-5.0, -3.5, 0.0)),
color: None color: None
), ),
"common.items.armor.cloth.druid.pants": ( "common.items.armor.cloth.druid.pants": (
vox_spec: ("armor.cloth.druid.pants", (-5.0, -4.0, 0.5)), vox_spec: ("armor.cloth.druid.pants", (-5.0, -3.5, -1.0)),
color: None color: None
), ),
"common.items.armor.cloth.moonweave.pants": ( "common.items.armor.cloth.moonweave.pants": (
vox_spec: ("armor.cloth.moonweave.pants", (-6.0, -5.5, 0.5)), vox_spec: ("armor.cloth.moonweave.pants", (-6.0, -4.5, 0.0)),
color: None color: None
), ),
"common.items.armor.cloth.sunsilk.pants": ( "common.items.armor.cloth.sunsilk.pants": (
vox_spec: ("armor.cloth.sunsilk.pants", (-6.0, -5.0, 0.5)), vox_spec: ("armor.cloth.sunsilk.pants", (-6.0, -4.5, 0.0)),
color: None color: None
), ),
"common.items.armor.mail.bronze.pants": ( "common.items.armor.mail.bronze.pants": (
vox_spec: ("armor.mail.bronze.pants", (-5.0, -4.0, 1.0)), vox_spec: ("armor.mail.bronze.pants", (-5.0, -3.5, 1.0)),
color: None color: None
), ),
"common.items.armor.mail.iron.pants": ( "common.items.armor.mail.iron.pants": (
vox_spec: ("armor.mail.iron.pants", (-5.0, -4.0, 1.5)), vox_spec: ("armor.mail.iron.pants", (-5.0, -3.5, 1.0)),
color: None color: None
), ),
"common.items.armor.mail.steel.pants": ( "common.items.armor.mail.steel.pants": (
vox_spec: ("armor.mail.steel.pants", (-6.0, -4.0, 0.0)), vox_spec: ("armor.mail.steel.pants", (-6.0, -3.5, 1.0)),
color: None color: None
), ),
"common.items.armor.mail.cobalt.pants": ( "common.items.armor.mail.cobalt.pants": (
vox_spec: ("armor.mail.cobalt.pants", (-6.0, -5.0, 0.5)), vox_spec: ("armor.mail.cobalt.pants", (-6.0, -5.5, 1.0)),
color: None color: None
), ),
"common.items.armor.mail.bloodsteel.pants": ( "common.items.armor.mail.bloodsteel.pants": (
vox_spec: ("armor.mail.bloodsteel.pants", (-7.0, -4.0, 0.5)), vox_spec: ("armor.mail.bloodsteel.pants", (-7.0, -4.5, 0.0)),
color: None color: None
), ),
"common.items.armor.mail.orichalcum.pants": ( "common.items.armor.mail.orichalcum.pants": (
vox_spec: ("armor.mail.orichalcum", (-6.0, -4.0, 0.5), 1), vox_spec: ("armor.mail.orichalcum", (-6.0, -3.5, -1.0), 1),
color: None color: None
), ),
"common.items.armor.cardinal.pants": ( "common.items.armor.cardinal.pants": (

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

@ -53,61 +53,61 @@
), ),
"common.items.armor.boreal.shoulder": ( "common.items.armor.boreal.shoulder": (
left: ( left: (
vox_spec: ("armor.boreal.shoulder", (-3.5, -3.5, -3.0)), vox_spec: ("armor.boreal.shoulder", (-4.0, -3.5, -2.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.boreal.shoulder", (-1.5, -3.5, -3.0)), vox_spec: ("armor.boreal.shoulder", (-1.0, -3.5, -2.0)),
color: None color: None
) )
), ),
"common.items.armor.brinestone.shoulder": ( "common.items.armor.brinestone.shoulder": (
left: ( left: (
vox_spec: ("armor.brinestone.shoulder", (-5.0, -3.5, -2.0)), vox_spec: ("armor.brinestone.shoulder", (-6.0, -3.5, -2.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.brinestone.shoulder", (-3.0, -3.5, -2.0)), vox_spec: ("armor.brinestone.shoulder", (-2.0, -3.5, -2.0)),
color: None color: None
) )
), ),
"common.items.armor.cloth_purple.shoulder": ( "common.items.armor.cloth_purple.shoulder": (
left: ( left: (
vox_spec: ("armor.cloth_purple.shoulder", (-3.2, -3.5, 0.0)), vox_spec: ("armor.cloth_purple.shoulder", (-4.0, -3.5, -1.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.cloth_purple.shoulder", (-1.8, -3.5, 0.0)), vox_spec: ("armor.cloth_purple.shoulder", (-1.0, -3.5, -1.0)),
color: None color: None
) )
), ),
"common.items.armor.cloth_blue.shoulder_0": ( "common.items.armor.cloth_blue.shoulder_0": (
left: ( left: (
vox_spec: ("armor.cloth_blue.shoulder_0", (-3.2, -3.5, 0.0)), vox_spec: ("armor.cloth_blue.shoulder_0", (-4.0, -3.5, -1.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.cloth_blue.shoulder_0", (-1.8, -3.5, 0.0)), vox_spec: ("armor.cloth_blue.shoulder_0", (-1.0, -3.5, -1.0)),
color: None color: None
) )
), ),
"common.items.armor.cloth_green.shoulder": ( "common.items.armor.cloth_green.shoulder": (
left: ( left: (
vox_spec: ("armor.cloth_green.shoulder", (-3.2, -3.5, 0.0)), vox_spec: ("armor.cloth_green.shoulder", (-4.0, -3.5, -1.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.cloth_green.shoulder", (-1.8, -3.5, 0.0)), vox_spec: ("armor.cloth_green.shoulder", (-1.0, -3.5, -1.0)),
color: None color: None
) )
), ),
"common.items.armor.cultist.shoulder": ( "common.items.armor.cultist.shoulder": (
left: ( left: (
vox_spec: ("armor.cultist.shoulder", (-2.0, -3.5, 0.0)), vox_spec: ("armor.cultist.shoulder", (-3.0, -3.5, -2.0)),
color: Some((30, 0, 64)) color: Some((30, 0, 64))
), ),
right: ( right: (
vox_spec: ("armor.cultist.shoulder", (-2.9, -3.5, 0.0)), vox_spec: ("armor.cultist.shoulder", (-2.0, -3.5, -2.0)),
color: Some((30, 0, 64)) color: Some((30, 0, 64))
) )
), ),
@ -123,31 +123,31 @@
), ),
"common.items.armor.twigs.shoulder": ( "common.items.armor.twigs.shoulder": (
left: ( left: (
vox_spec: ("armor.twigs.shoulder", (-5.0, -4.5 , -1.0)), vox_spec: ("armor.twigs.shoulder", (-5.0, -4.0 , -1.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.twigs.shoulder", (-1.0, -4.5, -1.0)), vox_spec: ("armor.twigs.shoulder", (-1.0, -4.0, -1.0)),
color: None color: None
) )
), ),
"common.items.armor.twigsleaves.shoulder": ( "common.items.armor.twigsleaves.shoulder": (
left: ( left: (
vox_spec: ("armor.twigsleaves.shoulder", (-5.5, -5.0 , 0.0)), vox_spec: ("armor.twigsleaves.shoulder", (-6.0, -5.0 , -1.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.twigsleaves.shoulder", (-1.5, -5.0, 0.0)), vox_spec: ("armor.twigsleaves.shoulder", (-1.0, -5.0, -1.0)),
color: None color: None
) )
), ),
"common.items.armor.twigsflowers.shoulder": ( "common.items.armor.twigsflowers.shoulder": (
left: ( left: (
vox_spec: ("armor.twigsflowers.shoulder", (-5.5, -5.0 , 0.0)), vox_spec: ("armor.twigsflowers.shoulder", (-6.0, -4.0 , -2.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.twigsflowers.shoulder", (-1.5, -5.0, 0.0)), vox_spec: ("armor.twigsflowers.shoulder", (-1.0, -4.0, -2.0)),
color: None color: None
), ),
), ),
@ -263,71 +263,71 @@
), ),
"common.items.armor.hide.rawhide.shoulder": ( "common.items.armor.hide.rawhide.shoulder": (
left: ( left: (
vox_spec: ("armor.hide.rawhide.shoulder", (-4.0, -3.2, -0.5)), vox_spec: ("armor.hide.rawhide.shoulder", (-4.0, -3.5, -1.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.hide.rawhide.shoulder", (-1.0, -3.2, -0.5)), vox_spec: ("armor.hide.rawhide.shoulder", (-1.0, -3.5, -1.0)),
color: None color: None
) )
), ),
"common.items.armor.hide.leather.shoulder": ( "common.items.armor.hide.leather.shoulder": (
left: ( left: (
vox_spec: ("armor.hide.leather.shoulder", (-5.5, -3.2, -1.8)), vox_spec: ("armor.hide.leather.shoulder", (-5.0, -3.5, -2.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.hide.leather.shoulder", (-0.5, -3.2, -1.8)), vox_spec: ("armor.hide.leather.shoulder", (-1.0, -3.5, -2.0)),
color: None color: None
) )
), ),
"common.items.armor.miner.shoulder": ( "common.items.armor.miner.shoulder": (
left: ( left: (
vox_spec: ("armor.hide.leather.shoulder", (-5.5, -3.2, -1.8)), vox_spec: ("armor.hide.leather.shoulder", (-5.0, -3.5, -2.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.hide.leather.shoulder", (-0.5, -3.2, -1.8)), vox_spec: ("armor.hide.leather.shoulder", (-1.0, -3.5, -2.0)),
color: None color: None
) )
), ),
"common.items.armor.hide.scale.shoulder": ( "common.items.armor.hide.scale.shoulder": (
left: ( left: (
vox_spec: ("armor.hide.scale.shoulder", (-6.2, -3.5 , -0.5)), vox_spec: ("armor.hide.scale.shoulder", (-5.0, -3.5, -1.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.hide.scale.shoulder", (0.4, -3.5, -0.5)), vox_spec: ("armor.hide.scale.shoulder", (-1.0, -3.5, -1.0)),
color: None color: None
) )
), ),
"common.items.armor.hide.carapace.shoulder": ( "common.items.armor.hide.carapace.shoulder": (
left: ( left: (
vox_spec: ("armor.hide.carapace.shoulder", (-6.0, -4.0 , -2.0)), vox_spec: ("armor.hide.carapace.shoulder", (-6.0, -3.5, -3.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.hide.carapace.shoulder", (-1.0, -4.0, -2.0)), vox_spec: ("armor.hide.carapace.shoulder", (-1.0, -3.5, -3.0)),
color: None color: None
) )
), ),
"common.items.armor.hide.primal.shoulder": ( "common.items.armor.hide.primal.shoulder": (
left: ( left: (
vox_spec: ("armor.hide.primal.shoulder", (-6.0, -4.0 , -3.0)), vox_spec: ("armor.hide.primal.shoulder", (-6.0, -3.5, -3.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.hide.primal.shoulder", (-1.0, -4.0, -3.0)), vox_spec: ("armor.hide.primal.shoulder", (-1.0, -3.5, -3.0)),
color: None color: None
) )
), ),
"common.items.armor.hide.dragonscale.shoulder": ( "common.items.armor.hide.dragonscale.shoulder": (
left: ( left: (
vox_spec: ("armor.hide.dragonscale.shoulder", (-9.0, -3.5 , -1.0)), vox_spec: ("armor.hide.dragonscale.shoulder", (-8.0, -3.5 , -1.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.hide.dragonscale.shoulder", (0.0, -3.5, -1.0)), vox_spec: ("armor.hide.dragonscale.shoulder", (-1.0, -3.5, -1.0)),
color: None color: None
) )
), ),
@ -363,121 +363,121 @@
), ),
"common.items.armor.cloth.linen.shoulder": ( "common.items.armor.cloth.linen.shoulder": (
left: ( left: (
vox_spec: ("armor.cloth.linen.shoulder", (-3.5, -4.0 , -1.0)), vox_spec: ("armor.cloth.linen.shoulder", (-3.0, -3.5 , -1.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.cloth.linen.shoulder", (-0.5, -4.0, -1.0)), vox_spec: ("armor.cloth.linen.shoulder", (-1.0, -3.5, -1.0)),
color: None color: None
) )
), ),
"common.items.armor.cloth.woolen.shoulder": ( "common.items.armor.cloth.woolen.shoulder": (
left: ( left: (
vox_spec: ("armor.cloth.woolen.shoulder", (-5.5, -4.0 , -3.0)), vox_spec: ("armor.cloth.woolen.shoulder", (-5.0, -3.5, -3.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.cloth.woolen.shoulder", (-0.5, -4.0, -3.0)), vox_spec: ("armor.cloth.woolen.shoulder", (-1.0, -3.5, -3.0)),
color: None color: None
) )
), ),
"common.items.armor.cloth.silken.shoulder": ( "common.items.armor.cloth.silken.shoulder": (
left: ( left: (
vox_spec: ("armor.cloth.silken.shoulder", (-5.0, -4.0 , -2.0)), vox_spec: ("armor.cloth.silken.shoulder", (-5.0, -3.5 , -1.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.cloth.silken.shoulder", (-1.0, -4.0, -2.0)), vox_spec: ("armor.cloth.silken.shoulder", (-1.0, -3.5, -1.0)),
color: None color: None
) )
), ),
"common.items.armor.cloth.druid.shoulder": ( "common.items.armor.cloth.druid.shoulder": (
left: ( left: (
vox_spec: ("armor.cloth.druid.shoulder", (-4.5, -4.0 , -3.5)), vox_spec: ("armor.cloth.druid.shoulder", (-5.0, -4.5 , -4.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.cloth.druid.shoulder", (-1.5, -4.0, -3.5)), vox_spec: ("armor.cloth.druid.shoulder", (-1.0, -4.5, -4.0)),
color: None color: None
) )
), ),
"common.items.armor.cloth.moonweave.shoulder": ( "common.items.armor.cloth.moonweave.shoulder": (
left: ( left: (
vox_spec: ("armor.cloth.moonweave.shoulder", (-4.5, -4.0 , -3.0)), vox_spec: ("armor.cloth.moonweave.shoulder", (-5.0, -3.5 , -3.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.cloth.moonweave.shoulder", (-1.5, -4.0, -3.0)), vox_spec: ("armor.cloth.moonweave.shoulder", (-1.0, -3.5, -3.0)),
color: None color: None
) )
), ),
"common.items.armor.cloth.sunsilk.shoulder": ( "common.items.armor.cloth.sunsilk.shoulder": (
left: ( left: (
vox_spec: ("armor.cloth.sunsilk.shoulder", (-6.5, -4.0 , -2.0)), vox_spec: ("armor.cloth.sunsilk.shoulder", (-6.0, -3.5 , -1.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.cloth.sunsilk.shoulder", (-0.5, -4.0, -2.0)), vox_spec: ("armor.cloth.sunsilk.shoulder", (-1.0, -3.5, -1.0)),
color: None color: None
) )
), ),
"common.items.armor.mail.bronze.shoulder": ( "common.items.armor.mail.bronze.shoulder": (
left: ( left: (
vox_spec: ("armor.mail.bronze.shoulder", (-4.5, -4.0 , 0.0)), vox_spec: ("armor.mail.bronze.shoulder", (-5.0, -3.5 , -1.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.mail.bronze.shoulder", (-1.5, -4.0, 0.0)), vox_spec: ("armor.mail.bronze.shoulder", (-1.0, -3.5, -1.0)),
color: None color: None
) )
), ),
"common.items.armor.mail.iron.shoulder": ( "common.items.armor.mail.iron.shoulder": (
left: ( left: (
vox_spec: ("armor.mail.iron.shoulder", (-5.5, -4.0 , -1.0)), vox_spec: ("armor.mail.iron.shoulder", (-5.0, -3.5, -1.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.mail.iron.shoulder", (-0.5, -4.0, -1.0)), vox_spec: ("armor.mail.iron.shoulder", (-1.0, -3.5, -1.0)),
color: None color: None
) )
), ),
"common.items.armor.mail.steel.shoulder": ( "common.items.armor.mail.steel.shoulder": (
left: ( left: (
vox_spec: ("armor.mail.steel.shoulder", (-5.5, -3.0 , -2.0)), vox_spec: ("armor.mail.steel.shoulder", (-6.0, -3.5 , -1.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.mail.steel.shoulder", (-1.5, -3.0, -2.0)), vox_spec: ("armor.mail.steel.shoulder", (-1.0, -3.5, -1.0)),
color: None color: None
) )
), ),
"common.items.armor.mail.cobalt.shoulder": ( "common.items.armor.mail.cobalt.shoulder": (
left: ( left: (
vox_spec: ("armor.mail.cobalt.shoulder", (-5.5, -4.0 , -1.0)), vox_spec: ("armor.mail.cobalt.shoulder", (-6.0, -4.5 , -1.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.mail.cobalt.shoulder", (-1.5, -4.0, -1.0)), vox_spec: ("armor.mail.cobalt.shoulder", (-1.0, -4.5, -1.0)),
color: None color: None
) )
), ),
"common.items.armor.mail.bloodsteel.shoulder": ( "common.items.armor.mail.bloodsteel.shoulder": (
left: ( left: (
vox_spec: ("armor.mail.bloodsteel.shoulder", (-6.5, -5.0 , -3.0)), vox_spec: ("armor.mail.bloodsteel.shoulder", (-8.0, -5.5, -2.0)),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.mail.bloodsteel.shoulder", (-2.5, -5.0, -3.0)), vox_spec: ("armor.mail.bloodsteel.shoulder", (-1.0, -5.5, -2.0)),
color: None color: None
) )
), ),
"common.items.armor.mail.orichalcum.shoulder": ( "common.items.armor.mail.orichalcum.shoulder": (
left: ( left: (
vox_spec: ("armor.mail.orichalcum", (-7.5, -3.0 , -2.0), 5), vox_spec: ("armor.mail.orichalcum", (-8.0, -3.5, -2.0), 5),
color: None color: None
), ),
right: ( right: (
vox_spec: ("armor.mail.orichalcum", (-1.5, -3.0, -2.0), 5), vox_spec: ("armor.mail.orichalcum", (-1.0, -3.5, -2.0), 5),
color: None color: None
) )
), ),