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

Fix Clippy errors

Browse Source 
Fix code formatting

Add descriptions for other potential buffs for consumables
This commit is contained in:
Lippy13
2021-02-25 17:22:30 +00:00
parent 43c35f957f
commit ffd0c01bbd
1 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
voxygen/src/hud/util.rs
View File

@ -46,7 +46,9 @@ pub fn item_text<'a>(
item.description(), item.description(),
)), )),
ItemKind::Glider(_glider) => Cow::Owned(glider_desc(item.description())), ItemKind::Glider(_glider) => Cow::Owned(glider_desc(item.description())),
ItemKind::Consumable { effect, .. } => Cow::Owned(consumable_desc(Some(effect), item.description())), ItemKind::Consumable { effect, .. } => {
Cow::Owned(consumable_desc(Some(effect), item.description()))
},
ItemKind::Throwable { .. } => Cow::Owned(throwable_desc(item.description())), ItemKind::Throwable { .. } => Cow::Owned(throwable_desc(item.description())),
ItemKind::Utility { .. } => Cow::Owned(utility_desc(item.description())), ItemKind::Utility { .. } => Cow::Owned(utility_desc(item.description())),
ItemKind::Ingredient { .. } => Cow::Owned(ingredient_desc( ItemKind::Ingredient { .. } => Cow::Owned(ingredient_desc(
@ -86,35 +88,40 @@ fn glider_desc(desc: &str) -> String { format!("Glider\n\n{}\n\n<Right-Click to
fn consumable_desc(maybe_effects: Option<&Vec<Effect>>, desc: &str) -> String { fn consumable_desc(maybe_effects: Option<&Vec<Effect>>, desc: &str) -> String {
// TODO: localization // TODO: localization
let mut description = format!( let mut description = "Consumable".to_string();
"Consumable"
);
if let Some(effects) = maybe_effects { if let Some(effects) = maybe_effects {
for effect in effects { for effect in effects {
match effect { if let Effect::Buff(buff) = effect {
Effect::Buff(buff) => { let strength = buff.data.strength * 0.1;
let dur_secs = buff.data.duration.unwrap().as_secs_f32();
let str_total = strength * dur_secs;
let dur_secs = buff.data.duration.unwrap().as_secs_f32(); let buff_desc = match buff.kind {
let str_total = buff.data.strength * 0.1 * dur_secs; BuffKind::Saturation { .. } | BuffKind::Regeneration { .. } => {
format!("Restores {} Health over {} seconds", str_total, dur_secs)
},
BuffKind::Potion { .. } => {
format!("Restores {} Health", str_total)
},
BuffKind::IncreaseMaxEnergy { .. } => {
format!(
"Raises Maximum Stamina by {} for {} seconds",
strength, dur_secs
)
},
BuffKind::IncreaseMaxHealth { .. } => {
format!(
"Raises Maximum Health by {} for {} seconds",
strength, dur_secs
)
},
_ => String::new(),
};
let buff_desc = match buff.kind { if !buff_desc.is_empty() {
BuffKind::Saturation { .. } => { write!(&mut description, "\n\n{}", buff_desc).unwrap();
format!("Restores {} Health over {} seconds", str_total, dur_secs) }
},
BuffKind::Potion { .. } => {
format!("Restores {} Health", str_total)
},
_ => {
String::new()
},
};
if !buff_desc.is_empty() {
write!(&mut description, "\n\n{}", buff_desc).unwrap();
}
},
_ => (),
} }
} }
} }