diff --git a/assets/common/entity/wild/peaceful/boar.ron b/assets/common/entity/wild/peaceful/boar.ron index 8fea407899..7e513b0999 100644 --- a/assets/common/entity/wild/peaceful/boar.ron +++ b/assets/common/entity/wild/peaceful/boar.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("boar"), alignment: Alignment(Wild), - loot: LootTable("common.loot_tables.creature.quad_small.generic"), + loot: LootTable("common.loot_tables.creature.quad_small.boar"), hands: Uninit, diff --git a/assets/common/items/armor/misc/head/bamboo_twig.ron b/assets/common/items/armor/misc/head/bamboo_twig.ron new file mode 100644 index 0000000000..ab94802376 --- /dev/null +++ b/assets/common/items/armor/misc/head/bamboo_twig.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Bamboo Twig", + description: "A tiny stray shoot from a larger bamboo shaft.", + kind: Armor(( + kind: Head("BambooTwig"), + stats: ( + protection: Normal(4.0), + poise_resilience: Normal(3.0), + energy_max: 0.0, + energy_reward: 0.08, + crit_power: 0.01, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/common/items/armor/misc/head/hog_hood.ron b/assets/common/items/armor/misc/head/hog_hood.ron new file mode 100644 index 0000000000..9cf10a7c0c --- /dev/null +++ b/assets/common/items/armor/misc/head/hog_hood.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Wild Hog Hood", + description: "Wear the guise of the great swine you felled, so you may honor his sacrifice.", + kind: Armor(( + kind: Head("HogHood"), + stats: ( + protection: Normal(6.5), + poise_resilience: Normal(1.0), + energy_max: 0.0, + energy_reward: 0.0, + crit_power: 0.0355, + stealth: 0.0335, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/common/items/armor/misc/head/wanderers_hat.ron b/assets/common/items/armor/misc/head/wanderers_hat.ron new file mode 100644 index 0000000000..46b99bb683 --- /dev/null +++ b/assets/common/items/armor/misc/head/wanderers_hat.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Wanderer's Hat", + description: "A practical hat: light, shady and relatively easy to replace. The perfect headwear for those who feel at home on the highways and byways of Veloren.", + kind: Armor(( + kind: Head("WanderersHat"), + stats: ( + protection: Normal(3.0), + poise_resilience: Normal(1.0), + energy_max: 1.0, + energy_reward: 0.025, + crit_power: 0.02, + stealth: 0.025, + ), + )), + quality: Common, + tags: [], +) diff --git a/assets/common/loot_tables/creature/quad_low/deadwood.ron b/assets/common/loot_tables/creature/quad_low/deadwood.ron index ac925c7b9e..718cb96b97 100644 --- a/assets/common/loot_tables/creature/quad_low/deadwood.ron +++ b/assets/common/loot_tables/creature/quad_low/deadwood.ron @@ -1,4 +1,5 @@ [ - (1.0, Item("common.items.crafting_ing.animal_misc.lively_vine")), - (1.0, Item("common.items.crafting_ing.animal_misc.grim_eyeball")), + (9.0, Item("common.items.crafting_ing.animal_misc.lively_vine")), + (9.0, Item("common.items.crafting_ing.animal_misc.grim_eyeball")), + (1.0, Item("common.items.armor.misc.head.bamboo_twig")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/maneater.ron b/assets/common/loot_tables/creature/quad_low/maneater.ron index b7390cdec0..3f505b186c 100644 --- a/assets/common/loot_tables/creature/quad_low/maneater.ron +++ b/assets/common/loot_tables/creature/quad_low/maneater.ron @@ -1,4 +1,5 @@ [ - (1.0, Item("common.items.crafting_ing.animal_misc.lively_vine")), - (1.0, LootTable("common.loot_tables.food.wild_ingredients")), + (9.0, Item("common.items.crafting_ing.animal_misc.lively_vine")), + (9.0, LootTable("common.loot_tables.food.wild_ingredients")), + (1.0, Item("common.items.armor.misc.head.bamboo_twig")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_small/boar.ron b/assets/common/loot_tables/creature/quad_small/boar.ron new file mode 100644 index 0000000000..ef47f462ce --- /dev/null +++ b/assets/common/loot_tables/creature/quad_small/boar.ron @@ -0,0 +1,5 @@ +[ + (4.0, ItemQuantity("common.items.crafting_ing.hide.animal_hide", 1, 2)), + (1.0, Item("common.items.food.meat.beast_small_raw")), + (0.25, Item("common.items.armor.misc.head.hog_hood")), +] \ No newline at end of file diff --git a/assets/common/loot_tables/sprite/crate.ron b/assets/common/loot_tables/sprite/crate.ron index a2b2cc9f74..6e0ef1c47f 100644 --- a/assets/common/loot_tables/sprite/crate.ron +++ b/assets/common/loot_tables/sprite/crate.ron @@ -1,4 +1,5 @@ [ - (1.0, LootTable("common.loot_tables.materials.common")), - (2.0, LootTable("common.loot_tables.food.prepared")), + (9.0, LootTable("common.loot_tables.materials.common")), + (9.0, LootTable("common.loot_tables.food.prepared")), + (1.0, Item("common.items.armor.misc.head.wanderers_hat")), ] \ No newline at end of file diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 9b903e33d5..e4d3c04279 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -2154,6 +2154,14 @@ "voxel.armor.witch.hat", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), + Armor(Head("HogHood")): VoxTrans( + "voxel.armor.misc.head.hog_hood", + (0.0, 2.0, -0.0), (-110.0, 210.0,15.0), 1.4, + ), + Armor(Head("BambooTwig")): VoxTrans( + "voxel.armor.misc.head.bamboo_twig", + (2.5, 4.5, 0.0), (-120.0, -240.0,1.0), 2.3, + ), Armor(Head("Pirate")): VoxTrans( "voxel.armor.pirate.hat", (1.0, 2.0, 0.0), (-120.0, 210.0,15.0), 1.0, @@ -2161,6 +2169,10 @@ Armor(Head("Thief")): VoxTrans( "voxel.armor.misc.head.bandana.thief", (0.0, -2.0, 0.0), (-120.0, 210.0,15.0), 1.9, + ), + Armor(Head("WanderersHat")): VoxTrans( + "voxel.armor.misc.head.wanderers_hat", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9, ), Armor(Head("Red")): VoxTrans( "voxel.armor.misc.head.bandana.red", diff --git a/assets/voxygen/voxel/armor/misc/head/bamboo_twig.vox b/assets/voxygen/voxel/armor/misc/head/bamboo_twig.vox new file mode 100644 index 0000000000..881b2533b2 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/bamboo_twig.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76872a3847f1f36a8b53e747c87592178099bee047ce714e7be9fd6ff1976127 +size 1128 diff --git a/assets/voxygen/voxel/armor/misc/head/hog_hood.vox b/assets/voxygen/voxel/armor/misc/head/hog_hood.vox new file mode 100644 index 0000000000..a80867f58f --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/hog_hood.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ccfdc45490dca6bc25082c7d628e5ffdcd22d95f275571d1b6a9f4d38fce0d9c +size 69303 diff --git a/assets/voxygen/voxel/armor/misc/head/wanderers_Hat.vox b/assets/voxygen/voxel/armor/misc/head/wanderers_Hat.vox new file mode 100644 index 0000000000..1bf32b004b --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/wanderers_Hat.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f66f93b39e200863b715764dbc1eb57eab1d35d6cf2cee9e0b1592deff5a7f3b +size 17592 diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index 2f8ecce6a3..dc32befc84 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -77,6 +77,154 @@ vox_spec: ("armor.witch.hat", (-3.0, -6.0, 5.0)), color: None ), +// + (Human, Male, "HogHood"): ( + vox_spec: ("armor.misc.head.hog_hood", (-4.0, -5, -8.0)), + color: None + ), + (Human, Female, "HogHood"): ( + vox_spec: ("armor.misc.head.hog_hood", (-4.0, -4, -8.0)), + color: None + ), + (Elf, Male, "HogHood"): ( + vox_spec: ("armor.misc.head.hog_hood", (-3.0, -5.0, -8.0)), + color: None + ), + (Elf, Female, "HogHood"): ( + vox_spec: ("armor.misc.head.hog_hood", (-3.0, -5.0, -8.0)), + color: None + ), + (Dwarf, Male, "HogHood"): ( + vox_spec: ("armor.misc.head.hog_hood", (-5.0, -4.0, -8)), + color: None + ), + (Dwarf, Female, "HogHood"): ( + vox_spec: ("armor.misc.head.hog_hood", (-5.0, -4.0, -8.0)), + color: None + ), + (Danari, Male, "HogHood"): ( + vox_spec: ("armor.misc.head.hog_hood", (-2.0, -5, -6)), + color: None + ), + (Danari, Female, "HogHood"): ( + vox_spec: ("armor.misc.head.hog_hood", (-2.0, -5, -6)), + color: None + ), + (Undead, Male, "HogHood"): ( + vox_spec: ("armor.misc.head.hog_hood", (-6.0, -5.0, -7.0)), + color: None + ), + (Undead, Female, "HogHood"): ( + vox_spec: ("armor.misc.head.hog_hood", (-6.0, -5.0, -8.0)), + color: None + ), + (Orc, Male, "HogHood"): ( + vox_spec: ("armor.misc.head.hog_hood", (-3.0, -4.0, -6.0)), + color: None + ), + (Orc, Female, "HogHood"): ( + vox_spec: ("armor.misc.head.hog_hood", (-3.0, -6.0, -8.0)), + color: None + ), + // + (Danari, Male, "BambooTwig"): ( + vox_spec: ("armor.misc.head.bamboo_twig", (1.0, 2.0, -2.0)), + color: None + ), + (Danari, Female, "BambooTwig"): ( + vox_spec: ("armor.misc.head.bamboo_twig", (1.0, 2.0, -2.0)), + color: None + ), + (Dwarf, Male, "BambooTwig"): ( + vox_spec: ("armor.misc.head.bamboo_twig", (-2.0, 3.0, -5.0)), + color: None + ), + (Dwarf, Female, "BambooTwig"): ( + vox_spec: ("armor.misc.head.bamboo_twig", (-2.0, 3.0, -4.0)), + color: None + ), + (Human, Male, "BambooTwig"): ( + vox_spec: ("armor.misc.head.bamboo_twig", (-1.0, 2.0, -4.0)), + color: None + ), + (Human, Female, "BambooTwig"): ( + vox_spec: ("armor.misc.head.bamboo_twig", (-1.0, 3.0, -4.0)), + color: None + ), + (Undead, Male, "BambooTwig"): ( + vox_spec: ("armor.misc.head.bamboo_twig", (-3.0, 1.0, -2.0)), + color: None + ), + (Undead, Female, "BambooTwig"): ( + vox_spec: ("armor.misc.head.bamboo_twig", (-3.0, 1.0, -3.0)), + color: None + ), + (Elf, Male, "BambooTwig"): ( + vox_spec: ("armor.misc.head.bamboo_twig", (-0.0, 2.0, -4.0)), + color: None + ), + (Elf, Female, "BambooTwig"): ( + vox_spec: ("armor.misc.head.bamboo_twig", (-0.0, 2.0, -4.0)), + color: None + ), + (Orc, Male, "BambooTwig"): ( + vox_spec: ("armor.misc.head.bamboo_twig", (1.0, 3.0, -1.0)), + color: None + ), + (Orc, Female, "BambooTwig"): ( + vox_spec: ("armor.misc.head.bamboo_twig", (0.0, 0.0, -3.0)), + color: None + ), +// + (Human, Male, "WanderersHat"): ( + vox_spec: ("armor.misc.head.wanderers_hat", (-4, -6.0, 4.0)), + color: None + ), + (Human, Female, "WanderersHat"): ( + vox_spec: ("armor.misc.head.wanderers_hat", (-4, -5.0, 4.0)), + color: None + ), + (Elf, Male, "WanderersHat"): ( + vox_spec: ("armor.misc.head.wanderers_hat", (-3, -6.0, 4.0)), + color: None + ), + (Elf, Female, "WanderersHat"): ( + vox_spec: ("armor.misc.head.wanderers_hat", (-3, -6.0, 4.0)), + color: None + ), + (Dwarf, Male, "WanderersHat"): ( + vox_spec: ("armor.misc.head.wanderers_hat", (-5, -5.0, 3.0)), + color: None + ), + (Dwarf, Female, "WanderersHat"): ( + vox_spec: ("armor.misc.head.wanderers_hat", (-4, -5.0, 4.0)), + color: None + ), + (Danari, Male, "WanderersHat"): ( + vox_spec: ("armor.misc.head.wanderers_hat", (-2, -6.0, 6.0)), + color: None + ), + (Danari, Female, "WanderersHat"): ( + vox_spec: ("armor.misc.head.wanderers_hat", (-2, -6.0, 6.0)), + color: None + ), + (Undead, Male, "WanderersHat"): ( + vox_spec: ("armor.misc.head.wanderers_hat", (-6, -6.0, 5.0)), + color: None + ), + (Undead, Female, "WanderersHat"): ( + vox_spec: ("armor.misc.head.wanderers_hat", (-6, -6.0, 5.0)), + color: None + ), + (Orc, Male, "WanderersHat"): ( + vox_spec: ("armor.misc.head.wanderers_hat", (-3.0, -4.0, 5.0)), + color: None + ), + (Orc, Female, "WanderersHat"): ( + vox_spec: ("armor.misc.head.wanderers_hat", (-3.0, -7.0, 4.0)), + color: None + ), + // (Human, Male, "Pirate"): ( vox_spec: ("armor.pirate.hat", (-4.0, -4.0, 5.0)),