diff --git a/assets/common/items/armor/misc/head/bamboo_twig.ron b/assets/common/items/armor/misc/head/bamboo_twig.ron index d4c09a33f7..7669a4a629 100644 --- a/assets/common/items/armor/misc/head/bamboo_twig.ron +++ b/assets/common/items/armor/misc/head/bamboo_twig.ron @@ -4,10 +4,9 @@ ItemDef( kind: Armor(( kind: Head("BambooTwig"), stats: ( - protection: Some(Normal(4.0)), - poise_resilience: Some(Normal(3.0)), - energy_reward: Some(0.08), - crit_power: Some(0.01), + poise_resilience: Some(Normal(2.0)), + energy_reward: Some(0.06), + crit_power: Some(0.005), ), )), quality: Common, diff --git a/assets/common/items/armor/misc/head/bandana/red.ron b/assets/common/items/armor/misc/head/bandana/red.ron index 32cb18a50e..ae7803c0ce 100644 --- a/assets/common/items/armor/misc/head/bandana/red.ron +++ b/assets/common/items/armor/misc/head/bandana/red.ron @@ -4,6 +4,7 @@ ItemDef( kind: Armor(( kind: Head("Red"), stats: ( + crit_power: Some(0.08), stealth: Some(0.15), ), )), diff --git a/assets/common/items/armor/misc/head/bandana/thief.ron b/assets/common/items/armor/misc/head/bandana/thief.ron index 6ad9ab2e7a..26703cf39c 100644 --- a/assets/common/items/armor/misc/head/bandana/thief.ron +++ b/assets/common/items/armor/misc/head/bandana/thief.ron @@ -4,6 +4,7 @@ ItemDef( kind: Armor(( kind: Head("Thief"), stats: ( + crit_power: Some(0.07), stealth: Some(0.18), ), )), diff --git a/assets/common/items/armor/misc/head/helmet.ron b/assets/common/items/armor/misc/head/helmet.ron index 814a317383..89b831d2bd 100644 --- a/assets/common/items/armor/misc/head/helmet.ron +++ b/assets/common/items/armor/misc/head/helmet.ron @@ -4,6 +4,8 @@ ItemDef( kind: Armor(( kind: Head("Helmet"), stats: ( + protection: Some(Normal(16.0)), + poise_resilience: Some(Normal(3.0)), ), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/head/hog_hood.ron b/assets/common/items/armor/misc/head/hog_hood.ron index 094f26b65d..c58cbe52ac 100644 --- a/assets/common/items/armor/misc/head/hog_hood.ron +++ b/assets/common/items/armor/misc/head/hog_hood.ron @@ -4,10 +4,10 @@ ItemDef( kind: Armor(( kind: Head("HogHood"), stats: ( - protection: Some(Normal(6.5)), - poise_resilience: Some(Normal(1.0)), - crit_power: Some(0.0355), - stealth: Some(0.0335), + protection: Some(Normal(5.0)), + poise_resilience: Some(Normal(-1.0)), + crit_power: Some(0.007), + stealth: Some(0.35), ), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/head/hood.ron b/assets/common/items/armor/misc/head/hood.ron index 3c7a49e3e2..d29bdd1b28 100644 --- a/assets/common/items/armor/misc/head/hood.ron +++ b/assets/common/items/armor/misc/head/hood.ron @@ -6,8 +6,8 @@ ItemDef( stats: ( protection: Some(Normal(6.0)), poise_resilience: Some(Normal(1.0)), - crit_power: Some(0.04), - stealth: Some(0.12), + crit_power: Some(0.01), + stealth: Some(0.22), ), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/head/hood_dark.ron b/assets/common/items/armor/misc/head/hood_dark.ron index 079bab0468..7744594a32 100644 --- a/assets/common/items/armor/misc/head/hood_dark.ron +++ b/assets/common/items/armor/misc/head/hood_dark.ron @@ -6,8 +6,8 @@ ItemDef( stats: ( protection: Some(Normal(7.0)), poise_resilience: Some(Normal(1.0)), - crit_power: Some(0.02), - stealth: Some(0.1), + crit_power: Some(0.008), + stealth: Some(0.15), ), )), quality: Moderate, diff --git a/assets/common/items/armor/misc/head/wanderers_hat.ron b/assets/common/items/armor/misc/head/wanderers_hat.ron index 0a473027d0..3f0469c7e4 100644 --- a/assets/common/items/armor/misc/head/wanderers_hat.ron +++ b/assets/common/items/armor/misc/head/wanderers_hat.ron @@ -7,9 +7,9 @@ ItemDef( protection: Some(Normal(3.0)), poise_resilience: Some(Normal(1.0)), energy_max: Some(1.0), - energy_reward: Some(0.025), - crit_power: Some(0.02), - stealth: Some(0.025), + energy_reward: Some(0.02), + crit_power: Some(0.01), + stealth: Some(0.05), ), )), quality: High, diff --git a/assets/common/items/armor/pirate/hat.ron b/assets/common/items/armor/pirate/hat.ron index 54908358b6..b596baf456 100644 --- a/assets/common/items/armor/pirate/hat.ron +++ b/assets/common/items/armor/pirate/hat.ron @@ -7,11 +7,11 @@ ItemDef( protection: Some(Normal(4.0)), poise_resilience: Some(Normal(1.0)), energy_max: Some(1.0), - energy_reward: Some(0.025), + energy_reward: Some(0.015), crit_power: Some(0.02), ), )), - quality: Epic, + quality: High, tags: [ ], ) diff --git a/assets/common/items/armor/witch/hat.ron b/assets/common/items/armor/witch/hat.ron index 8f88439d0e..430301f26b 100644 --- a/assets/common/items/armor/witch/hat.ron +++ b/assets/common/items/armor/witch/hat.ron @@ -6,7 +6,8 @@ ItemDef( stats: ( protection: Some(Normal(4.0)), poise_resilience: Some(Normal(3.0)), - energy_reward: Some(0.08), + energy_max: Some(12.0), + energy_reward: Some(0.4), crit_power: Some(0.01), ), )), diff --git a/assets/common/loadout/village/guard.ron b/assets/common/loadout/village/guard.ron index dde1c8c6fc..67cff4353b 100644 --- a/assets/common/loadout/village/guard.ron +++ b/assets/common/loadout/village/guard.ron @@ -7,9 +7,8 @@ Armor(Feet): Item("common.items.armor.leather_plate.foot"), Armor(Head): Choice([ // Christmas event - (2.0, Some(Item("common.items.armor.misc.head.boreal_warhelm"))), (1.0, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))), - //(4.0, Some(Item("common.items.armor.leather_plate.helmet"))), + (2.0, Some(Item("common.items.armor.misc.head.helmet"))), ]), Lantern: Choice([ diff --git a/assets/common/loot_tables/calendar/christmas/boss.ron b/assets/common/loot_tables/calendar/christmas/boss.ron index 322d75c1f3..6d6c8807cb 100644 --- a/assets/common/loot_tables/calendar/christmas/boss.ron +++ b/assets/common/loot_tables/calendar/christmas/boss.ron @@ -1,6 +1,5 @@ [ - (4.0, ItemQuantity("common.items.food.blue_cheese", 1, 30)), - (3.0, Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap")), + (4.0, ItemQuantity("common.items.crafting_ing.animal_misc.icy_fang", 1, 20)), (2.0, Item("common.items.armor.misc.head.boreal_warhelm")), (1.0, Item("common.items.lantern.polaris")), ] diff --git a/assets/common/loot_tables/calendar/christmas/yeti.ron b/assets/common/loot_tables/calendar/christmas/yeti.ron index fe59c11d55..028c8e83ce 100644 --- a/assets/common/loot_tables/calendar/christmas/yeti.ron +++ b/assets/common/loot_tables/calendar/christmas/yeti.ron @@ -1,5 +1,6 @@ [ - (5.0, ItemQuantity("common.items.food.blue_cheese", 1, 10)), - (6.0, ItemQuantity("common.items.mineral.ore.coal", 1, 3)), - (1.0, ItemQuantity("common.items.mineral.gem.diamond", 1, 1)), + (4.0, ItemQuantity("common.items.food.blue_cheese", 1, 15)), + (3.0, Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap")), + (2.0, Item("common.items.armor.misc.head.boreal_warhelm")), + (1.0, Item("common.items.lantern.polaris")), ] \ No newline at end of file diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 819ba3ee12..0418b9e6ab 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -2263,6 +2263,10 @@ "voxel.armor.misc.head.woolly_wintercap", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), + Armor(Head("Helmet")): VoxTrans( + "voxel.armor.misc.head.helmet", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, + ), // Rings Armor(Ring("Scratched")): VoxTrans( "voxel.armor.misc.ring.scratched", diff --git a/assets/voxygen/voxel/armor/misc/head/helmet.vox b/assets/voxygen/voxel/armor/misc/head/helmet.vox index b79ff87a03..307da20937 100644 --- a/assets/voxygen/voxel/armor/misc/head/helmet.vox +++ b/assets/voxygen/voxel/armor/misc/head/helmet.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b985c6a8bfc5a092af1d4165042697de539c05af361da30bac55c47182f183cf -size 14776 +oid sha256:8b9eefd0b17c1604ad69936c6f8d8f761e8a075a05389bd43e669fc43202b463 +size 45191 diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index c4bc6c3aac..0aded9d32d 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -813,53 +813,53 @@ vox_spec: ("armor.misc.head.spikeguard", (-3.0, -5.0, -2.0)), color: None ), - // Village Guard - (Human, Male, "LeatherPlate"): ( - vox_spec: ("armor.leather_plate.helmet_undead_m", (-3.0, -3.0, -0.0)), + // Village Guard Helmet + (Human, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-4.0, -6.0, -1.0)), color: None ), - (Human, Female, "LeatherPlate"): ( - vox_spec: ("armor.leather_plate.helmet_undead_m", (-3.0, -1.0, -0.0)), + (Human, Female, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-4.0, -5.0, -1.0)), color: None ), - (Elf, Male, "LeatherPlate"): ( - vox_spec: ("armor.leather_plate.helmet_orc_m", (-5.0, -2.0, 0.0)), + (Elf, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-3.0, -6.0, -1.0)), color: None ), - (Elf, Female, "LeatherPlate"): ( - vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)), + (Elf, Female, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-3.0, -6.0, -1.0)), color: None ), - (Dwarf, Male, "LeatherPlate"): ( - vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)), + (Dwarf, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-5.0, -5.0, -1.0)), color: None ), - (Dwarf, Female, "LeatherPlate"): ( - vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)), + (Dwarf, Female, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-5.0, -5.0, -1.0)), color: None ), - (Danari, Male, "LeatherPlate"): ( - vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)), + (Danari, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-2.0, -6.0, 1.0)), color: None ), - (Danari, Female, "LeatherPlate"): ( - vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)), + (Danari, Female, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-2.0, -6.0, 1.0)), color: None ), - (Undead, Male, "LeatherPlate"): ( - vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)), + (Undead, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-6.0, -6.0, 0.0)), color: None ), - (Undead, Female, "LeatherPlate"): ( - vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)), + (Undead, Female, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-6.0, -6.0, 0.0)), color: None ), - (Orc, Male, "LeatherPlate"): ( - vox_spec: ("armor.leather_plate.helmet_orc_m", (-2.0, -1.0, 1.0)), + (Orc, Male, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-3.0, -4.0, 1.0)), color: None ), - (Orc, Female, "LeatherPlate"): ( - vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)), + (Orc, Female, "Helmet"): ( + vox_spec: ("armor.misc.head.helmet", (-3.0, -7.0, -1.0)), color: None ), // Merchant Turban