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 'swilliams/craft-leather-scraps' into 'master'

Browse Source 
Added leather scraps recipe

See merge request veloren/veloren!2000
This commit is contained in:
Samuel Keiffer 2021-03-26 17:54:43 +00:00
commit b4840ce48d
20 changed files with 51 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/items/armor/agile/back.ron
View File

@ -9,5 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [],
tags: [LeatherItem],
)

2
assets/common/items/armor/agile/belt.ron
View File

@ -9,5 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
tags: [LeatherItem],
)

2
assets/common/items/armor/agile/chest.ron
View File

@ -9,5 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
tags: [LeatherItem],
)

2
assets/common/items/armor/agile/foot.ron
View File

@ -9,5 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
tags: [LeatherItem],
)

2
assets/common/items/armor/agile/hand.ron
View File

@ -9,5 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
tags: [LeatherItem],
)

2
assets/common/items/armor/agile/pants.ron
View File

@ -9,5 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
tags: [LeatherItem],
)

2
assets/common/items/armor/agile/shoulder.ron
View File

@ -9,5 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
tags: [LeatherItem],
)

2
assets/common/items/armor/rugged/chest.ron
View File

@ -9,5 +9,5 @@ ItemDef(
),
)),
quality: Low,
tags: [],
tags: [ClothItem],
)

2
assets/common/items/armor/rugged/pants.ron
View File

@ -9,5 +9,5 @@ ItemDef(
),
)),
quality: Low,
tags: [],
tags: [ClothItem],
)

2
assets/common/items/armor/swift/belt.ron
View File

@ -9,5 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [],
tags: [LeatherItem],
)

2
assets/common/items/armor/swift/chest.ron
View File

@ -9,5 +9,5 @@ ItemDef(
),
)),
quality: Moderate,
tags: [],
tags: [LeatherItem],
)

2
assets/common/items/armor/swift/foot.ron
View File

@ -9,5 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [],
tags: [LeatherItem],
)

2
assets/common/items/armor/swift/hand.ron
View File

@ -9,5 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [],
tags: [LeatherItem],
)

2
assets/common/items/armor/swift/head.ron
View File

@ -9,5 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [],
tags: [LeatherItem],
)

2
assets/common/items/armor/swift/pants.ron
View File

@ -9,5 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [],
tags: [LeatherItem],
)

2
assets/common/items/armor/swift/shoulder.ron
View File

@ -9,5 +9,5 @@ ItemDef(
),
)),
quality: Common,
tags: [],
tags: [LeatherItem],
)

2
assets/common/items/tag_examples/cloth_item.ron
View File

@ -3,6 +3,8 @@ ItemDef(
description: "Various colored fabric armors.",
kind: TagExamples(
item_ids: [
"common.items.armor.rugged.chest",
"common.items.armor.rugged.pants",
"common.items.armor.cloth_blue.foot",
"common.items.armor.cloth_blue.hand",
"common.items.armor.cloth_blue.pants",

23
assets/common/items/tag_examples/leather_item.ron Normal file
View File

@ -0,0 +1,23 @@
ItemDef(
name: "Any leather item",
description: "Various leather armors.",
kind: TagExamples(
item_ids: [
"common.items.armor.agile.back",
"common.items.armor.agile.belt",
"common.items.armor.agile.chest",
"common.items.armor.agile.foot",
"common.items.armor.agile.hand",
"common.items.armor.agile.pants",
"common.items.armor.agile.shoulder",
"common.items.armor.swift.belt",
"common.items.armor.swift.chest",
"common.items.armor.swift.foot",
"common.items.armor.swift.hand",
"common.items.armor.swift.pants",
],
),
quality: Common,
tags: [],
)

7
assets/common/recipe_book.ron
View File

@ -391,6 +391,13 @@
(Item("common.items.crafting_tools.sewing_set"), 0),
],
),
"leather_scraps": (
("common.items.crafting_ing.leather_scraps", 1),
[
(Tag(LeatherItem), 1),
(Item("common.items.crafting_tools.sewing_set"), 0),
],
),
//"metal_blade": (
// ("common.items.crafting_ing.modular.damage.sword.metal_blade", 1),
// [

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

@ -93,6 +93,7 @@ pub trait TagExampleInfo {
#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
pub enum ItemTag {
ClothItem,
LeatherItem,
ModularComponent(ModularComponentTag),
MetalIngot,
Cultist,
@ -102,6 +103,7 @@ impl TagExampleInfo for ItemTag {
fn name(&self) -> &'static str {
match self {
ItemTag::ClothItem => "cloth item",
ItemTag::LeatherItem => "leather item",
ItemTag::ModularComponent(kind) => kind.name(),
ItemTag::MetalIngot => "metal ingot",
ItemTag::Cultist => "cultist",
@ -111,6 +113,7 @@ impl TagExampleInfo for ItemTag {
fn exemplar_identifier(&self) -> &'static str {
match self {
ItemTag::ClothItem => "common.items.tag_examples.cloth_item",
ItemTag::LeatherItem => "common.items.tag_examples.leather_item",
ItemTag::ModularComponent(tag) => tag.exemplar_identifier(),
ItemTag::MetalIngot => "common.items.tag_examples.metal_ingot",
ItemTag::Cultist => "common.items.tag_examples.cultist",