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

fmt

Browse Source
This commit is contained in:
Snowram
2020-11-05 21:56:45 +01:00
parent 642ad805a1
commit 262ceac060
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/comp/buff.rs
View File

@ -29,7 +29,7 @@ impl BuffKind {
BuffKind::Saturation { .. } => true, BuffKind::Saturation { .. } => true,
BuffKind::Bleeding { .. } => false, BuffKind::Bleeding { .. } => false,
BuffKind::Cursed { .. } => false, BuffKind::Cursed { .. } => false,
BuffKind::Potion {..} => true, BuffKind::Potion { .. } => true,
} }
} }
} }
@ -133,7 +133,7 @@ impl Buff {
accumulated: 0.0, accumulated: 0.0,
}], }],
data.duration, data.duration,
), ),
BuffKind::Cursed => ( BuffKind::Cursed => (
vec![BuffEffect::MaxHealthModifier { vec![BuffEffect::MaxHealthModifier {
value: -100. * data.strength, value: -100. * data.strength,

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

@ -210,9 +210,7 @@ impl<'a> Widget for BuffsBar<'a> {
BuffKind::Saturation { .. } => { BuffKind::Saturation { .. } => {
localized_strings.get("buff.title.saturation") localized_strings.get("buff.title.saturation")
}, },
BuffKind::Potion { .. } => { BuffKind::Potion { .. } => localized_strings.get("buff.title.potion"),
localized_strings.get("buff.title.potion")
},
_ => localized_strings.get("buff.title.missing"), _ => localized_strings.get("buff.title.missing"),
}; };
let remaining_time = if current_duration.is_none() { let remaining_time = if current_duration.is_none() {
@ -226,9 +224,7 @@ impl<'a> Widget for BuffsBar<'a> {
BuffKind::Saturation { .. } => { BuffKind::Saturation { .. } => {
localized_strings.get("buff.desc.saturation") localized_strings.get("buff.desc.saturation")
}, },
BuffKind::Potion { .. } => { BuffKind::Potion { .. } => localized_strings.get("buff.desc.potion"),
localized_strings.get("buff.desc.potion")
},
_ => localized_strings.get("buff.desc.missing"), _ => localized_strings.get("buff.desc.missing"),
}; };
let desc = format!("{}\n\n{}\n\n{}", desc_txt, remaining_time, click_to_remove); let desc = format!("{}\n\n{}\n\n{}", desc_txt, remaining_time, click_to_remove);
@ -414,9 +410,7 @@ impl<'a> Widget for BuffsBar<'a> {
BuffKind::Saturation { .. } => { BuffKind::Saturation { .. } => {
localized_strings.get("buff.title.saturation") localized_strings.get("buff.title.saturation")
}, },
BuffKind::Potion { .. } => { BuffKind::Potion { .. } => localized_strings.get("buff.title.potion"),
localized_strings.get("buff.title.potion")
},
BuffKind::Bleeding { .. } => localized_strings.get("debuff.title.bleed"), BuffKind::Bleeding { .. } => localized_strings.get("debuff.title.bleed"),
_ => localized_strings.get("buff.title.missing"), _ => localized_strings.get("buff.title.missing"),
}; };
@ -431,9 +425,7 @@ impl<'a> Widget for BuffsBar<'a> {
BuffKind::Saturation { .. } => { BuffKind::Saturation { .. } => {
localized_strings.get("buff.desc.saturation") localized_strings.get("buff.desc.saturation")
}, },
BuffKind::Potion { .. } => { BuffKind::Potion { .. } => localized_strings.get("buff.desc.potion"),
localized_strings.get("buff.desc.potion")
},
BuffKind::Bleeding { .. } => localized_strings.get("debuff.desc.bleed"), BuffKind::Bleeding { .. } => localized_strings.get("debuff.desc.bleed"),
_ => localized_strings.get("buff.desc.missing"), _ => localized_strings.get("buff.desc.missing"),
}; };