diff --git a/assets/common/entity/spot/pirate.ron b/assets/common/entity/spot/pirate.ron index 5af961727c..9e449d2bdb 100644 --- a/assets/common/entity/spot/pirate.ron +++ b/assets/common/entity/spot/pirate.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("humanoid"), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.creature.biped_large.saurok"), + loot: LootTable("common.loot_tables.spots.pirate"), hands: Paired(Item("common.items.weapons.sword_1h.iron-2")), diff --git a/assets/common/loadout/village/villager.ron b/assets/common/loadout/village/villager.ron index 4a72373387..2b460e776a 100644 --- a/assets/common/loadout/village/villager.ron +++ b/assets/common/loadout/village/villager.ron @@ -20,7 +20,7 @@ (1.0, Some(Item("common.items.armor.cloth_blue.foot"))), ]), Armor(Head): Choice([ - (1.0, Some(Item("common.items.armor.misc.head.straw"))), + (1.0, Some(Item("common.items.armor.misc.head.spikeguard"))), ]), }) diff --git a/assets/common/loot_tables/dungeon/tier-4/miniboss.ron b/assets/common/loot_tables/dungeon/tier-4/miniboss.ron index 7b3e66714b..e384bcaa07 100644 --- a/assets/common/loot_tables/dungeon/tier-4/miniboss.ron +++ b/assets/common/loot_tables/dungeon/tier-4/miniboss.ron @@ -8,5 +8,5 @@ // lantern (1.0, Item("common.items.lantern.blue_0")), // gear - (3.0, ItemQuantity("common.items.armor.misc.head.mitre")), + (3.0, Item("common.items.armor.misc.head.mitre")), ] diff --git a/assets/common/loot_tables/dungeon/tier-5/chest.ron b/assets/common/loot_tables/dungeon/tier-5/chest.ron index b3e2e6f89e..39bcf4ccf9 100644 --- a/assets/common/loot_tables/dungeon/tier-5/chest.ron +++ b/assets/common/loot_tables/dungeon/tier-5/chest.ron @@ -1,7 +1,7 @@ [ // Gear (1.0, LootTable("common.loot_tables.weapons.tier-4")), - (1.0, LootTable("common.loot_tables.armor.tier-4")), + (1.0, Item("common.loot_tables.armor.tier-4")), (0.3, ItemQuantity("common.items.armor.cultist.bandana")), // Currency (3.0, ItemQuantity("common.items.utility.coins", 200, 500)), diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index a44abbd4ed..117d8b69f0 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1168,7 +1168,7 @@ ), Armor(Head("Cultist")): VoxTrans( "voxel.armor.cultist.bandana", - (0.0, 1.0, 0.0), (-120.0, 210.0,15.0), 1.1, + (0.0, -2.0, 0.0), (-120.0, 210.0,15.0), 1.9, ), // Villager Clothing Armor(Pants("WorkerBlue")): VoxTrans( @@ -2143,7 +2143,7 @@ ), Armor(Back("Backpack")): VoxTrans( "voxel.armor.misc.back.backpack", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + (0.0, 0.0, 0.0), (-75.0, 45.0,0.0), 0.9, ), Armor(Back("BackpackBlue")): VoxTrans( "voxel.armor.misc.back.backpack", @@ -2156,15 +2156,15 @@ ), Armor(Head("Pirate")): VoxTrans( "voxel.armor.pirate.hat", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + (1.0, 2.0, 0.0), (-120.0, 210.0,15.0), 1.0, ), Armor(Head("Thief")): VoxTrans( "voxel.armor.misc.head.bandana.thief", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + (0.0, -2.0, 0.0), (-120.0, 210.0,15.0), 1.9, ), Armor(Head("Red")): VoxTrans( "voxel.armor.misc.head.bandana.red", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + (0.0, -2.0, 0.0), (-120.0, 210.0,15.0), 1.9, ), Armor(Head("Straw")): VoxTrans( "voxel.armor.misc.head.straw", @@ -2172,23 +2172,19 @@ ), Armor(Head("Hood")): VoxTrans( "voxel.armor.misc.head.hood", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), Armor(Head("Crown")): VoxTrans( "voxel.armor.misc.head.crown", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + (0.0, 4.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), Armor(Head("Mitre")): VoxTrans( "voxel.armor.misc.head.mitre", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, - ), - Armor(Head("Mitre")): VoxTrans( - "voxel.armor.misc.head.mitre", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + (0.0, 4.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), Armor(Head("Spikeguard")): VoxTrans( "voxel.armor.misc.head.spikeguard", - (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), // Rings Armor(Ring("Scratched")): VoxTrans( diff --git a/assets/voxygen/voxel/armor/cultist/bandana.vox b/assets/voxygen/voxel/armor/cultist/bandana.vox index a22a7f09f7..019f8f86bd 100644 Binary files a/assets/voxygen/voxel/armor/cultist/bandana.vox and b/assets/voxygen/voxel/armor/cultist/bandana.vox differ diff --git a/assets/voxygen/voxel/armor/misc/head/bandana/red.vox b/assets/voxygen/voxel/armor/misc/head/bandana/red.vox index 4a12f6a0ea..6247ab04de 100644 Binary files a/assets/voxygen/voxel/armor/misc/head/bandana/red.vox and b/assets/voxygen/voxel/armor/misc/head/bandana/red.vox differ diff --git a/assets/voxygen/voxel/armor/misc/head/bandana/thief.vox b/assets/voxygen/voxel/armor/misc/head/bandana/thief.vox index 04e634f692..1cdfe57a7d 100644 Binary files a/assets/voxygen/voxel/armor/misc/head/bandana/thief.vox and b/assets/voxygen/voxel/armor/misc/head/bandana/thief.vox differ diff --git a/assets/voxygen/voxel/armor/misc/head/crown.vox b/assets/voxygen/voxel/armor/misc/head/crown.vox index 6152f3f265..8b8977b996 100644 Binary files a/assets/voxygen/voxel/armor/misc/head/crown.vox and b/assets/voxygen/voxel/armor/misc/head/crown.vox differ diff --git a/assets/voxygen/voxel/armor/misc/head/helmet.vox b/assets/voxygen/voxel/armor/misc/head/helmet.vox index f511dc701e..9b28f45889 100644 Binary files a/assets/voxygen/voxel/armor/misc/head/helmet.vox and b/assets/voxygen/voxel/armor/misc/head/helmet.vox differ diff --git a/assets/voxygen/voxel/armor/misc/head/hood.vox b/assets/voxygen/voxel/armor/misc/head/hood.vox index 0e9a1f2886..e918f8e71b 100644 Binary files a/assets/voxygen/voxel/armor/misc/head/hood.vox and b/assets/voxygen/voxel/armor/misc/head/hood.vox differ diff --git a/assets/voxygen/voxel/armor/misc/head/hood_dark.vox b/assets/voxygen/voxel/armor/misc/head/hood_dark.vox index 5405de2410..f6561cc48d 100644 Binary files a/assets/voxygen/voxel/armor/misc/head/hood_dark.vox and b/assets/voxygen/voxel/armor/misc/head/hood_dark.vox differ diff --git a/assets/voxygen/voxel/armor/misc/head/mitre.vox b/assets/voxygen/voxel/armor/misc/head/mitre.vox index 899ca2794b..647d75fcef 100644 Binary files a/assets/voxygen/voxel/armor/misc/head/mitre.vox and b/assets/voxygen/voxel/armor/misc/head/mitre.vox differ diff --git a/assets/voxygen/voxel/armor/misc/head/spikeguard.vox b/assets/voxygen/voxel/armor/misc/head/spikeguard.vox index fedf0a8a0f..de5a6993c4 100644 Binary files a/assets/voxygen/voxel/armor/misc/head/spikeguard.vox and b/assets/voxygen/voxel/armor/misc/head/spikeguard.vox differ diff --git a/assets/voxygen/voxel/armor/misc/head/straw.vox b/assets/voxygen/voxel/armor/misc/head/straw.vox index 41dbf4887b..5603ddd411 100644 Binary files a/assets/voxygen/voxel/armor/misc/head/straw.vox and b/assets/voxygen/voxel/armor/misc/head/straw.vox differ diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index 54075ac710..2f8ecce6a3 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -322,32 +322,33 @@ vox_spec: ("armor.misc.head.headband.elf_f", (3.0, 2.0, 5.0)), color: None ), + // (Human, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + vox_spec: ("armor.misc.head.helmet", (-4.0, -5.0, -1.0)), color: None ), (Human, Male, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + vox_spec: ("armor.misc.head.helmet", (-4.0, -5.0, -1.0)), color: None ), (Elf, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + vox_spec: ("armor.misc.head.helmet", (-3.0, -5.0, -1.0)), color: None ), (Elf, Male, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + vox_spec: ("armor.misc.head.helmet", (-3.0, -5.0, -1.0)), color: None ), (Orc, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-1.0, -5.0, -1.0)), + vox_spec: ("armor.misc.head.helmet", (-3.0, -3.0, -1.0)), color: None ), (Orc, Male, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-1.0, -3.0, 2.0)), + vox_spec: ("armor.misc.head.helmet", (-3.0, -6.0, 2.0)), color: None ), (Dwarf, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-3.0, -3.0, -1.0)), + vox_spec: ("armor.misc.head.helmet", (-5.0, -4.0, -1.0)), color: None ), (Dwarf, Male, "Helmet"): ( @@ -355,313 +356,313 @@ color: None ), (Undead, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-4.0, -4.0, -1.0)), + vox_spec: ("armor.misc.head.helmet", (-6.0, -5.0, -1.0)), color: None ), (Undead, Male, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-4.0, -4.0, 1.0)), + vox_spec: ("armor.misc.head.helmet", (-6.0, -5.0, 1.0)), color: None ), (Danari, Female, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (0.0, -4.0, 1.0)), + vox_spec: ("armor.misc.head.helmet", (-2.0, -5.0, 1.0)), color: None ), (Danari, Male, "Helmet"): ( - vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + vox_spec: ("armor.misc.head.helmet", (-2.0, -5.0, -1.0)), color: None ), // (Danari, Male, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (4.0, 6.0, -8.0)), + vox_spec: ("armor.misc.head.bandana.red", (-2.0, -2.0, -8.0)), color: None ), (Danari, Female, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (4.0, 6.0, -8.0)), + vox_spec: ("armor.misc.head.bandana.red", (-2.0, -2.0, -8.0)), color: None ), (Dwarf, Male, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (1.0, 7.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.red", (-5.0, -1.0, -10.0)), color: None ), (Dwarf, Female, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (1.0, 7.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.red", (-5.0, -1.0, -10.0)), color: None ), (Human, Male, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (2.0, 6.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.red", (-4.0, -2.0, -10.0)), color: None ), (Human, Female, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (2.0, 7.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.red", (-4.0, -2.0, -10.0)), color: None ), (Undead, Male, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (0.0, 6.0, -8.0)), + vox_spec: ("armor.misc.head.bandana.red", (-6.0, -2.0, -8.0)), color: None ), (Undead, Female, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (0.0, 6.0, -9.0)), + vox_spec: ("armor.misc.head.bandana.red", (-6.0, -2.0, -9.0)), color: None ), (Elf, Male, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (3.0, 6.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.red", (-3.0, -2.0, -10.0)), color: None ), (Elf, Female, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (3.0, 6.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.red", (-3.0, -2.0, -10.0)), color: None ), (Orc, Male, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (3.0, 8.0, -8.0)), + vox_spec: ("armor.misc.head.bandana.red", (-3.0, 0.0, -8.0)), color: None ), (Orc, Female, "Red"): ( - vox_spec: ("armor.misc.head.bandana.red", (3.0, 6.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.red", (-3.0, -3.0, -10.0)), color: None ), // (Danari, Male, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (4.0, 6.0, -8.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-2.0, -2.0, -8.0)), color: None ), (Danari, Female, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (4.0, 6.0, -8.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-2.0, -2.0, -8.0)), color: None ), (Dwarf, Male, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (1.0, 7.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-5.0, -1.0, -10.0)), color: None ), (Dwarf, Female, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (1.0, 7.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-5.0, -1.0, -10.0)), color: None ), (Human, Male, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (2.0, 6.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-4.0, -2.0, -10.0)), color: None ), (Human, Female, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (2.0, 7.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-4.0, -2.0, -10.0)), color: None ), (Undead, Male, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (0.0, 6.0, -8.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-6.0, -2.0, -8.0)), color: None ), (Undead, Female, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (0.0, 6.0, -9.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-6.0, -2.0, -9.0)), color: None ), (Elf, Male, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (3.0, 6.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-3.0, -2.0, -10.0)), color: None ), (Elf, Female, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (3.0, 6.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-3.0, -2.0, -10.0)), color: None ), (Orc, Male, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (3.0, 8.0, -8.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-3.0, 0.0, -8.0)), color: None ), (Orc, Female, "Thief"): ( - vox_spec: ("armor.misc.head.bandana.thief", (3.0, 6.0, -10.0)), + vox_spec: ("armor.misc.head.bandana.thief", (-3.0, -3.0, -10.0)), color: None ), // (Danari, Male, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (4.0, 6.0, -8.0)), + vox_spec: ("armor.cultist.bandana", (-2.0, -2.0, -8.0)), color: None ), (Danari, Female, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (4.0, 6.0, -8.0)), + vox_spec: ("armor.cultist.bandana", (-2.0, -2.0, -8.0)), color: None ), (Dwarf, Male, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (1.0, 7.0, -10.0)), + vox_spec: ("armor.cultist.bandana", (-5.0, -1.0, -10.0)), color: None ), (Dwarf, Female, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (1.0, 7.0, -10.0)), + vox_spec: ("armor.cultist.bandana", (-5.0, -1.0, -10.0)), color: None ), (Human, Male, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (2.0, 6.0, -10.0)), + vox_spec: ("armor.cultist.bandana", (-4.0, -2.0, -11.0)), color: None ), (Human, Female, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (2.0, 7.0, -10.0)), + vox_spec: ("armor.cultist.bandana", (-4.0, -2.0, -10.0)), color: None ), (Undead, Male, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (0.0, 6.0, -8.0)), + vox_spec: ("armor.cultist.bandana", (-6.0, -2.0, -8.0)), color: None ), (Undead, Female, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (0.0, 6.0, -9.0)), + vox_spec: ("armor.cultist.bandana", (-6.0, -2.0, -9.0)), color: None ), (Elf, Male, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (3.0, 6.0, -10.0)), + vox_spec: ("armor.cultist.bandana", (-3.0, -2.0, -10.0)), color: None ), (Elf, Female, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (3.0, 6.0, -10.0)), + vox_spec: ("armor.cultist.bandana", (-3.0, -2.0, -10.0)), color: None ), (Orc, Male, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (3.0, 8.0, -8.0)), + vox_spec: ("armor.cultist.bandana", (-3.0, 0.0, -8.0)), color: None ), (Orc, Female, "Cultist"): ( - vox_spec: ("armor.cultist.bandana", (3.0, 6.0, -10.0)), + vox_spec: ("armor.cultist.bandana", (-3.0, -3.0, -10.0)), color: None ), // (Human, Male, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-4.0, -5.0, -2.0)), + vox_spec: ("armor.misc.head.hood", (-4.0, -6.0, -4.0)), color: None ), (Human, Female, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-4.0, -5.0, -2.0)), + vox_spec: ("armor.misc.head.hood", (-4.0, -6.0, -4.0)), color: None ), (Elf, Male, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-3.0, -5.0, -2.0)), + vox_spec: ("armor.misc.head.hood", (-3.0, -6.0, -4.0)), color: None ), (Elf, Female, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-3.0, -6.0, -2.0)), + vox_spec: ("armor.misc.head.hood", (-3.0, -7.0, -4.0)), color: None ), (Dwarf, Male, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-5.0, -4.0, -2.0)), + vox_spec: ("armor.misc.head.hood", (-5.0, -5.0, -4.0)), color: None ), (Dwarf, Female, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-5.0, -4.0, -2.0)), + vox_spec: ("armor.misc.head.hood", (-5.0, -5.0, -4.0)), color: None ), (Danari, Male, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-2.0, -5.0, 0.0)), + vox_spec: ("armor.misc.head.hood", (-2.0, -6.0, -2.0)), color: None ), (Danari, Female, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-2.0, -5.0, 0.0)), + vox_spec: ("armor.misc.head.hood", (-2.0, -6.0, -2.0)), color: None ), (Undead, Male, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-6.0, -5.0, 0.0)), + vox_spec: ("armor.misc.head.hood", (-6.0, -6.0, -2.0)), color: None ), (Undead, Female, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-6.0, -5.0, -1.0)), + vox_spec: ("armor.misc.head.hood", (-6.0, -6.0, -3.0)), color: None ), (Orc, Male, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-3.0, -3.0, 0.0)), + vox_spec: ("armor.misc.head.hood", (-3.0, -5.0, -2.0)), color: None ), (Orc, Female, "Hood"): ( - vox_spec: ("armor.misc.head.hood", (-3.0, -6.0, -2.0)), + vox_spec: ("armor.misc.head.hood", (-3.0, -7.0, -4.0)), color: None ), // (Human, Male, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-4.0, -5.0, -1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-4.0, -4.0, -1.0)), color: None ), (Human, Female, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-4.0, -5.0, -1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-4.0, -4.0, -1.0)), color: None ), (Elf, Male, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-3.0, -5.0, -1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-3.0, -4.0, -1.0)), color: None ), (Elf, Female, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-3.0, -6.0, -1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-3.0, -5.0, -1.0)), color: None ), (Dwarf, Male, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-5.0, -4.0, -1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-5.0, -3.0, -1.0)), color: None ), (Dwarf, Female, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-5.0, -4.0, -1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-5.0, -3.0, -1.0)), color: None ), (Danari, Male, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-2.0, -5.0, 1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-2.0, -4.0, 1.0)), color: None ), (Danari, Female, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-2.0, -5.0, 1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-2.0, -4.0, 1.0)), color: None ), (Undead, Male, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-6.0, -5.0, 1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-6.0, -4.0, 1.0)), color: None ), (Undead, Female, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-6.0, -5.0, -0.0)), + vox_spec: ("armor.misc.head.hood_dark", (-6.0, -4.0, -0.0)), color: None ), (Orc, Male, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-3.0, -3.0, 1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-3.0, -2.0, 1.0)), color: None ), (Orc, Female, "DarkHood"): ( - vox_spec: ("armor.misc.head.hood_dark", (-3.0, -6.0, -1.0)), + vox_spec: ("armor.misc.head.hood_dark", (-3.0, -5.0, -1.0)), color: None ), // (Human, Male, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-4.0, -5.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-4.0, -4.0, -2.0)), color: None ), (Human, Female, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-4.0, -5.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-4.0, -4.0, -2.0)), color: None ), (Elf, Male, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-3.0, -5.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-3.0, -4.0, -2.0)), color: None ), (Elf, Female, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-3.0, -6.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-3.0, -5.0, -2.0)), color: None ), (Dwarf, Male, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-5.0, -4.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-5.0, -3.0, -2.0)), color: None ), (Dwarf, Female, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-5.0, -4.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-5.0, -3.0, -2.0)), color: None ), (Danari, Male, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-2.0, -5.0, -0.0)), + vox_spec: ("armor.misc.head.spikeguard", (-2.0, -4.0, -0.0)), color: None ), (Danari, Female, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-2.0, -5.0, -0.0)), + vox_spec: ("armor.misc.head.spikeguard", (-2.0, -4.0, -0.0)), color: None ), (Undead, Male, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-6.0, -5.0, -0.0)), + vox_spec: ("armor.misc.head.spikeguard", (-6.0, -4.0, -0.0)), color: None ), (Undead, Female, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-6.0, -5.0, -1.0)), + vox_spec: ("armor.misc.head.spikeguard", (-6.0, -4.0, -1.0)), color: None ), (Orc, Male, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-3.0, -3.0, -0.0)), + vox_spec: ("armor.misc.head.spikeguard", (-3.0, -2.0, -0.0)), color: None ), (Orc, Female, "Spikeguard"): ( - vox_spec: ("armor.misc.head.spikeguard", (-3.0, -6.0, -2.0)), + vox_spec: ("armor.misc.head.spikeguard", (-3.0, -5.0, -2.0)), color: None ), } diff --git a/assets/voxygen/voxel/humanoid_head_manifest.ron b/assets/voxygen/voxel/humanoid_head_manifest.ron index 05956dce02..47c00b6117 100644 --- a/assets/voxygen/voxel/humanoid_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_head_manifest.ron @@ -1,6 +1,6 @@ ({ (Human, Male): ( - offset: (-7.0, -4.0, -2.0), + offset: (-7.0, -2.5, -2.0), head: ("figure.head.human.male", (0, 2, 0)), eyes: [ Some(("figure.eyes.general.male_default-0", (3, 9, 2))), @@ -142,7 +142,7 @@ ], ), (Elf, Male): ( - offset: (-8.0, -4.0, -2.0), + offset: (-8.0, -2.5, -2.0), head: ("figure.head.elf.male", (0, 2, 0)), eyes: [ Some(("figure.eyes.general.male_default-0", (4, 9, 2))), @@ -290,7 +290,7 @@ ] ), (Undead, Male): ( - offset: (-5.0, -4.0, -2.0), + offset: (-5.0, -4.0, -1.5), head: ("figure.head.undead.male", (0, 2, 0)), eyes: [ Some(("figure.eyes.undead.male-0", (2, 8, 4))),