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

Christmas tweaks

Browse Source
This commit is contained in:
Youssef Fahmy 2021-12-21 22:58:41 +00:00 committed by Joshua Barretto
parent 824a978cdb
commit 04a37ba29c
16 changed files with 59 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
assets/common/items/armor/misc/head/bamboo_twig.ron
View File

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

1
assets/common/items/armor/misc/head/bandana/red.ron
View File

@ -4,6 +4,7 @@ ItemDef(
kind: Armor((
kind: Head("Red"),
stats: (
crit_power: Some(0.08),
stealth: Some(0.15),
),
)),

1
assets/common/items/armor/misc/head/bandana/thief.ron
View File

@ -4,6 +4,7 @@ ItemDef(
kind: Armor((
kind: Head("Thief"),
stats: (
crit_power: Some(0.07),
stealth: Some(0.18),
),
)),

2
assets/common/items/armor/misc/head/helmet.ron
View File

@ -4,6 +4,8 @@ ItemDef(
kind: Armor((
kind: Head("Helmet"),
stats: (
protection: Some(Normal(16.0)),
poise_resilience: Some(Normal(3.0)),
),
)),
quality: Moderate,

8
assets/common/items/armor/misc/head/hog_hood.ron
View File

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

4
assets/common/items/armor/misc/head/hood.ron
View File

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

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

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

6
assets/common/items/armor/misc/head/wanderers_hat.ron
View File

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

4
assets/common/items/armor/pirate/hat.ron
View File

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

3
assets/common/items/armor/witch/hat.ron
View File

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

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

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

3
assets/common/loot_tables/calendar/christmas/boss.ron
View File

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

7
assets/common/loot_tables/calendar/christmas/yeti.ron
View File

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

4
assets/voxygen/item_image_manifest.ron
View File

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

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

Binary file not shown.

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

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