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

Merge branch 'fix_facegourd_name' into 'master'

Browse Source 
fix facegourd item name

See merge request veloren/veloren!3674
This commit is contained in:
Joshua Barretto 2022-10-27 13:49:07 +00:00
commit ab8d61afc8
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
ItemDef( ItemDef(
name: "Pumpkin Head.", name: "Facegourd",
description: "Halloween attire.", description: "Pumpkin Head.",
kind: Armor(( kind: Armor((
kind: Head, kind: Head,
stats: Direct(( stats: Direct((

1
assets/common/loot_tables/calendar/halloween/halloween_harvester.ron
View File

@ -5,5 +5,4 @@
(5.0, LootTable("common.loot_tables.armor.tier-3")), (5.0, LootTable("common.loot_tables.armor.tier-3")),
// Misc // Misc
(2.0, Item("common.items.armor.misc.head.facegourd")), (2.0, Item("common.items.armor.misc.head.facegourd")),
(2.0, Item("common.items.lantern.pumpkin")),
] ]

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

@ -643,11 +643,11 @@
color: None color: None
), ),
(Dwarf, Female, "common.items.armor.misc.head.helmet"): ( (Dwarf, Female, "common.items.armor.misc.head.helmet"): (
vox_spec: ("armor.misc.head.helmet", (-5.0, -4.0, -1.0)), vox_spec: ("armor.misc.head.helmet", (-5.0, -5.0, -1.0)),
color: None color: None
), ),
(Dwarf, Male, "common.items.armor.misc.head.helmet"): ( (Dwarf, Male, "common.items.armor.misc.head.helmet"): (
vox_spec: ("armor.misc.head.helmet", (-3.0, -3.0, -1.0)), vox_spec: ("armor.misc.head.helmet", (-5.0, -5.0, -1.0)),
color: None color: None
), ),
(Draugr, Female, "common.items.armor.misc.head.helmet"): ( (Draugr, Female, "common.items.armor.misc.head.helmet"): (
@ -970,11 +970,11 @@
color: None color: None
), ),
(Elf, Female, "common.items.armor.misc.head.facegourd"): ( (Elf, Female, "common.items.armor.misc.head.facegourd"): (
vox_spec: ("armor.misc.head.facegourd", (-3.0, -5.0, -1.0)), vox_spec: ("armor.misc.head.facegourd", (-3.0, -6.0, -1.0)),
color: None color: None
), ),
(Elf, Male, "common.items.armor.misc.head.facegourd"): ( (Elf, Male, "common.items.armor.misc.head.facegourd"): (
vox_spec: ("armor.misc.head.facegourd", (-3.0, -5.0, -1.0)), vox_spec: ("armor.misc.head.facegourd", (-3.0, -6.0, -1.0)),
color: None color: None
), ),
(Orc, Female, "common.items.armor.misc.head.facegourd"): ( (Orc, Female, "common.items.armor.misc.head.facegourd"): (
@ -986,11 +986,11 @@
color: None color: None
), ),
(Dwarf, Female, "common.items.armor.misc.head.facegourd"): ( (Dwarf, Female, "common.items.armor.misc.head.facegourd"): (
vox_spec: ("armor.misc.head.facegourd", (-5.0, -4.0, -1.0)), vox_spec: ("armor.misc.head.facegourd", (-5.0, -5.0, -1.0)),
color: None color: None
), ),
(Dwarf, Male, "common.items.armor.misc.head.facegourd"): ( (Dwarf, Male, "common.items.armor.misc.head.facegourd"): (
vox_spec: ("armor.misc.head.facegourd", (-3.0, -3.0, -1.0)), vox_spec: ("armor.misc.head.facegourd", (-5.0, -5.0, -1.0)),
color: None color: None
), ),
(Draugr, Female, "common.items.armor.misc.head.facegourd"): ( (Draugr, Female, "common.items.armor.misc.head.facegourd"): (
@ -1002,11 +1002,11 @@
color: None color: None
), ),
(Danari, Female, "common.items.armor.misc.head.facegourd"): ( (Danari, Female, "common.items.armor.misc.head.facegourd"): (
vox_spec: ("armor.misc.head.facegourd", (-2.0, -5.0, 1.0)), vox_spec: ("armor.misc.head.facegourd", (-2.0, -6.0, 1.0)),
color: None color: None
), ),
(Danari, Male, "common.items.armor.misc.head.facegourd"): ( (Danari, Male, "common.items.armor.misc.head.facegourd"): (
vox_spec: ("armor.misc.head.facegourd", (-2.0, -5.0, -1.0)), vox_spec: ("armor.misc.head.facegourd", (-2.0, -6.0, 1.0)),
color: None color: None
), ),
// Merchant Turban // Merchant Turban