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 'combat' of https://gitlab.com/veloren/veloren into combat

Browse Source
This commit is contained in:
Pfauenauge90 2020-03-19 18:11:48 +01:00
commit b9b2833e97
22 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
assets/common/items/armor/belt_assassin.ron → assets/common/items/armor/belt/assassin.ron
View File

0
assets/common/items/armor/belt_leather-0.ron → assets/common/items/armor/belt/leather_0.ron
View File

0
assets/common/items/armor/belt_plate-0.ron → assets/common/items/armor/belt/plate_0.ron
View File

0
assets/common/items/armor/chest/chest_assassin.ron → assets/common/items/armor/chest/assassin.ron
View File

0
assets/common/items/armor/chest/chest_leather-0.ron → assets/common/items/armor/chest/leather_0.ron
View File

0
assets/common/items/armor/chest/chest_plate_green-0.ron → assets/common/items/armor/chest/plate_green_0.ron
View File

0
assets/common/items/armor/foot_assassin.ron → assets/common/items/armor/foot/assassin.ron
View File

0
assets/common/items/armor/foot_leather-0.ron → assets/common/items/armor/foot/leather_0.ron
View File

0
assets/common/items/armor/foot_plate-0.ron → assets/common/items/armor/foot/plate_0.ron
View File

0
assets/common/items/armor/hand_assassin.ron → assets/common/items/armor/hand/assassin.ron
View File

0
assets/common/items/armor/hand_leather-0.ron → assets/common/items/armor/hand/leather_0.ron
View File

0
assets/common/items/armor/hand_plate-0.ron → assets/common/items/armor/hand/plate_0.ron
View File

0
assets/common/items/armor/pants_assassin.ron → assets/common/items/armor/pants/assassin.ron
View File

0
assets/common/items/armor/pants_green-0.ron → assets/common/items/armor/pants/green_0.ron
View File

0
assets/common/items/armor/pants_leather-0.ron → assets/common/items/armor/pants/leather_0.ron
View File

0
assets/common/items/armor/pants_plate_green-0.ron → assets/common/items/armor/pants/plate_green_0.ron
View File

0
assets/common/items/armor/shoulder_assassin.ron → assets/common/items/armor/shoulder/assassin.ron
View File

0
assets/common/items/armor/shoulder_leather-0.ron → assets/common/items/armor/shoulder/leather_0.ron
View File

0
assets/common/items/armor/shoulder_leather-1.ron → assets/common/items/armor/shoulder/leather_1.ron
View File

0
assets/common/items/armor/shoulder_plate-0.ron → assets/common/items/armor/shoulder/plate_0.ron
View File

6
common/src/comp/inventory/item.rs
View File

@ -207,17 +207,17 @@ pub enum ItemKind {
Consumable {
kind: Consumable,
effect: Effect,
#[serde(skip, default = "default_amount")]
#[serde(default = "default_amount")]
amount: u32,
},
Utility {
kind: Utility,
#[serde(skip, default = "default_amount")]
#[serde(default = "default_amount")]
amount: u32,
},
Ingredient {
kind: Ingredient,
#[serde(skip, default = "default_amount")]
#[serde(default = "default_amount")]
amount: u32,
},
}

36
server/src/sys/terrain.rs
View File

@ -218,44 +218,44 @@ impl<'a> System<'a> for Sys {
active_item,
second_item: None,
shoulder: Some(assets::load_expect_cloned(
"common.items.armor.shoulder_leather-0",
"common.items.armor.shoulder.leather_0",
)),
chest: Some(assets::load_expect_cloned(
"common.items.armor.chest.chest_leather-0",
"common.items.armor.chest.leather_0",
)),
belt: Some(assets::load_expect_cloned(
"common.items.armor.belt_plate-0",
"common.items.armor.belt.plate_0",
)),
hand: Some(assets::load_expect_cloned(
"common.items.armor.hand_plate-0",
"common.items.armor.hand.plate_0",
)),
pants: Some(assets::load_expect_cloned(
"common.items.armor.pants_plate_green-0",
"common.items.armor.pants.plate_green_0",
)),
foot: Some(assets::load_expect_cloned(
"common.items.armor.foot_leather-0",
"common.items.armor.foot.leather_0",
)),
},
comp::Alignment::Enemy => comp::Loadout {
active_item,
second_item: None,
shoulder: Some(assets::load_expect_cloned(
"common.items.armor.shoulder_leather-0",
"common.items.armor.shoulder.leather_0",
)),
chest: Some(assets::load_expect_cloned(
"common.items.armor.chest.chest_plate_green-0",
"common.items.armor.chest.plate_green_0",
)),
belt: Some(assets::load_expect_cloned(
"common.items.armor.belt_plate-0",
"common.items.armor.belt.plate_0",
)),
hand: Some(assets::load_expect_cloned(
"common.items.armor.hand_plate-0",
"common.items.armor.hand.plate_0",
)),
pants: Some(assets::load_expect_cloned(
"common.items.armor.pants_plate_green-0",
"common.items.armor.pants.plate_green_0",
)),
foot: Some(assets::load_expect_cloned(
"common.items.armor.foot_plate-0",
"common.items.armor.foot.plate_0",
)),
},
_ => comp::Loadout {
@ -306,22 +306,22 @@ impl<'a> System<'a> for Sys {
}),
second_item: None,
shoulder: Some(assets::load_expect_cloned(
"common.items.armor.shoulder_plate-0",
"common.items.armor.shoulder.plate_0",
)),
chest: Some(assets::load_expect_cloned(
"common.items.armor.chest.chest_plate_green-0",
"common.items.armor.chest.plate_green_0",
)),
belt: Some(assets::load_expect_cloned(
"common.items.armor.belt_plate-0",
"common.items.armor.belt.plate_0",
)),
hand: Some(assets::load_expect_cloned(
"common.items.armor.hand_plate-0",
"common.items.armor.hand.plate_0",
)),
pants: Some(assets::load_expect_cloned(
"common.items.armor.pants_plate_green-0",
"common.items.armor.pants.plate_green_0",
)),
foot: Some(assets::load_expect_cloned(
"common.items.armor.foot_plate-0",
"common.items.armor.foot.plate_0",
)),
};