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

+ Added Gemu models

Browse Source 
+ Created manifest files for each
+ Created stats and other needs
+ Changed Event date from (24..=25) to (20..=30)
This commit is contained in:
UncomfySilence 2021-12-11 22:40:33 +01:00 committed by Joshua Barretto
parent cd995b5ffe
commit e70fd8d397
16 changed files with 262 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
assets/common/items/armor/misc/head/boreal_warhelm.ron Normal file
View File

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

10
assets/common/items/armor/misc/head/hood_dark.ron
View File

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

10
assets/common/items/armor/misc/head/mitre.ron
View File

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

10
assets/common/items/armor/misc/head/spikeguard.ron
View File

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

17
assets/common/items/armor/misc/head/winged_coronet.ron Normal file
View File

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

17
assets/common/items/calendar/christmas/armor/misc/head/woolly_wintercap.ron Normal file
View File

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

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

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

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

@ -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"))),
]),
})

9
assets/common/recipe_book.ron
View File

@ -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: [

16
assets/voxygen/item_image_manifest.ron
View File

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

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

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

2
common/src/calendar.rs
View File

@ -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);
}