Don't add elemental multiple times

marius00 · Aug 24, 2021 · 7991a39 · 7991a39
1 parent bffc675
commit 7991a39
Showing 1 changed file with 6 additions and 19 deletions.
diff --git a/IAGrim/UI/Filters/Damage.cs b/IAGrim/UI/Filters/Damage.cs
@@ -42,30 +42,17 @@ public partial class Damage : UserControl {
                 if (dmgAcid.Checked)
                     dmgTypes.Add("Poison");
 
-                if (dmgElemental.Checked)
+                if (dmgElemental.Checked || dmgTypes.Contains("Fire") || dmgTypes.Contains("Cold") || dmgTypes.Contains("Lightning"))
                     dmgTypes.Add("Elemental");
 
                 if (totalDamage.Checked)
                     filters.Add(new[] {"offensiveTotalDamageModifier"});
 
-                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"
-                        });
-                }
+                foreach (var damageType in dmgTypes)
+                    filters.Add(new[] {
+                        $"offensive{damageType}",
+                        $"offensive{damageType}Modifier"
+                    });
 
                 return filters;
             }