Skip to content

Commit

Permalink
Revert "Don't add elemental multiple times"
Browse files Browse the repository at this point in the history
Commit reverted as it broke Fire, Cold and Lightning damage, causing the query to use AND instead of OR.
This reverts commit 7991a39.
  • Loading branch information
M committed Aug 24, 2021
1 parent ca16b74 commit 37cba3b
Showing 1 changed file with 19 additions and 6 deletions.
25 changes: 19 additions & 6 deletions IAGrim/UI/Filters/Damage.cs
Expand Up @@ -42,17 +42,30 @@ public partial class Damage : UserControl {
if (dmgAcid.Checked)
dmgTypes.Add("Poison");

if (dmgElemental.Checked || dmgTypes.Contains("Fire") || dmgTypes.Contains("Cold") || dmgTypes.Contains("Lightning"))
if (dmgElemental.Checked)
dmgTypes.Add("Elemental");

if (totalDamage.Checked)
filters.Add(new[] {"offensiveTotalDamageModifier"});

foreach (var damageType in dmgTypes)
filters.Add(new[] {
$"offensive{damageType}",
$"offensive{damageType}Modifier"
});
foreach (var damageType in dmgTypes) {
var isElemental = damageType.Equals("Fire") ||
damageType.Equals("Cold") ||
damageType.Equals("Lightning");

if (isElemental)
filters.Add(new[] {
$"offensive{damageType}",
$"offensive{damageType}Modifier",
"offensiveElemental",
"offensiveElementalModifier"
});
else
filters.Add(new[] {
$"offensive{damageType}",
$"offensive{damageType}Modifier"
});
}

return filters;
}
Expand Down

0 comments on commit 37cba3b

Please sign in to comment.