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

Debug items no longer have durability

Browse Source
This commit is contained in:
Sam 2023-04-14 18:25:24 -04:00
parent 553aa690b4
commit 9d503d1e1f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1230,7 +1230,9 @@ impl Item {
DurabilityMultiplier(mult)
}
pub fn has_durability(&self) -> bool { self.kind().has_durability() }
pub fn has_durability(&self) -> bool {
self.kind().has_durability() && self.quality() != Quality::Debug
}
pub fn increment_damage(&mut self, ability_map: &AbilityMap, msm: &MaterialStatManifest) {
if let Some(durability_lost) = &mut self.durability_lost {
@ -1353,7 +1355,9 @@ impl ItemDesc for ItemDef {
fn components(&self) -> &[Item] { &[] }
fn has_durability(&self) -> bool { self.kind().has_durability() }
fn has_durability(&self) -> bool {
self.kind().has_durability() && self.quality != Quality::Debug
}
fn durability(&self) -> Option<u32> { None }

4
voxygen/src/ui/widgets/item_tooltip.rs
View File

@ -773,7 +773,7 @@ impl<'a> Widget for ItemTooltip<'a> {
);
diff_text(text, buff_strength_diff.1, 6)
}
if tool_durability != equipped_durability {
if tool_durability != equipped_durability && item.has_durability() {
let text = format!(
"{} {}",
&durability_diff.0,
@ -1020,7 +1020,7 @@ impl<'a> Widget for ItemTooltip<'a> {
}
index += armor_stats.stealth.is_some() as usize;
if armor_durability != equipped_durability {
if armor_durability != equipped_durability && item.has_durability() {
let diff = armor_durability.unwrap_or(Item::MAX_DURABILITY) as i32
- equipped_durability.unwrap_or(Item::MAX_DURABILITY) as i32;
let text = format!("{} {}", &durability_diff.0, diff);