diff --git a/assets/common/items/armor/misc/head/boreal_warhelm.ron b/assets/common/items/armor/misc/head/boreal_warhelm.ron new file mode 100644 index 0000000000..c45820ed77 --- /dev/null +++ b/assets/common/items/armor/misc/head/boreal_warhelm.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Boreal Warhelmet", + description: "I wonder where it's pointing...", + kind: Armor(( + kind: Head("BorealWarhelm"), + stats: ( + protection: Normal(9.0), + poise_resilience: Normal(3.0), + energy_max: 4.0, + energy_reward: 0.01, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/misc/head/hood_dark.ron b/assets/common/items/armor/misc/head/hood_dark.ron index dc73291d00..86740b9eb3 100644 --- a/assets/common/items/armor/misc/head/hood_dark.ron +++ b/assets/common/items/armor/misc/head/hood_dark.ron @@ -1,11 +1,17 @@ ItemDef( name: "Dark Hood", - description: "yep.", + description: "Tis a bit thicker.", kind: Armor(( kind: Head("DarkHood"), stats: ( + protection: Normal(7.0), + poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.02, + stealth: 0.1, ), )), - quality: Common, + quality: Moderate, tags: [], ) diff --git a/assets/common/items/armor/misc/head/mitre.ron b/assets/common/items/armor/misc/head/mitre.ron index bb98cc4057..4d6e919f89 100644 --- a/assets/common/items/armor/misc/head/mitre.ron +++ b/assets/common/items/armor/misc/head/mitre.ron @@ -4,10 +4,12 @@ ItemDef( kind: Armor(( kind: Head("Mitre"), stats: ( - protection: Some(Normal(4.0)), - energy_max: Some(8.0), - energy_reward: Some(0.12), - crit_power: Some(0.1), + protection: Normal(4.0), + poise_resilience: Normal(0.0), + energy_max: 8.0, + energy_reward: 0.1, + crit_power: 0.01, + stealth: 0.0, ), )), quality: High, diff --git a/assets/common/items/armor/misc/head/spikeguard.ron b/assets/common/items/armor/misc/head/spikeguard.ron index 9ec45cfb2d..d925ed96b8 100644 --- a/assets/common/items/armor/misc/head/spikeguard.ron +++ b/assets/common/items/armor/misc/head/spikeguard.ron @@ -4,10 +4,14 @@ ItemDef( kind: Armor(( kind: Head("Spikeguard"), stats: ( - protection: Some(Normal(2.0)), - poise_resilience: Some(Normal(10.0)), + protection: Normal(9.0), + poise_resilience: Normal(3.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.01, + stealth: -0.5, ), )), - quality: Common, + quality: High, tags: [], ) diff --git a/assets/common/items/armor/misc/head/winged_coronet.ron b/assets/common/items/armor/misc/head/winged_coronet.ron new file mode 100644 index 0000000000..d3daf9af3d --- /dev/null +++ b/assets/common/items/armor/misc/head/winged_coronet.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Winged Coronet", + description: "You feel more connected with nature.", + kind: Armor(( + kind: Head("WingedCoronet"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(0.0), + energy_max: 8.0, + energy_reward: 0.05, + crit_power: 0.015, + stealth: 0.5, + ), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/calendar/christmas/armor/misc/head/woolly_wintercap.ron b/assets/common/items/calendar/christmas/armor/misc/head/woolly_wintercap.ron new file mode 100644 index 0000000000..9e31f8633e --- /dev/null +++ b/assets/common/items/calendar/christmas/armor/misc/head/woolly_wintercap.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Woolly Wintercap", + description: "Simple, stylish, and festive.", + kind: Armor(( + kind: Head("WoollyWintercap"), + stats: ( + protection: Normal(0.0), + poise_resilience: Normal(0.0), + energy_max: 4.0, + energy_reward: 0.04, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/loadout/village/guard.ron b/assets/common/loadout/village/guard.ron index c6d0fceaeb..97e22453bf 100644 --- a/assets/common/loadout/village/guard.ron +++ b/assets/common/loadout/village/guard.ron @@ -5,6 +5,7 @@ Armor(Hands): Item("common.items.armor.leather_plate.hand"), Armor(Legs): Item("common.items.armor.leather_plate.pants"), Armor(Feet): Item("common.items.armor.leather_plate.foot"), + Armor(Head): Item("common.items.armor.misc.head.boreal_warhelm"), //Armor(Head): Item("common.items.armor.leather_plate.helmet"), Lantern: Choice([ diff --git a/assets/common/loadout/village/villager.ron b/assets/common/loadout/village/villager.ron index 9a8f6d02f6..5729cdbe72 100644 --- a/assets/common/loadout/village/villager.ron +++ b/assets/common/loadout/village/villager.ron @@ -20,7 +20,9 @@ (1.0, Some(Item("common.items.armor.cloth_blue.foot"))), ]), Armor(Head): Choice([ - (1.0, Some(Item("common.items.armor.misc.head.straw"))), - (1.0, None), + (1.0, Some(Item("common.items.armor.misc.head.hood_dark"))), + (1.0, Some(Item("common.items.armor.misc.head.boreal_warhelm"))), + (1.0, Some(Item("common.items.armor.misc.head.winged_coronet"))), + (1.0, Some(Item("common.items.armor.misc.head.wooly_wintercap"))), ]), }) diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 1336167805..36ca970343 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -1897,6 +1897,15 @@ ], craft_sprite: Some(CraftingBench), ), + "winged coronet": ( + output: ("common.items.armor.misc.head.winged_coronet", 1), + inputs: [ + (Item("common.items.mineral.gem.emerald"), 1), + (Item("common.items.mineral.ingot.gold"), 4), + (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 2), + ], + craft_sprite: Some(CraftingBench), + ), //"metal_blade": ( // output: ("common.items.crafting_ing.modular.damage.sword.metal_blade", 1), // inputs: [ diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 7d8e678ec0..c43262bf8d 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -2231,6 +2231,10 @@ "voxel.armor.misc.head.hood", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), + Armor(Head("DarkHood")): VoxTrans( + "voxel.armor.misc.head.hood_dark", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, + ), Armor(Head("Crown")): VoxTrans( "voxel.armor.misc.head.crown", (0.0, 4.0, 0.0), (-120.0, 210.0,15.0), 1.3, @@ -2243,6 +2247,18 @@ "voxel.armor.misc.head.spikeguard", (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, ), + Armor(Head("WingedCoronet")): VoxTrans( + "voxel.armor.misc.head.winged_coronet", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, + ), + Armor(Head("BorealWarhelmet")): VoxTrans( + "voxel.armor.misc.head.boreal_warhelm", + (0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3, + ), + Armor(Head("WoollyWintercap")): VoxTrans( + "voxel.calendar.christmas.armor.misc.head.woolly_wintercap", + (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/boreal_warhelm.vox b/assets/voxygen/voxel/armor/misc/head/boreal_warhelm.vox new file mode 100755 index 0000000000..336ebc4d63 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/boreal_warhelm.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f31a092a344dda79bdeb3591f699a5a79e60b802df5497f28e207146cf461966 +size 36456 diff --git a/assets/voxygen/voxel/armor/misc/head/hood_dark.vox b/assets/voxygen/voxel/armor/misc/head/hood_dark.vox old mode 100644 new mode 100755 index 76bf3208ea..e11ee710b4 --- a/assets/voxygen/voxel/armor/misc/head/hood_dark.vox +++ b/assets/voxygen/voxel/armor/misc/head/hood_dark.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5af2854af8ce6227d350df462aca0b5b9eae9b026b7d2f8cf98d5da43a29e777 -size 10120 +oid sha256:cf3362e271270ce0b8a0856baeb0e1667537a0e834bb250fc717d0f080987a74 +size 28044 diff --git a/assets/voxygen/voxel/armor/misc/head/winged_coronet.vox b/assets/voxygen/voxel/armor/misc/head/winged_coronet.vox new file mode 100755 index 0000000000..099fa7bf35 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/winged_coronet.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21dd9207ec110602477e63db55b8e0d14410fe8a6693fc704cfdedcf1066b9ce +size 1616 diff --git a/assets/voxygen/voxel/armor/misc/head/woolly_wintercap.vox b/assets/voxygen/voxel/armor/misc/head/woolly_wintercap.vox new file mode 100755 index 0000000000..c954a7ef04 --- /dev/null +++ b/assets/voxygen/voxel/armor/misc/head/woolly_wintercap.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:772b34ec18ab030657aa7c453ba1ebaf17a782e77db763d1f23c03305ee56e86 +size 32524 diff --git a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron index 5bbc96e032..47f5ca2490 100644 --- a/assets/voxygen/voxel/humanoid_armor_head_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_head_manifest.ron @@ -274,7 +274,7 @@ vox_spec: ("armor.pirate.hat", (-3.0, -5.0, 5.0)), color: None ), - // + // Straw hat (Human, Male, "Straw"): ( vox_spec: ("armor.misc.head.straw", (-4.0, -5.0, 5.0)), color: None @@ -911,6 +911,153 @@ vox_spec: ("armor.merchant.turban_orc", (-1.0, -4.0, 2.0)), color: None ), + //Winged Coronet + (Human, Male, "WingedCoronet"): ( + vox_spec: ("armor.misc.head.winged_coronet", (-4.0, -2.0, -10.0)), + color: None + ), + (Human, Female, "WingedCoronet"): ( + vox_spec: ("armor.misc.head.winged_coronet", (-4.0, -2.0, -10.0)), + color: None + ), + (Elf, Male, "WingedCoronet"): ( + vox_spec: ("armor.misc.head.winged_coronet", (-3.0, -2.0, -10.0)), + color: None + ), + (Human, Female, "WingedCoronet"): ( + vox_spec: ("armor.misc.head.winged_coronet", (-3.0, -2.0, -10.0)), + color: None + ), + (Dwarf, Male, "WingedCoronet"): ( + vox_spec: ("armor.misc.head.winged_coronet", (-5.0, -1.0, -10.0)), + color: None + ), + (Dwarf, Female, "WingedCoronet"): ( + vox_spec: ("armor.misc.head.winged_coronet", (-5.0, -1.0, -10.0)), + color: None + ), + (Danari, Male, "WingedCoronet"): ( + vox_spec: ("armor.misc.head.winged_coronet", (-2.0, -2.0, -10.0)), + color: None + ), + (Danari, Female, "WingedCoronet"): ( + vox_spec: ("armor.misc.head.winged_coronet", (-2.0, -2.0, -10.0)), + color: None + ), + (Undead, Male, "WingedCoronet"): ( + vox_spec: ("armor.misc.head.winged_coronet", (-6.0, -2.0, -8.0)), + color: None + ), + (Undead, Female, "WingedCoronet"): ( + vox_spec: ("armor.misc.head.winged_coronet", (-6.0, -2.0, -9.0)), + color: None + ), + (Orc, Male, "WingedCoronet"): ( + vox_spec: ("armor.misc.head.winged_coronet", (-3.0, 0.0, -8.0)), + color: None + ), + (Orc, Female, "WingedCoronet"): ( + vox_spec: ("armor.misc.head.winged_coronet", (-3.0, -3.0, -10.0)), + color: None + ), + // Boreal Warhelmet + (Human, Male, "BorealWarhelm"): ( + vox_spec: ("armor.misc.head.boreal_warhelm", (-3.0, -3.0, -0.0)), + color: None + ), + (Human, Female, "BorealWarhelm"): ( + vox_spec: ("armor.misc.head.boreal_warhelm", (-3.0, -1.0, -0.0)), + color: None + ), + (Elf, Male, "BorealWarhelm"): ( + vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)), + color: None + ), + (Elf, Female, "BorealWarhelm"): ( + vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)), + color: None + ), + (Dwarf, Male, "BorealWarhelm"): ( + vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)), + color: None + ), + (Dwarf, Female, "BorealWarhelm"): ( + vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)), + color: None + ), + (Danari, Male, "BorealWarhelm"): ( + vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)), + color: None + ), + (Danari, Female, "BorealWarhelm"): ( + vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)), + color: None + ), + (Undead, Male, "BorealWarhelm"): ( + vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)), + color: None + ), + (Undead, Female, "BorealWarhelm"): ( + vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)), + color: None + ), + (Orc, Male, "BorealWarhelm"): ( + vox_spec: ("armor.misc.head.boreal_warhelm", (-2.0, -1.0, 1.0)), + color: None + ), + (Orc, Female, "BorealWarhelm"): ( + vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)), + color: None + ), + // Woolly Wintercap (Christmas hat+event) + (Human, Male, "WoollyWintercap"): ( + vox_spec: ("armor.misc.head.woolly_wintercap", (-4.0, -5.0, 5.0)), + color: None + ), + (Human, Female, "WoollyWintercap"): ( + vox_spec: ("armor.misc.head.woolly_wintercap", (-4.0, -5.0, 5.0)), + color: None + ), + (Elf, Male, "WoollyWintercap"): ( + vox_spec: ("armor.misc.head.woolly_wintercap", (-3.0, -5.0, 5.0)), + color: None + ), + (Elf, Female, "WoollyWintercap"): ( + vox_spec: ("armor.misc.head.woolly_wintercap", (-3.0, -6.0, 5.0)), + color: None + ), + (Dwarf, Male, "WoollyWintercap"): ( + vox_spec: ("armor.misc.head.woolly_wintercap", (-5.0, -4.0, 5.0)), + color: None + ), + (Dwarf, Female, "WoollyWintercap"): ( + vox_spec: ("armor.misc.head.woolly_wintercap", (-5.0, -4.0, 5.0)), + color: None + ), + (Danari, Male, "WoollyWintercap"): ( + vox_spec: ("armor.misc.head.woolly_wintercap", (-2.0, -5.0, 7.0)), + color: None + ), + (Danari, Female, "WoollyWintercap"): ( + vox_spec: ("armor.misc.head.woolly_wintercap", (-2.0, -5.0, 7.0)), + color: None + ), + (Undead, Male, "WoollyWintercap"): ( + vox_spec: ("armor.misc.head.woolly_wintercap", (-6.0, -5.0, 7.0)), + color: None + ), + (Undead, Female, "WoollyWintercap"): ( + vox_spec: ("armor.misc.head.woolly_wintercap", (-6.0, -5.0, 6.0)), + color: None + ), + (Orc, Male, "WoollyWintercap"): ( + vox_spec: ("armor.misc.head.woolly_wintercap", (-3.0, -3.0, 8.0)), + color: None + ), + (Orc, Female, "WoollyWintercap"): ( + vox_spec: ("armor.misc.head.woolly_wintercap", (-3.0, -6.0, 5.0)), + color: None + ), } )) diff --git a/common/src/calendar.rs b/common/src/calendar.rs index 4f9baab2fd..f21263e957 100644 --- a/common/src/calendar.rs +++ b/common/src/calendar.rs @@ -33,7 +33,7 @@ impl Calendar { None => Local::now().naive_local(), }; - if now.month() == 12 && (24..=26).contains(&now.day()) { + if now.month() == 12 && (10..=30).contains(&now.day()) { this.events.push(CalendarEvent::Christmas); }