Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

+ Finished hat offsets for all races

Browse Source 
+ Villagers only wear christmas hat
+ Guards wear boreal_warhelm
+ Gave guards christmas color lanterns
+ Grave_robbers now wear hood and hood_dark too while also dropping them at a higher rate than previously.
+ Christmas event now starts at 20th and goes till 30th of december
+ item_image_manifest.ron manifest fix
+ Created a potential boss loot table which allows the player to get the winter_cap, the boreal_warhelm, polaris lantern, and more blue cheese.
+ Updated hood_dark with another index 17 layer to prevent hair clip.
This commit is contained in:
UncomfySilence 2021-12-12 12:31:19 +01:00 committed by Joshua Barretto
parent f9b4b55494
commit 065da20812
9 changed files with 68 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/loadout/spots/dwarf_graverobber.ron
View File

@ -8,6 +8,8 @@
Armor(Head): Choice([
(1.0, Some(Item("common.items.armor.misc.head.bandana.thief"))),
(1.0, Some(Item("common.items.armor.misc.head.bandana.red"))),
(1.0, Some(Item("common.items.armor.misc.head.hood"))),
(1.0, Some(Item("common.items.armor.misc.head.hood_dark"))),
]),
Lantern: Choice([

17
assets/common/loadout/village/guard.ron
View File

@ -5,11 +5,20 @@
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"),
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"))),
]),
Lantern: Choice([
(1.0, Some(Item("common.items.lantern.black_0"))),
(2.0, None),
//(1.0, Some(Item("common.items.lantern.black_0"))),
//(2.0, None),
// Christmas event
(1.0, Some(Item("common.items.lantern.blue_0"))),
(1.0, Some(Item("common.items.lantern.polaris"))),
(2.0, Some(Item("common.items.lantern.red_0"))),
(2.0, Some(Item("common.items.lantern.green_0"))),
]),
})

8
assets/common/loadout/village/villager.ron
View File

@ -20,9 +20,9 @@
(1.0, Some(Item("common.items.armor.cloth_blue.foot"))),
]),
Armor(Head): Choice([
//(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.calendar.christmas.armor.misc.head.woolly_wintercap"))),
// Christmas event
(1.0, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))),
//(1.0, Some(Item("common.items.armor.misc.head.straw"))),
//(2.0, None),
]),
})

6
assets/common/loot_tables/calendar/christmas/boss.ron Normal file
View File

@ -0,0 +1,6 @@
[
(4.0, ItemQuantity("common.items.food.blue_cheese", 1, 30)),
(3.0, Some(Item("common.items.armor.misc.head.woolly_wintercap"))),
(2.0, Some(Item("common.items.armor.misc.head.boreal_warhelm"))),
(1.0, Some(Item("common.items.lantern.polaris"))),
]

3
assets/common/loot_tables/spots/bandit.ron
View File

@ -12,7 +12,8 @@
// Armor
(0.01, Item("common.items.armor.misc.head.bandana.thief")),
(0.01, Item("common.items.armor.misc.head.bandana.red")),
(0.005, Item("common.items.armor.misc.head.hood")),
(0.01, Item("common.items.armor.misc.head.hood")),
(0.01, Item("common.items.armor.misc.head.hood_dark")),
// Food
(1.0, LootTable("common.loot_tables.food.wild_ingredients")),
(0.25, LootTable("common.loot_tables.food.prepared")),

4
assets/voxygen/item_image_manifest.ron
View File

@ -2255,12 +2255,12 @@
"voxel.armor.misc.head.winged_coronet",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3,
),
Armor(Head("BorealWarhelmet")): VoxTrans(
Armor(Head("BorealWarhelm")): 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",
"voxel.armor.misc.head.woolly_wintercap",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 1.3,
),
// Rings

BIN
assets/voxygen/voxel/armor/misc/head/hood_dark.vox (Stored with Git LFS)
View File

Binary file not shown.

72
assets/voxygen/voxel/humanoid_armor_head_manifest.ron
View File

@ -717,51 +717,51 @@
),
//
(Human, Male, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-4.0, -4.0, -1.0)),
vox_spec: ("armor.misc.head.hood_dark", (-4.0, -6.0, -5.0)),
color: None
),
(Human, Female, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-4.0, -4.0, -1.0)),
vox_spec: ("armor.misc.head.hood_dark", (-4.0, -6.0, -5.0)),
color: None
),
(Elf, Male, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-3.0, -4.0, -1.0)),
vox_spec: ("armor.misc.head.hood_dark", (-3.0, -7.0, -5.0)),
color: None
),
(Elf, Female, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-3.0, -5.0, -1.0)),
vox_spec: ("armor.misc.head.hood_dark", (-3.0, -7.0, -5.0)),
color: None
),
(Dwarf, Male, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-5.0, -3.0, -1.0)),
vox_spec: ("armor.misc.head.hood_dark", (-5.0, -6.0, -5.0)),
color: None
),
(Dwarf, Female, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-5.0, -3.0, -1.0)),
vox_spec: ("armor.misc.head.hood_dark", (-5.0, -6.0, -5.0)),
color: None
),
(Danari, Male, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-2.0, -4.0, 1.0)),
vox_spec: ("armor.misc.head.hood_dark", (-2.0, -7.0, -3.0)),
color: None
),
(Danari, Female, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-2.0, -4.0, 1.0)),
vox_spec: ("armor.misc.head.hood_dark", (-2.0, -7.0, -3.0)),
color: None
),
(Undead, Male, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-6.0, -4.0, 1.0)),
vox_spec: ("armor.misc.head.hood_dark", (-6.0, -7.0, -3.0)),
color: None
),
(Undead, Female, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-6.0, -4.0, -0.0)),
vox_spec: ("armor.misc.head.hood_dark", (-6.0, -7.0, -4.0)),
color: None
),
(Orc, Male, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-3.0, -2.0, 1.0)),
vox_spec: ("armor.misc.head.hood_dark", (-3.0, -5.0, -4.0)),
color: None
),
(Orc, Female, "DarkHood"): (
vox_spec: ("armor.misc.head.hood_dark", (-3.0, -5.0, -1.0)),
vox_spec: ("armor.misc.head.hood_dark", (-3.0, -8.0, -5.0)),
color: None
),
//
@ -913,100 +913,100 @@
),
//Winged Coronet -1, 5
(Human, Male, "WingedCoronet"): (
vox_spec: ("armor.misc.head.winged_coronet", (-5.0, -3.0, -1.0)),
vox_spec: ("armor.misc.head.winged_coronet", (-4.0, -4.0, -1.0)),
color: None
),
(Human, Female, "WingedCoronet"): (
vox_spec: ("armor.misc.head.winged_coronet", (-4.0, -2.0, -1.0)),
vox_spec: ("armor.misc.head.winged_coronet", (-4.0, -3.0, -1.0)),
color: None
),
(Elf, Male, "WingedCoronet"): (
vox_spec: ("armor.misc.head.winged_coronet", (-3.0, -2.0, -1.0)),
vox_spec: ("armor.misc.head.winged_coronet", (-3.0, -4.0, -1.0)),
color: None
),
(Elf, Female, "WingedCoronet"): (
vox_spec: ("armor.misc.head.winged_coronet", (-3.0, -2.0, -1.0)),
vox_spec: ("armor.misc.head.winged_coronet", (-3.0, -4.0, -1.0)),
color: None
),
(Dwarf, Male, "WingedCoronet"): (
vox_spec: ("armor.misc.head.winged_coronet", (-5.0, -1.0, -14.0)),
vox_spec: ("armor.misc.head.winged_coronet", (-5.0, -3.0, -2.5)),
color: None
),
(Dwarf, Female, "WingedCoronet"): (
vox_spec: ("armor.misc.head.winged_coronet", (-5.0, -1.0, -4.0)),
vox_spec: ("armor.misc.head.winged_coronet", (-5.0, -3.0, -2.5)),
color: None
),
(Danari, Male, "WingedCoronet"): (
vox_spec: ("armor.misc.head.winged_coronet", (-2.0, -2.0, 0.0)),
vox_spec: ("armor.misc.head.winged_coronet", (-2.0, -3.0, 0.0)),
color: None
),
(Danari, Female, "WingedCoronet"): (
vox_spec: ("armor.misc.head.winged_coronet", (-2.0, -2.0, 0.0)),
vox_spec: ("armor.misc.head.winged_coronet", (-2.0, -3.0, 0.0)),
color: None
),
(Undead, Male, "WingedCoronet"): (
vox_spec: ("armor.misc.head.winged_coronet", (-6.0, -2.0, -8.0)),
vox_spec: ("armor.misc.head.winged_coronet", (-6.0, -5.0, 0.0)),
color: None
),
(Undead, Female, "WingedCoronet"): (
vox_spec: ("armor.misc.head.winged_coronet", (-6.0, -2.0, -9.0)),
vox_spec: ("armor.misc.head.winged_coronet", (-6.0, -5.0, -1.0)),
color: None
),
(Orc, Male, "WingedCoronet"): (
vox_spec: ("armor.misc.head.winged_coronet", (-3.0, -4.0, 1.0)),
vox_spec: ("armor.misc.head.winged_coronet", (-3.0, -2.0, 1.0)),
color: None
),
(Orc, Female, "WingedCoronet"): (
vox_spec: ("armor.misc.head.winged_coronet", (-3.0, -6.0, -1.0)),
vox_spec: ("armor.misc.head.winged_coronet", (-3.0, -5.0, -1.0)),
color: None
),
// Boreal Warhelmet
(Human, Male, "BorealWarhelm"): (
vox_spec: ("armor.misc.head.boreal_warhelm", (-3.0, -3.0, -0.0)),
vox_spec: ("armor.misc.head.boreal_warhelm", (-4.0, -5.0, -4.0)),
color: None
),
(Human, Female, "BorealWarhelm"): (
vox_spec: ("armor.misc.head.boreal_warhelm", (-3.0, -1.0, -0.0)),
vox_spec: ("armor.misc.head.boreal_warhelm", (-4.0, -5.0, -4.0)),
color: None
),
(Elf, Male, "BorealWarhelm"): (
vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)),
vox_spec: ("armor.misc.head.boreal_warhelm", (-3.0, -6.0, -4.0)),
color: None
),
(Elf, Female, "BorealWarhelm"): (
vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)),
vox_spec: ("armor.misc.head.boreal_warhelm", (-3.0, -6.0, -4.0)),
color: None
),
(Dwarf, Male, "BorealWarhelm"): (
vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)),
vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -5.0, -4.0)),
color: None
),
(Dwarf, Female, "BorealWarhelm"): (
vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)),
vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -5.0, -4.0)),
color: None
),
(Danari, Male, "BorealWarhelm"): (
vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)),
vox_spec: ("armor.misc.head.boreal_warhelm", (-2.0, -6.0, -2.0)),
color: None
),
(Danari, Female, "BorealWarhelm"): (
vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)),
vox_spec: ("armor.misc.head.boreal_warhelm", (-2.0, -6.0, -2.0)),
color: None
),
(Undead, Male, "BorealWarhelm"): (
vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)),
vox_spec: ("armor.misc.head.boreal_warhelm", (-6.0, -6.0, -3.0)),
color: None
),
(Undead, Female, "BorealWarhelm"): (
vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)),
vox_spec: ("armor.misc.head.boreal_warhelm", (-6.0, -6.0, -3.0)),
color: None
),
(Orc, Male, "BorealWarhelm"): (
vox_spec: ("armor.misc.head.boreal_warhelm", (-2.0, -1.0, 1.0)),
vox_spec: ("armor.misc.head.boreal_warhelm", (-3.0, -4.0, -2.0)),
color: None
),
(Orc, Female, "BorealWarhelm"): (
vox_spec: ("armor.misc.head.boreal_warhelm", (-5.0, -2.0, 0.0)),
vox_spec: ("armor.misc.head.boreal_warhelm", (-3.0, -7.0, -4.0)),
color: None
),
// Woolly Wintercap (Christmas hat+event)

2
common/src/calendar.rs
View File

@ -33,7 +33,7 @@ impl Calendar {
None => Local::now().naive_local(),
};
if now.month() == 12 && (10..=30).contains(&now.day()) {
if now.month() == 12 && (20..=30).contains(&now.day()) {
this.events.push(CalendarEvent::Christmas);
}