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 'pfau/things' into 'master'

Browse Source 
Add gnarling chieftain mask

See merge request veloren/veloren!3657
This commit is contained in:
Marcel 2022-10-15 11:05:21 +00:00
commit 471b5996c3
7 changed files with 91 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,17 @@
ItemDef(
name: "Chieftain Mask",
description: "It smells like burned wood.",
kind: Armor((
kind: Head,
stats: Direct((
protection: Some(Normal(4.0)),
poise_resilience: Some(Normal(0.5)),
energy_max: Some(4.0),
energy_reward: Some(0.03),
)),
)),
quality: High,
tags: [
Gnarling,
],
)

13
assets/common/items/tag_examples/gnarling.ron Normal file
View File

@ -0,0 +1,13 @@
ItemDef(
name: "Attire of the Gnarling tribes",
description: "Worn by Gnarlings and their Chieftains.",
kind: TagExamples(
item_ids: [
"common.items.armor.mist.head.gnarling_mask",
],
),
quality: Common,
tags: [],
)

2
assets/common/loot_tables/dungeon/tier-0/chieftain.ron
View File

@ -6,6 +6,8 @@
// Misc
(3.0, Item("common.items.armor.misc.neck.scratched")),
(2.0, Item("common.items.armor.misc.head.wanderers_hat")),
// Chieftain Mask
(1.0, Item("common.items.armor.misc.head.gnarling_mask")),
// Indirect crafting materials for T2 gear
(1.0, ItemQuantity("common.items.crafting_ing.sticky_thread", 2, 5)),
(1.0, ItemQuantity("common.items.mineral.ore.coal", 2, 5)),

4
assets/voxygen/item_image_manifest.ron
View File

@ -2802,6 +2802,10 @@
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
),
//Hats
Simple("common.items.armor.misc.head.gnarling_mask"): VoxTrans(
"voxel.armor.misc.head.gnarling_mask",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,
),
Simple("common.items.armor.witch.hat"): VoxTrans(
"voxel.armor.witch.hat",
(0.0, 0.0, 0.0), (-120.0, 210.0,15.0), 0.9,

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

Binary file not shown.

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

@ -1156,6 +1156,54 @@
vox_spec: ("armor.misc.head.woolly_wintercap", (-3.0, -8.0, -4.0)),
color: None
),
// Gnarling Chieftain Mask
(Human, Male, "common.items.armor.misc.head.gnarling_mask"): (
vox_spec: ("armor.misc.head.gnarling_mask", (-4.0, 1.0, -2.0)),
color: None
),
(Human, Female, "common.items.armor.misc.head.gnarling_mask"): (
vox_spec: ("armor.misc.head.gnarling_mask", (-4.0, 1.0, -1.0)),
color: None
),
(Elf, Male, "common.items.armor.misc.head.gnarling_mask"): (
vox_spec: ("armor.misc.head.gnarling_mask", (-3.0, 1.0, -2.0)),
color: None
),
(Elf, Female, "common.items.armor.misc.head.gnarling_mask"): (
vox_spec: ("armor.misc.head.gnarling_mask", (-3.0, 1.0, -2.0)),
color: None
),
(Dwarf, Male, "common.items.armor.misc.head.gnarling_mask"): (
vox_spec: ("armor.misc.head.gnarling_mask", (-5.0, 2.0, -2.0)),
color: None
),
(Dwarf, Female, "common.items.armor.misc.head.gnarling_mask"): (
vox_spec: ("armor.misc.head.gnarling_mask", (-5.0, 2.0, -1.0)),
color: None
),
(Danari, Male, "common.items.armor.misc.head.gnarling_mask"): (
vox_spec: ("armor.misc.head.gnarling_mask", (-2.0, 0.0, 2.0)),
color: None
),
(Danari, Female, "common.items.armor.misc.head.gnarling_mask"): (
vox_spec: ("armor.misc.head.gnarling_mask", (-2.0, 1.0, 2.0)),
color: None
),
(Draugr, Male, "common.items.armor.misc.head.gnarling_mask"): (
vox_spec: ("armor.misc.head.gnarling_mask", (-6.0, 1.0, 0.0)),
color: None
),
(Draugr, Female, "common.items.armor.misc.head.gnarling_mask"): (
vox_spec: ("armor.misc.head.gnarling_mask", (-6.0, 1.0, 0.0)),
color: None
),
(Orc, Male, "common.items.armor.misc.head.gnarling_mask"): (
vox_spec: ("armor.misc.head.gnarling_mask", (-3.0, 1.0, 0.0)),
color: None
),
(Orc, Female, "common.items.armor.misc.head.gnarling_mask"): (
vox_spec: ("armor.misc.head.gnarling_mask", (-3.0, 0.0, -1.0)),
color: None
),
}
))

3
common/src/comp/inventory/item/mod.rs
View File

@ -217,6 +217,7 @@ pub enum ItemTag {
/// Used to indicate that an item is composed of this material kind
MaterialKind(MaterialKind),
Cultist,
Gnarling,
Potion,
Food,
BaseMaterial, // Cloth-scraps, Leather...
@ -232,6 +233,7 @@ impl TagExampleInfo for ItemTag {
ItemTag::Material(material) => material.name(),
ItemTag::MaterialKind(material_kind) => material_kind.into(),
ItemTag::Cultist => "cultist",
ItemTag::Gnarling => "gnarling",
ItemTag::Potion => "potion",
ItemTag::Food => "food",
ItemTag::BaseMaterial => "basemat",
@ -248,6 +250,7 @@ impl TagExampleInfo for ItemTag {
ItemTag::Material(material) => material.exemplar_identifier(),
ItemTag::MaterialKind(_) => None,
ItemTag::Cultist => Some("common.items.tag_examples.cultist"),
ItemTag::Gnarling => Some("common.items.tag_examples.gnarling"),
ItemTag::Potion => None,
ItemTag::Food => None,
ItemTag::BaseMaterial => None,