diff --git a/assets/common/items/armor/misc/head/bandana/red.ron b/assets/common/items/armor/misc/head/bandana/red.ron new file mode 100644 index 0000000000..2f8db4475a --- /dev/null +++ b/assets/common/items/armor/misc/head/bandana/red.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Red Bandana", + description: "yep.", + kind: Armor(( + kind: Head("Red"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/common/items/armor/misc/head/bandana/thief.ron b/assets/common/items/armor/misc/head/bandana/thief.ron new file mode 100644 index 0000000000..352160a078 --- /dev/null +++ b/assets/common/items/armor/misc/head/bandana/thief.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Thief Bandana", + description: "yep.", + kind: Armor(( + kind: Head("Thief"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/common/items/armor/misc/head/helmet.ron b/assets/common/items/armor/misc/head/helmet.ron new file mode 100644 index 0000000000..79d40e3194 --- /dev/null +++ b/assets/common/items/armor/misc/head/helmet.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Helmet", + description: "yep.", + kind: Armor(( + kind: Head("Helmet"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/common/items/armor/misc/head/hood.ron b/assets/common/items/armor/misc/head/hood.ron new file mode 100644 index 0000000000..5f2d54fc13 --- /dev/null +++ b/assets/common/items/armor/misc/head/hood.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Hood", + description: "yep.", + kind: Armor(( + kind: Head("Hood"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/common/items/armor/misc/head/straw.ron b/assets/common/items/armor/misc/head/straw.ron new file mode 100644 index 0000000000..4b0df4af9e --- /dev/null +++ b/assets/common/items/armor/misc/head/straw.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Straw Hat", + description: "yep.", + kind: Armor(( + kind: Head("Straw"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 9d3d8b2c0f..27a75fc0c5 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -2145,6 +2145,27 @@ "voxel.armor.misc.back.backpack", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), + //Hats + Armor(Head("Witch")): VoxTrans( + "voxel.armor.witch.hat", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Armor(Head("Pirate")): VoxTrans( + "voxel.armor.pirate.hat", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), + Armor(Head("Thief")): VoxTrans( + "voxel.armor.misc.head.bandana.thief", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.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, + ), + Armor(Head("Straw")): VoxTrans( + "voxel.armor.misc.head.straw", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, + ), // Rings Armor(Ring("Scratched")): VoxTrans( "voxel.armor.misc.ring.scratched", diff --git a/assets/voxygen/voxel/armor/misc/head/bandana/red.vox b/assets/voxygen/voxel/armor/misc/head/bandana/red.vox new file mode 100644 index 0000000000..4a12f6a0ea Binary files /dev/null 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 new file mode 100644 index 0000000000..04e634f692 Binary files /dev/null and b/assets/voxygen/voxel/armor/misc/head/bandana/thief.vox differ diff --git a/assets/voxygen/voxel/armor/misc/head/helmet.vox b/assets/voxygen/voxel/armor/misc/head/helmet.vox new file mode 100644 index 0000000000..f511dc701e Binary files /dev/null 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 new file mode 100644 index 0000000000..da7100c783 Binary files /dev/null and b/assets/voxygen/voxel/armor/misc/head/hood.vox differ diff --git a/assets/voxygen/voxel/armor/misc/head/straw.vox b/assets/voxygen/voxel/armor/misc/head/straw.vox new file mode 100644 index 0000000000..8f7f3c1f7f Binary files /dev/null and b/assets/voxygen/voxel/armor/misc/head/straw.vox differ diff --git a/assets/voxygen/voxel/armor/pirate/hat.vox b/assets/voxygen/voxel/armor/pirate/hat.vox index e0e802f277..7d1468080c 100644 Binary files a/assets/voxygen/voxel/armor/pirate/hat.vox and b/assets/voxygen/voxel/armor/pirate/hat.vox differ diff --git a/assets/voxygen/voxel/armor/witch/hat.vox b/assets/voxygen/voxel/armor/witch/hat.vox index 1c457bd635..4491a21794 100644 Binary files a/assets/voxygen/voxel/armor/witch/hat.vox and b/assets/voxygen/voxel/armor/witch/hat.vox differ diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index d92dd8f091..c91adf7379 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -7,19 +7,19 @@ (Danari, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-10.0, -10.0, 20.0)), color: None - ),//fix + ), (Dwarf, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-13.0, -10.0, 18.0)), color: None - ),//fix + ), (Human, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-12.0, -11.0, 18.0)), color: None - ),//fix + ), (Orc, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-11.0, -12.0, 18.0)), color: None - ),//fix + ), (Undead, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-14.0, -11.0, 18.0)), color: None @@ -27,15 +27,156 @@ (Elf, Male, "Exclamation"): ( vox_spec: ("armor.misc.head.exclamation", (-11.0, -11.0, 18.0)), color: None - ),//fix - (Human, Female, "Witch"): ( - vox_spec: ("armor.witch.hat", (-4.0, -4.0, 5.0)), + ), + // + (Human, Male, "Witch"): ( + vox_spec: ("armor.witch.hat", (-4.0, -5.0, 5.0)), color: None ), - (Human, Female, "Pirate"): ( + (Human, Female, "Witch"): ( + vox_spec: ("armor.witch.hat", (-4.0, -5.0, 5.0)), + color: None + ), + (Elf, Male, "Witch"): ( + vox_spec: ("armor.witch.hat", (-3.0, -5.0, 5.0)), + color: None + ), + (Elf, Female, "Witch"): ( + vox_spec: ("armor.witch.hat", (-3.0, -6.0, 5.0)), + color: None + ), + (Dwarf, Male, "Witch"): ( + vox_spec: ("armor.witch.hat", (-5.0, -4.0, 5.0)), + color: None + ), + (Dwarf, Female, "Witch"): ( + vox_spec: ("armor.witch.hat", (-5.0, -4.0, 5.0)), + color: None + ), + (Danari, Male, "Witch"): ( + vox_spec: ("armor.witch.hat", (-2.0, -5.0, 7.0)), + color: None + ), + (Danari, Female, "Witch"): ( + vox_spec: ("armor.witch.hat", (-2.0, -5.0, 7.0)), + color: None + ), + (Undead, Male, "Witch"): ( + vox_spec: ("armor.witch.hat", (-6.0, -5.0, 7.0)), + color: None + ), + (Undead, Female, "Witch"): ( + vox_spec: ("armor.witch.hat", (-6.0, -5.0, 6.0)), + color: None + ), + (Orc, Male, "Witch"): ( + vox_spec: ("armor.witch.hat", (-3.0, -3.0, 8.0)), + color: None + ), + (Orc, Female, "Witch"): ( + vox_spec: ("armor.witch.hat", (-3.0, -6.0, 5.0)), + color: None + ), + // + (Human, Male, "Pirate"): ( vox_spec: ("armor.pirate.hat", (-2.0, -2.0, 5.0)), color: None ), + (Human, Female, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-2.0, -1.0, 5.0)), + color: None + ), + (Elf, Male, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-1.0, -1.0, 5.0)), + color: None + ), + (Elf, Female, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-1.0, -2.0, 5.0)), + color: None + ), + (Dwarf, Male, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-3.0, -0.0, 5.0)), + color: None + ), + (Dwarf, Female, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-3.0, -0.0, 5.0)), + color: None + ), + (Danari, Male, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-0.0, -2.0, 7.0)), + color: None + ), + (Danari, Female, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-0.0, -2.0, 7.0)), + color: None + ), + (Undead, Male, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-4.0, -2.0, 7.0)), + color: None + ), + (Undead, Female, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-4.0, -2.0, 6.0)), + color: None + ), + (Orc, Male, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-1.0, -1.0, 8.0)), + color: None + ), + (Orc, Female, "Pirate"): ( + vox_spec: ("armor.pirate.hat", (-1.0, -2.0, 5.0)), + color: None + ), + // + // + (Human, Male, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-3.0, -3.0, 5.0)), + color: None + ), + (Human, Female, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-3.0, -3.0, 5.0)), + color: None + ), + (Elf, Male, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-2.0, -3.0, 5.0)), + color: None + ), + (Elf, Female, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-2.0, -4.0, 5.0)), + color: None + ), + (Dwarf, Male, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-4.0, -3.0, 5.0)), + color: None + ), + (Dwarf, Female, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-4.0, -3.0, 5.0)), + color: None + ), + (Danari, Male, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-1.0, -4.0, 7.0)), + color: None + ), + (Danari, Female, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-1.0, -4.0, 7.0)), + color: None + ), + (Undead, Male, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-5.0, -4.0, 7.0)), + color: None + ), + (Undead, Female, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-5.0, -3.0, 6.0)), + color: None + ), + (Orc, Male, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-2.0, -2.0, 8.0)), + color: None + ), + (Orc, Female, "Straw"): ( + vox_spec: ("armor.misc.head.straw", (-2.0, -5.0, 5.0)), + color: None + ), + // (Danari, Male, "Headband"): ( vox_spec: ("armor.misc.head.headband.danari_m", (4.0, 2.0, 7.0)), color: None @@ -84,5 +225,157 @@ 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)), + color: None + ), + (Human, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + color: None + ), + (Elf, Female, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + color: None + ), + (Elf, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + color: None + ), + (Orc, Female, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-1.0, -5.0, -1.0)), + color: None + ), + (Orc, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-1.0, -3.0, 2.0)), + color: None + ), + (Dwarf, Female, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-3.0, -3.0, -1.0)), + color: None + ), + (Dwarf, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-3.0, -3.0, -1.0)), + color: None + ), + (Undead, Female, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-4.0, -4.0, -1.0)), + color: None + ), + (Undead, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-4.0, -4.0, 1.0)), + color: None + ), + (Danari, Female, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (0.0, -4.0, 1.0)), + color: None + ), + (Danari, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-2.0, -3.0, -1.0)), + color: None + ), + (Danari, Male, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (4.0, 6.0, -8.0)), + color: None + ), + (Danari, Female, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (4.0, 6.0, -8.0)), + color: None + ), + (Dwarf, Male, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (1.0, 7.0, -10.0)), + color: None + ), + (Dwarf, Female, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (1.0, 7.0, -10.0)), + color: None + ), + (Human, Male, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (2.0, 6.0, -10.0)), + color: None + ), + (Human, Female, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (2.0, 7.0, -10.0)), + color: None + ), + (Undead, Male, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (0.0, 6.0, -8.0)), + color: None + ), + (Undead, Female, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (0.0, 6.0, -9.0)), + color: None + ), + (Elf, Male, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (3.0, 6.0, -10.0)), + color: None + ), + (Elf, Female, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (3.0, 6.0, -10.0)), + color: None + ), + (Orc, Male, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (3.0, 8.0, -8.0)), + color: None + ), + (Orc, Female, "Red"): ( + vox_spec: ("armor.misc.head.bandana.red", (3.0, 6.0, -10.0)), + color: None + ), + (Danari, Male, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (4.0, 6.0, -8.0)), + color: None + ), + (Danari, Female, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (4.0, 6.0, -8.0)), + color: None + ), + (Dwarf, Male, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (1.0, 7.0, -10.0)), + color: None + ), + (Dwarf, Female, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (1.0, 7.0, -10.0)), + color: None + ), + (Human, Male, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (2.0, 6.0, -10.0)), + color: None + ), + (Human, Female, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (2.0, 7.0, -10.0)), + color: None + ), + (Undead, Male, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (0.0, 6.0, -8.0)), + color: None + ), + (Undead, Female, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (0.0, 6.0, -9.0)), + color: None + ), + (Elf, Male, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (3.0, 6.0, -10.0)), + color: None + ), + (Elf, Female, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (3.0, 6.0, -10.0)), + color: None + ), + (Orc, Male, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (3.0, 8.0, -8.0)), + color: None + ), + (Orc, Female, "Thief"): ( + vox_spec: ("armor.misc.head.bandana.thief", (3.0, 6.0, -10.0)), + color: None + ), + (Human, Male, "Hood"): ( + vox_spec: ("armor.misc.head.hood", (1.0, 0.0, -1.0)), + color: None + ), + (Orc, Female, "Hood"): ( + vox_spec: ("armor.misc.head.hood", (2.0, -1.0, -1.0)), + color: None + ), } ))