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

Addresses some comments

Browse Source
This commit is contained in:
Snowram 2020-11-01 14:39:32 +01:00
parent ce96af4363
commit a52f83e92c
25 changed files with 220 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/common/items/boss_drops/exp_flask.ron
View File

@ -3,11 +3,9 @@ ItemDef(
description: "Increases Exp by 250\n\nTake with plenty of water\n\n<Right-Click to use>",
kind: Consumable(
kind: "PotionExp",
effect: Some(
[
effect: [
Xp(250),
]
),
),
quality: High,
)

4
assets/common/items/boss_drops/potions.ron
View File

@ -3,14 +3,12 @@ ItemDef(
description: "A potent healing potion.\n\nRestores 100 health on use\n\n<Right-Click to use>",
kind: Consumable(
kind: "Potion",
effect: Some(
[
effect: [
Health((
amount: 1000,
cause: Item,
)),
]
),
),
quality: High,
)

4
assets/common/items/boss_drops/xp_potion.ron
View File

@ -3,11 +3,9 @@ ItemDef(
description: "Provides 250 XP to the drinker\n\n<Right-Click to use>",
kind: Consumable(
kind: "Potion",
effect: Some(
[
effect: [
Xp(250),
]
),
),
quality: High,
)

4
assets/common/items/consumable/potion_big.ron
View File

@ -3,14 +3,12 @@ ItemDef(
description: "Restores 100 Health",
kind: Consumable(
kind: "PotionLarge",
effect: Some(
[
effect: [
Health((
amount: 1000,
cause: Item,
)),
]
),
),
quality: Common,
)

4
assets/common/items/consumable/potion_med.ron
View File

@ -3,14 +3,12 @@ ItemDef(
description: "Restores 70 Health",
kind: Consumable(
kind: "PotionMed",
effect: Some(
[
effect: [
Health((
amount: 700,
cause: Item,
)),
]
),
),
quality: Common,
)

4
assets/common/items/consumable/potion_minor.ron
View File

@ -3,14 +3,12 @@ ItemDef(
description: "Restores 50 Health",
kind: Consumable(
kind: "PotionMinor",
effect: Some(
[
effect: [
Health((
amount: 500,
cause: Item,
)),
]
),
),
quality: Common,
)

4
assets/common/items/food/apple.ron
View File

@ -3,8 +3,7 @@ ItemDef(
description: "Restores 10 Health over 10 seconds\n\nRed and juicy",
kind: Consumable(
kind: "Apple",
effect: Some(
[
effect: [
Buff((
kind: Saturation,
data: (
@ -18,6 +17,5 @@ ItemDef(
)),
]
),
),
quality: Common,
)

6
assets/common/items/food/apple_mushroom_curry.ron
View File

@ -3,12 +3,11 @@ ItemDef(
description: "Restores 120 Health over 5 seconds\n\nWho could say no to that?",
kind: Consumable(
kind: "AppleShroomCurry",
effect: Some(
[
effect: [
Buff((
kind: Saturation,
data: (
strength: 120.0,
strength: 240.0,
duration: Some((
secs: 5,
nanos: 0,
@ -18,6 +17,5 @@ ItemDef(
)),
]
),
),
quality: Moderate,
)

6
assets/common/items/food/apple_stick.ron
View File

@ -3,12 +3,11 @@ ItemDef(
description: "Restores 25 Health over 5 seconds\n\nThe stick makes it easier to carry!",
kind: Consumable(
kind: "AppleStick",
effect: Some(
[
effect: [
Buff((
kind: Saturation,
data: (
strength: 25.0,
strength: 50.0,
duration: Some((
secs: 5,
nanos: 0,
@ -18,6 +17,5 @@ ItemDef(
)),
]
),
),
quality: Common,
)

4
assets/common/items/food/cheese.ron
View File

@ -3,8 +3,7 @@ ItemDef(
description: "Restores 15 Health over 10 seconds\n\nAromatic and nutritious",
kind: Consumable(
kind: "Cheese",
effect: Some(
[
effect: [
Buff((
kind: Saturation,
data: (
@ -18,6 +17,5 @@ ItemDef(
)),
]
),
),
quality: Common,
)

4
assets/common/items/food/coconut.ron
View File

@ -3,8 +3,7 @@ ItemDef(
description: "Restores 20 health over 10 seconds\n\nReliable source of water and fat",
kind: Consumable(
kind: "Coconut",
effect: Some(
[
effect: [
Buff((
kind: Saturation,
data: (
@ -18,6 +17,5 @@ ItemDef(
)),
]
),
),
quality: Common,
)

4
assets/common/items/food/mushroom.ron
View File

@ -3,8 +3,7 @@ ItemDef(
description: "Restores 5 Health over 10 seconds\n\nHopefully this one is not poisonous",
kind: Consumable(
kind: "Mushroom",
effect: Some(
[
effect: [
Buff((
kind: Saturation,
data: (
@ -18,6 +17,5 @@ ItemDef(
)),
]
),
),
quality: Common,
)

6
assets/common/items/food/mushroom_stick.ron
View File

@ -3,12 +3,11 @@ ItemDef(
description: "Restores 20 Health over 5 seconds\n\nRoasted mushrooms on a stick for easy carrying.",
kind: Consumable(
kind: "MushroomStick",
effect: Some(
[
effect: [
Buff((
kind: Saturation,
data: (
strength: 20.0,
strength: 40.0,
duration: Some((
secs: 5,
nanos: 0,
@ -18,6 +17,5 @@ ItemDef(
)),
]
),
),
quality: Common,
)

6
assets/common/items/food/sunflower_icetea.ron
View File

@ -3,12 +3,11 @@ ItemDef(
description: "Restores 50 Health over 5 seconds\n\nBrewed from freshly shelled sunflower seeds.",
kind: Consumable(
kind: "SunflowerTea",
effect: Some(
[
effect: [
Buff((
kind: Saturation,
data: (
strength: 50.0,
strength: 100.0,
duration: Some((
secs: 5,
nanos: 0,
@ -18,6 +17,5 @@ ItemDef(
)),
]
),
),
quality: Moderate,
)

4
assets/common/items/ore/velorite.ron
View File

@ -3,11 +3,9 @@ ItemDef(
description: "Increases Exp by 20\n\nJust a slight touch makes you feel the knowledge of ancient times",
kind: Consumable(
kind: "Velorite",
effect: Some(
[
effect: [
Xp(20),
]
),
),
quality: High,
)

4
assets/common/items/ore/veloritefrag.ron
View File

@ -3,11 +3,9 @@ ItemDef(
description: "Increases Exp by 10\n\nSmall runes sparkle on its surface",
kind: Consumable(
kind: "VeloriteFrag",
effect: Some(
[
effect: [
Xp(10),
]
),
),
quality: Moderate,
)

BIN
assets/voxygen/element/icons/de_buffs/buff_saturation_0.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

8
assets/voxygen/i18n/de_DE.ron
View File

@ -513,11 +513,11 @@ Willenskraft
"buff.title.missing": "Fehlender Titel",
"buff.desc.missing": "Fehlende Beschreibung",
// Buffs
"buff.title.heal_test": "HoT Buff Test",
"buff.desc.heal_test": "HoT Buff Test",
"buff.title.heal": "HoT Buff Test",
"buff.desc.heal": "HoT Buff Test",
// Debuffs
"debuff.title.bleed_test": "Blutung",
"debuff.desc.bleed_test": "Fügt regelmäßig Schaden zu.",
"debuff.title.bleed": "Blutung",
"debuff.desc.bleed": "Fügt regelmäßig Schaden zu.",
},
vector_map: {

12
assets/voxygen/i18n/en.ron
View File

@ -520,13 +520,13 @@ Protection
"buff.title.missing": "Missing Title",
"buff.desc.missing": "Missing Description",
// Buffs
"buff.title.heal_test": "Heal Test",
"buff.desc.heal_test": "This is a test buff to test healing.",
"buff.title.saturation_test": "Saturation",
"buff.desc.saturation_test": "This is a test buff to test saturation.",
"buff.title.heal": "Heal",
"buff.desc.heal": "Gain health over time.",
"buff.title.saturation": "Saturation",
"buff.desc.saturation": "Gain health over time from consumables.",
// Debuffs
"debuff.title.bleed_test": "Bleeding",
"debuff.desc.bleed_test": "Inflicts regular damage.",
"debuff.title.bleed": "Bleeding",
"debuff.desc.bleed": "Inflicts regular damage.",
},

8
assets/voxygen/i18n/tr_TR.ron
View File

@ -520,11 +520,11 @@ Koruma
"buff.title.missing": "İsim Yok",
"buff.desc.missing": "Açıklama Yok",
// Buffs
"buff.title.heal_test": "İyileştirme Testi",
"buff.desc.heal_test": "Bu etki iyileştirmeyi test etmek için.",
"buff.title.heal": "İyileştirme Testi",
"buff.desc.heal": "Bu etki iyileştirmeyi test etmek için.",
// Debuffs
"debuff.title.bleed_test": "Kanama",
"debuff.desc.bleed_test": "Normal hasar verir.",
"debuff.title.bleed": "Kanama",
"debuff.desc.bleed": "Normal hasar verir.",
},
vector_map: {

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

@ -83,7 +83,7 @@ pub enum ItemKind {
Glider(Glider),
Consumable {
kind: String,
effect: Option<Vec<Effect>>,
effect: Vec<Effect>,
},
Throwable {
kind: Throwable,

44
voxygen/src/hud/buffs.rs
View File

@ -182,7 +182,7 @@ impl<'a> Widget for BuffsBar<'a> {
}) as u32; // Percentage to determine which frame of the timer overlay is displayed
let buff_img = match buff.kind {
BuffKind::Regeneration { .. } => self.imgs.buff_plus_0,
BuffKind::Saturation { .. } => self.imgs.buff_plus_0,
BuffKind::Saturation { .. } => self.imgs.buff_saturation_0,
_ => self.imgs.missing_icon,
};
let buff_widget = Image::new(buff_img).w_h(20.0, 20.0);
@ -205,11 +205,9 @@ impl<'a> Widget for BuffsBar<'a> {
.set(id, ui);
// Create Buff tooltip
let title = match buff.kind {
BuffKind::Regeneration { .. } => {
localized_strings.get("buff.title.heal_test")
},
BuffKind::Regeneration { .. } => localized_strings.get("buff.title.heal"),
BuffKind::Saturation { .. } => {
localized_strings.get("buff.title.saturation_test")
localized_strings.get("buff.title.saturation")
},
_ => localized_strings.get("buff.title.missing"),
};
@ -220,11 +218,9 @@ impl<'a> Widget for BuffsBar<'a> {
};
let click_to_remove = format!("<{}>", &localized_strings.get("buff.remove"));
let desc_txt = match buff.kind {
BuffKind::Regeneration { .. } => {
localized_strings.get("buff.desc.heal_test")
},
BuffKind::Regeneration { .. } => localized_strings.get("buff.desc.heal"),
BuffKind::Saturation { .. } => {
localized_strings.get("buff.desc.saturation_test")
localized_strings.get("buff.desc.saturation")
},
_ => localized_strings.get("buff.desc.missing"),
};
@ -303,9 +299,7 @@ impl<'a> Widget for BuffsBar<'a> {
.set(id, ui);
// Create Debuff tooltip
let title = match debuff.kind {
BuffKind::Bleeding { .. } => {
localized_strings.get("debuff.title.bleed_test")
},
BuffKind::Bleeding { .. } => localized_strings.get("debuff.title.bleed"),
_ => localized_strings.get("buff.title.missing"),
};
let remaining_time = if current_duration.is_none() {
@ -314,9 +308,7 @@ impl<'a> Widget for BuffsBar<'a> {
format!("Remaining: {:.0}s", current_duration.unwrap().as_secs_f32())
};
let desc_txt = match debuff.kind {
BuffKind::Bleeding { .. } => {
localized_strings.get("debuff.desc.bleed_test")
},
BuffKind::Bleeding { .. } => localized_strings.get("debuff.desc.bleed"),
_ => localized_strings.get("debuff.desc.missing"),
};
let desc = format!("{}\n\n{}", desc_txt, remaining_time);
@ -386,7 +378,7 @@ impl<'a> Widget for BuffsBar<'a> {
}) as u32;
let buff_img = match buff.kind {
BuffKind::Regeneration { .. } => self.imgs.buff_plus_0,
BuffKind::Saturation { .. } => self.imgs.buff_plus_0,
BuffKind::Saturation { .. } => self.imgs.buff_saturation_0,
BuffKind::Bleeding { .. } => self.imgs.debuff_bleed_0,
BuffKind::Cursed { .. } => self.imgs.debuff_skull_0,
};
@ -410,15 +402,11 @@ impl<'a> Widget for BuffsBar<'a> {
.set(id, ui);
// Create Buff tooltip
let title = match buff.kind {
BuffKind::Regeneration { .. } => {
localized_strings.get("buff.title.heal_test")
},
BuffKind::Regeneration { .. } => localized_strings.get("buff.title.heal"),
BuffKind::Saturation { .. } => {
localized_strings.get("buff.title.saturation_test")
},
BuffKind::Bleeding { .. } => {
localized_strings.get("debuff.title.bleed_test")
localized_strings.get("buff.title.saturation")
},
BuffKind::Bleeding { .. } => localized_strings.get("debuff.title.bleed"),
_ => localized_strings.get("buff.title.missing"),
};
let remaining_time = if current_duration.is_none() {
@ -428,15 +416,11 @@ impl<'a> Widget for BuffsBar<'a> {
};
let click_to_remove = format!("<{}>", &localized_strings.get("buff.remove"));
let desc_txt = match buff.kind {
BuffKind::Regeneration { .. } => {
localized_strings.get("buff.desc.heal_test")
},
BuffKind::Regeneration { .. } => localized_strings.get("buff.desc.heal"),
BuffKind::Saturation { .. } => {
localized_strings.get("buff.desc.saturation_test")
},
BuffKind::Bleeding { .. } => {
localized_strings.get("debuff.desc.bleed_test")
localized_strings.get("buff.desc.saturation")
},
BuffKind::Bleeding { .. } => localized_strings.get("debuff.desc.bleed"),
_ => localized_strings.get("buff.desc.missing"),
};
let desc = if buff.is_buff {

14
voxygen/src/hud/group.rs
View File

@ -482,7 +482,7 @@ impl<'a> Widget for Group<'a> {
}) as u32; // Percentage to determine which frame of the timer overlay is displayed
let buff_img = match buff.kind {
BuffKind::Regeneration { .. } => self.imgs.buff_plus_0,
BuffKind::Saturation { .. } => self.imgs.buff_plus_0,
BuffKind::Saturation { .. } => self.imgs.buff_saturation_0,
BuffKind::Bleeding { .. } => self.imgs.debuff_bleed_0,
BuffKind::Cursed { .. } => self.imgs.debuff_skull_0,
};
@ -511,13 +511,13 @@ impl<'a> Widget for Group<'a> {
// Create Buff tooltip
let title = match buff.kind {
BuffKind::Regeneration { .. } => {
localized_strings.get("buff.title.heal_test")
localized_strings.get("buff.title.heal")
},
BuffKind::Saturation { .. } => {
localized_strings.get("buff.title.saturation_test")
localized_strings.get("buff.title.saturation")
},
BuffKind::Bleeding { .. } => {
localized_strings.get("debuff.title.bleed_test")
localized_strings.get("debuff.title.bleed")
},
_ => localized_strings.get("buff.title.missing"),
};
@ -531,13 +531,13 @@ impl<'a> Widget for Group<'a> {
};
let desc_txt = match buff.kind {
BuffKind::Regeneration { .. } => {
localized_strings.get("buff.desc.heal_test")
localized_strings.get("buff.desc.heal")
},
BuffKind::Saturation { .. } => {
localized_strings.get("buff.desc.saturation_test")
localized_strings.get("buff.desc.saturation")
},
BuffKind::Bleeding { .. } => {
localized_strings.get("debuff.desc.bleed_test")
localized_strings.get("debuff.desc.bleed")
},
_ => localized_strings.get("buff.desc.missing"),
};

1
voxygen/src/hud/img_ids.rs
View File

@ -352,6 +352,7 @@ image_ids! {
// Buffs
buff_plus_0: "voxygen.element.icons.de_buffs.buff_plus_0",
buff_saturation_0: "voxygen.element.icons.de_buffs.buff_saturation_0",
// Debuffs
debuff_skull_0: "voxygen.element.icons.de_buffs.debuff_skull_0",

2
voxygen/src/hud/overhead.rs
View File

@ -243,7 +243,7 @@ impl<'a> Widget for Overhead<'a> {
}) as u32; // Percentage to determine which frame of the timer overlay is displayed
let buff_img = match buff.kind {
BuffKind::Regeneration { .. } => self.imgs.buff_plus_0,
BuffKind::Saturation { .. } => self.imgs.buff_plus_0,
BuffKind::Saturation { .. } => self.imgs.buff_saturation_0,
BuffKind::Bleeding { .. } => self.imgs.debuff_bleed_0,
BuffKind::Cursed { .. } => self.imgs.debuff_skull_0,
};