Christmas tweaks

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(2.0)),
-            poise_resilience: Some(Normal(3.0)),
+            energy_reward: Some(0.06),
-            energy_reward: Some(0.08),
+            crit_power: Some(0.005),
-            crit_power: Some(0.01),
         ),
     )),
     quality: Common,

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),
         ),
     )),

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),
         ),
     )),

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,

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)),
+            protection: Some(Normal(5.0)),
-            poise_resilience: Some(Normal(1.0)),
+            poise_resilience: Some(Normal(-1.0)),
-            crit_power: Some(0.0355),
+            crit_power: Some(0.007),
-            stealth: Some(0.0335),
+            stealth: Some(0.35),
         ),
     )),
     quality: Moderate,

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),
+            crit_power: Some(0.01),
-            stealth: Some(0.12),
+            stealth: Some(0.22),
         ),
     )),
     quality: Moderate,

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),
+            crit_power: Some(0.008),
-            stealth: Some(0.1),
+            stealth: Some(0.15),
         ),
     )),
     quality: Moderate,

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),
+            energy_reward: Some(0.02),
-            crit_power: Some(0.02),
+            crit_power: Some(0.01),
-            stealth: Some(0.025),
+            stealth: Some(0.05),
         ),
     )),
     quality: High,

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: [
     ],
 )

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),
         ),
     )),

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([

assets/common/loot_tables/calendar/christmas/boss.ron

@@ -1,6 +1,5 @@
 [
-    (4.0, ItemQuantity("common.items.food.blue_cheese", 1, 30)),
+    (4.0, ItemQuantity("common.items.crafting_ing.animal_misc.icy_fang", 1, 20)),
-    (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")),
 ]

assets/common/loot_tables/calendar/christmas/yeti.ron

@@ -1,5 +1,6 @@
 [
-    (5.0, ItemQuantity("common.items.food.blue_cheese", 1, 10)),
+    (4.0, ItemQuantity("common.items.food.blue_cheese", 1, 15)),
-    (6.0, ItemQuantity("common.items.mineral.ore.coal", 1, 3)),
+    (3.0, Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap")),
-    (1.0, ItemQuantity("common.items.mineral.gem.diamond", 1, 1)),
+    (2.0, Item("common.items.armor.misc.head.boreal_warhelm")),
+    (1.0, Item("common.items.lantern.polaris")),
 ]

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",

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
+        // Village Guard Helmet
-        (Human, Male, "LeatherPlate"): (
+        (Human, Male, "Helmet"): (
-            vox_spec: ("armor.leather_plate.helmet_undead_m", (-3.0, -3.0, -0.0)),
+            vox_spec: ("armor.misc.head.helmet", (-4.0, -6.0, -1.0)),
             color: None
         ),
-        (Human, Female, "LeatherPlate"): (
+        (Human, Female, "Helmet"): (
-            vox_spec: ("armor.leather_plate.helmet_undead_m", (-3.0, -1.0, -0.0)),
+            vox_spec: ("armor.misc.head.helmet", (-4.0, -5.0, -1.0)),
             color: None
         ),
-        (Elf, Male, "LeatherPlate"): (
+        (Elf, Male, "Helmet"): (
-            vox_spec: ("armor.leather_plate.helmet_orc_m", (-5.0, -2.0, 0.0)),
+            vox_spec: ("armor.misc.head.helmet", (-3.0, -6.0, -1.0)),
             color: None
         ),
-        (Elf, Female, "LeatherPlate"): (
+        (Elf, Female, "Helmet"): (
-            vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)),
+            vox_spec: ("armor.misc.head.helmet", (-3.0, -6.0, -1.0)),
             color: None
         ),
-        (Dwarf, Male, "LeatherPlate"): (
+        (Dwarf, Male, "Helmet"): (
-            vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)),
+            vox_spec: ("armor.misc.head.helmet", (-5.0, -5.0, -1.0)),
             color: None
         ),
-        (Dwarf, Female, "LeatherPlate"): (
+        (Dwarf, Female, "Helmet"): (
-            vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)),
+            vox_spec: ("armor.misc.head.helmet", (-5.0, -5.0, -1.0)),
             color: None
         ),
-        (Danari, Male, "LeatherPlate"): (
+        (Danari, Male, "Helmet"): (
-            vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)),
+            vox_spec: ("armor.misc.head.helmet", (-2.0, -6.0, 1.0)),
             color: None
         ),
-        (Danari, Female, "LeatherPlate"): (
+        (Danari, Female, "Helmet"): (
-            vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)),
+            vox_spec: ("armor.misc.head.helmet", (-2.0, -6.0, 1.0)),
             color: None
         ),
-        (Undead, Male, "LeatherPlate"): (
+        (Undead, Male, "Helmet"): (
-            vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)),
+            vox_spec: ("armor.misc.head.helmet", (-6.0, -6.0, 0.0)),
             color: None
         ),
-        (Undead, Female, "LeatherPlate"): (
+        (Undead, Female, "Helmet"): (
-            vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)),
+            vox_spec: ("armor.misc.head.helmet", (-6.0, -6.0, 0.0)),
             color: None
         ),
-        (Orc, Male, "LeatherPlate"): (
+        (Orc, Male, "Helmet"): (
-            vox_spec: ("armor.leather_plate.helmet_orc_m", (-2.0, -1.0, 1.0)),
+            vox_spec: ("armor.misc.head.helmet", (-3.0, -4.0, 1.0)),
             color: None
         ),
-        (Orc, Female, "LeatherPlate"): (
+        (Orc, Female, "Helmet"): (
-            vox_spec: ("armor.leather_plate.helmet_undead_m", (-5.0, -2.0, 0.0)),
+            vox_spec: ("armor.misc.head.helmet", (-3.0, -7.0, -1.0)),
             color: None
         ),
         // Merchant Turban