From 97a3c1e713b6cc79e3798c8bb02974fc361f2ef9 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Wed, 29 Sep 2021 12:25:49 -0400 Subject: [PATCH] simple hats --- .../items/armor/misc/head/bandana/red.ron | 17 + .../items/armor/misc/head/bandana/thief.ron | 17 + .../common/items/armor/misc/head/helmet.ron | 17 + assets/common/items/armor/misc/head/hood.ron | 17 + assets/common/items/armor/misc/head/straw.ron | 17 + assets/voxygen/item_image_manifest.ron | 21 ++ .../voxel/armor/misc/head/bandana/red.vox | 3 + .../voxel/armor/misc/head/bandana/thief.vox | 3 + .../voxygen/voxel/armor/misc/head/helmet.vox | 3 + assets/voxygen/voxel/armor/misc/head/hood.vox | 3 + .../voxygen/voxel/armor/misc/head/straw.vox | 3 + assets/voxygen/voxel/armor/pirate/hat.vox | 4 +- assets/voxygen/voxel/armor/witch/hat.vox | 4 +- .../voxel/humanoid_armor_head_manifest.ron | 309 +++++++++++++++++- 14 files changed, 426 insertions(+), 12 deletions(-) create mode 100644 assets/common/items/armor/misc/head/bandana/red.ron create mode 100644 assets/common/items/armor/misc/head/bandana/thief.ron create mode 100644 assets/common/items/armor/misc/head/helmet.ron create mode 100644 assets/common/items/armor/misc/head/hood.ron create mode 100644 assets/common/items/armor/misc/head/straw.ron create mode 100644 assets/voxygen/voxel/armor/misc/head/bandana/red.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/bandana/thief.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/helmet.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/hood.vox create mode 100644 assets/voxygen/voxel/armor/misc/head/straw.vox 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..1df35cc0cb --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/bandana/red.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68a970bed2c688ca7ffac56b150e4f7b75d624ad377375b4102210c38d8457a6 +size 2784 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..a2c885315a --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/bandana/thief.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2098f01121367b2061f43ddaf077d56b16ccfebbcf80323ede8ac0d32f655e3d +size 2784 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..ff85bb2e6f --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/helmet.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0bfb7dc60be7c50b2e8cd33b8e3360f0f17dac2ae89597d33ee2adf9079f1ec +size 12080 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..14fbd4ee09 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/hood.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5885f8041b1861f56d01b701e4f75c7f6bec65e6622578f8eede84e8959aef15 +size 6792 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..c3a9806ed8 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/straw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b907d989fb6b4910ae7c7e77615a360747f4952bb36e7208ccc9e6b3778524d0 +size 9048 diff --git a/assets/voxygen/voxel/armor/pirate/hat.vox b/assets/voxygen/voxel/armor/pirate/hat.vox index 0a71651127..25e9e4122d 100644 --- a/assets/voxygen/voxel/armor/pirate/hat.vox +++ b/assets/voxygen/voxel/armor/pirate/hat.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2f4b946145b706a23494fac26344d789c6bdfa05bd2e411f07bd0a97bc96b46 -size 4048 +oid sha256:cf155f664c119b79cae45b1e46dd5a11afefbbdd84f3cd9addfc6a2e32754145 +size 7248 diff --git a/assets/voxygen/voxel/armor/witch/hat.vox b/assets/voxygen/voxel/armor/witch/hat.vox index 40e5727df7..4d4086c68f 100644 --- a/assets/voxygen/voxel/armor/witch/hat.vox +++ b/assets/voxygen/voxel/armor/witch/hat.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4eb3a03d09c2a420898d5944f7334695175c3f76c6565d7d582258c00d0bfd4d -size 5612 +oid sha256:a3663a0164f2b4fdbedd060ba48dd7e5e940cb37fc877837e4a408a15a999839 +size 21032 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 + ), } ))