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 'ubruntu/fix-stat-comparisons-tooltip' into 'master'

Browse Source 
Fix stat comparisons in item tooltips

See merge request veloren/veloren!3062
This commit is contained in:
Samuel Keiffer 2021-12-18 02:31:30 +00:00
commit 1986d80a3c
1 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
common/src/comp/inventory/item/armor.rs
View File

@ -87,18 +87,43 @@ impl Sub<Stats> for Stats {
fn sub(self, other: Self) -> Self::Output {
Self {
protection: self.protection.zip(other.protection).map(|(a, b)| a - b),
poise_resilience: self
.poise_resilience
.zip(other.poise_resilience)
.map(|(a, b)| a - b),
energy_max: self.energy_max.zip(other.energy_max).map(|(a, b)| a - b),
energy_reward: self
.energy_reward
.zip(other.energy_reward)
.map(|(a, b)| a - b),
crit_power: self.crit_power.zip(other.crit_power).map(|(a, b)| a - b),
stealth: self.stealth.zip(other.stealth).map(|(a, b)| a - b),
protection: if self.protection.is_none() && other.protection.is_none() {
None
} else {
Some(
self.protection.unwrap_or(Protection::Normal(0.0))
- other.protection.unwrap_or(Protection::Normal(0.0)),
)
},
poise_resilience: if self.poise_resilience.is_none() && other.poise_resilience.is_none()
{
None
} else {
Some(
self.poise_resilience.unwrap_or(Protection::Normal(0.0))
- other.poise_resilience.unwrap_or(Protection::Normal(0.0)),
)
},
energy_max: if self.energy_max.is_none() && other.energy_max.is_none() {
None
} else {
Some(self.energy_max.unwrap_or(0.0) - other.energy_max.unwrap_or(0.0))
},
energy_reward: if self.energy_reward.is_none() && other.energy_reward.is_none() {
None
} else {
Some(self.energy_reward.unwrap_or(0.0) - other.energy_reward.unwrap_or(0.0))
},
crit_power: if self.crit_power.is_none() && other.crit_power.is_none() {
None
} else {
Some(self.crit_power.unwrap_or(0.0) - other.crit_power.unwrap_or(0.0))
},
stealth: if self.stealth.is_none() && other.stealth.is_none() {
None
} else {
Some(self.stealth.unwrap_or(0.0) - other.stealth.unwrap_or(0.0))
},
}
}
}