Update stat filters

POEApi.Model/GearType/GearTypeFactory.cs

@@ -8,8 +8,8 @@ internal class GearTypeFactory
         {
             { new HelmetRunner() },
             { new RingRunner() },
-            { new AmuletRunner() },
             { new TalismanRunner() },
+            { new AmuletRunner() },
             { new BeltRunner() },
             { new FlaskRunner() },
             { new GloveRunner() },

POEApi.Model/GearType/GearTypeRunner.cs

@@ -125,6 +125,7 @@ public HelmetRunner()
             : base(GearType.Helmet, Settings.GearBaseTypes[GearType.Helmet])
         {
             _generalTypes.AddRange(new List<string>() { "Helmet", "Circlet", "Cap", "Mask", "Chain Coif", "Casque", "Hood", "Ringmail Coif", "Chainmail Coif", "Ring Coif", "Crown", "Burgonet", "Bascinet", "Pelt" });
+            _incompatibleTypes.Add("Her Mask");
         }
     }
 
@@ -200,7 +201,7 @@ public GloveRunner()
             : base(GearType.Gloves, Settings.GearBaseTypes[GearType.Gloves])
         {
             _generalTypes.Add("Glove");
-            _generalTypes.Add("Mitts");
+            _generalTypes.Add(" Mitts");
             _generalTypes.Add("Gauntlets");
         }
     }
@@ -302,6 +303,7 @@ public SwordRunner()
         {
             _generalTypes.AddRange(new List<string>() { "Sword", "sword", "Sabre", "Dusk Blade", "Cutlass", "Baselard", "Gladius", "Variscite Blade", "Vaal Blade", "Midnight Blade", "Corroded Blade",
                    "Highland Blade", "Ezomyte Blade", "Rusted Spike", "Rapier", "Foil", "Pecoraro", "Estoc", "Twilight Blade", "Lithe Blade" });
+            _incompatibleTypes.Add("The Sword King's Salute");
         }
     }
 

Procurement/Procurement.csproj

@@ -181,7 +181,7 @@
     <Compile Include="Utility\StashHelper.cs" />
     <Compile Include="Utility\VersionChecker.cs" />
     <Compile Include="ViewModel\AdvancedSearchCategory.cs" />
-    <Compile Include="ViewModel\Filters\ForumExport\AccurayFilter.cs" />
+    <Compile Include="ViewModel\Filters\ForumExport\AccuracyFilter.cs" />
     <Compile Include="ViewModel\Filters\ForumExport\CraftedModFilter.cs" />
     <Compile Include="ViewModel\Filters\ForumExport\CurrencyFilter.cs" />
     <Compile Include="ViewModel\Filters\ForumExport\DamageChaos.cs" />
@@ -209,6 +209,7 @@
     <Compile Include="ViewModel\Filters\ForumExport\PercentLifeFilter.cs" />
     <Compile Include="ViewModel\Filters\ForumExport\ProphecyFilter.cs" />
     <Compile Include="ViewModel\Filters\ForumExport\ShaperItemFilter.cs" />
+    <Compile Include="ViewModel\Filters\ForumExport\SixWhiteSockets.cs" />
     <Compile Include="ViewModel\Filters\ForumExport\SixBlueSockets.cs" />
     <Compile Include="ViewModel\Filters\ForumExport\SixGreenSockets.cs" />
     <Compile Include="ViewModel\Filters\ForumExport\SixLink.cs" />
@@ -236,6 +237,8 @@
     <Compile Include="ViewModel\DisplayModeStrategy\StringFormatStrategy.cs" />
     <Compile Include="ViewModel\DisplayModeStrategy\ValuesPlusNameStrategy.cs" />
     <Compile Include="ViewModel\Filters\ForumExport\EnergyShieldFilter.cs" />
+    <Compile Include="ViewModel\Filters\ForumExport\ArmourFilter.cs" />
+    <Compile Include="ViewModel\Filters\ForumExport\EvasionFilter.cs" />
     <Compile Include="ViewModel\Filters\ForumExport\IncreasedPhysicalDamageFilter.cs" />
     <Compile Include="ViewModel\Filters\ForumExport\ManaFilter.cs" />
     <Compile Include="ViewModel\Filters\ForumExport\ManaRegenFilter.cs" />
@@ -266,6 +269,7 @@
     <Compile Include="ViewModel\Filters\ForumExport\ColdResistance.cs" />
     <Compile Include="ViewModel\Filters\ForumExport\CorruptedGemFilter.cs" />
     <Compile Include="ViewModel\Filters\ForumExport\CritChanceFilter.cs" />
+    <Compile Include="ViewModel\Filters\ForumExport\CritMultiplierFilter.cs" />
     <Compile Include="ViewModel\Filters\ForumExport\GlobalCritMultiplierFilter.cs" />
     <Compile Include="ViewModel\Filters\ForumExport\CurseGemFilter.cs" />
     <Compile Include="ViewModel\Filters\ForumExport\DamageCold.cs" />

Procurement/ViewModel/Filters/ForumExport/AccurayFilter.cs → Procurement/ViewModel/Filters/ForumExport/AccuracyFilter.cs

@@ -5,14 +5,14 @@
 
 namespace Procurement.ViewModel.Filters.ForumExport
 {
-    internal class AccurayFilter : StatFilter
+    internal class AccuracyFilter : StatFilter
     {
         public override FilterGroup Group
         {
             get { return FilterGroup.Attacks; }
         }
 
-        public AccurayFilter()
+        public AccuracyFilter()
             : base("Increased Accuracy", "Increased Accuracy", "Accuracy")
         { }
     }

Procurement/ViewModel/Filters/ForumExport/ArmourFilter.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Procurement.ViewModel.Filters.ForumExport
+{
+    public class ArmourFilter : OrStatFilter
+    {
+        public ArmourFilter()
+            : base("Armour", "Items with additional or increased Armour", "to Armour", "increased Armour", "increased Global Armour", "increased Global Defences")
+        { }
+
+        public override FilterGroup Group
+        {
+            get { return FilterGroup.Default; }
+        }
+    }
+}

Procurement/ViewModel/Filters/ForumExport/AttackSpeed.cs

@@ -1,14 +1,14 @@
 namespace Procurement.ViewModel.Filters.ForumExport
 {
-    internal class AttackSpeed : StatFilter
+    internal class AttackSpeed : OrStatFilter
     {
         public override FilterGroup Group
         {
             get { return FilterGroup.Attacks; }
         }
 
         public AttackSpeed()
-            : base("Increased Attack Speed", "Increased Attack Speed", "Increased Attack Speed")
+            : base("Increased Attack Speed", "Increased Attack Speed", "increased Attack Speed", "increased Attack and Cast Speed", "increased Attack, Cast and Movement Speed")
         { }
     }
 }

Procurement/ViewModel/Filters/ForumExport/CastSpeed.cs

@@ -1,14 +1,14 @@
 namespace Procurement.ViewModel.Filters.ForumExport
 {
-    internal class CastSpeed : StatFilter
+    internal class CastSpeed : OrStatFilter
     {
         public override FilterGroup Group
         {
             get { return FilterGroup.Attacks; }
         }
 
         public CastSpeed()
-            : base("Increased Cast Speed", "Increased Cast Speed", "Increased Cast Speed")
+            : base("Increased Cast Speed", "Increased Cast Speed", "increased Cast Speed", "increased Attack and Cast Speed", "increased Attack, Cast and Movement Speed")
         { }
     }
 }

Procurement/ViewModel/Filters/ForumExport/ChaosResistance.cs

@@ -1,14 +1,14 @@
 namespace Procurement.ViewModel.Filters
 {
-    internal class ChaosResistance : StatFilter
+    internal class ChaosResistance : OrStatFilter
     {
         public override FilterGroup Group
         {
             get { return FilterGroup.Resistances; }
         }
 
         public ChaosResistance()
-            : base("Chaos Resistance", "Chaos Resistance", "to Chaos Resistance")
+            : base("Chaos Resistance", "Chaos Resistance", "to Chaos Resistance", "to Fire and Chaos Resistances", "to Cold and Chaos Resistances", "to Lightning and Chaos Resistances")
         { }
     }
 }

Procurement/ViewModel/Filters/ForumExport/CharacterAttributeFilters.cs

@@ -1,39 +1,39 @@
 namespace Procurement.ViewModel.Filters.ForumExport
 {
-    class StrengthFilter : StatFilter
+    class StrengthFilter : OrStatFilter
     {
         public override FilterGroup Group
         {
             get { return FilterGroup.CharacterAttributes; }
         }
 
         public StrengthFilter()
-            : base("Increased Strength", "Strength", "Strength")
+            : base("Increased Strength", "Increased Strength", "to Strength", "increased Strength", "to all Attributes", "increased Attributes")
         { }
     }
 
 
-    class IntelligenceFilter : StatFilter
+    class IntelligenceFilter : OrStatFilter
     {
         public override FilterGroup Group
         {
             get { return FilterGroup.CharacterAttributes; }
         }
 
         public IntelligenceFilter()
-            : base("Increased Intelligence", "Intelligence", "Intelligence")
+            : base("Increased Intelligence", "Increased Intelligence", "to Intelligence", "to Strength and Intelligence", "to Dexterity and Intelligence", "increased Intelligence", "to all Attributes", "increased Attributes")
         { }
     }
 
-    class DexterityFilter : StatFilter
+    class DexterityFilter : OrStatFilter
     {
         public override FilterGroup Group
         {
             get { return FilterGroup.CharacterAttributes; }
         }
 
         public DexterityFilter()
-            : base("Increased Dexterity", "Increased Dexterity", "Dexterity")
+            : base("Increased Dexterity", "Increased Dexterity", "to Dexterity", "to Strength and Dexterity", "increased Dexterity", "to all Attributes", "increased Attributes")
         { }
     }
 }

Procurement/ViewModel/Filters/ForumExport/ColdResistance.cs

@@ -8,7 +8,7 @@ public override FilterGroup Group
         }
 
         public ColdResistance()
-            : base("Cold Resistance", "Cold Resistance", "to Cold Resistance", "to Fire and Cold Resistances", "to Cold and Lightning Resistances")
+            : base("Cold Resistance", "Cold Resistance", "to Cold Resistance", "to Fire and Cold Resistances", "to Cold and Lightning Resistances", "to Cold and Chaos Resistances", "to all Elemental Resistances")
         { }
     }
 }

Procurement/ViewModel/Filters/ForumExport/CritChanceFilter.cs

@@ -8,7 +8,7 @@ namespace Procurement.ViewModel.Filters.ForumExport
     public class CritChanceFilter : ExplicitModBase
     {
         public CritChanceFilter()
-            : base("increased Critical Strike Chance")
+            : base("Critical Strike Chance")
         { }
 
         public override bool CanFormCategory
@@ -18,7 +18,7 @@ public override bool CanFormCategory
 
         public override string Keyword
         {
-            get { return "Crit Chance"; }
+            get { return "Critical Strike Chance"; }
         }
 
         public override string Help

Procurement/ViewModel/Filters/ForumExport/CritMultiplierFilter.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Procurement.ViewModel.Filters.ForumExport
+{
+    public class CritMultiplierFilter : ExplicitModBase
+    {
+        public CritMultiplierFilter()
+            : base("Critical Strike Multiplier")
+        { }
+
+        public override bool CanFormCategory
+        {
+            get { return false; }
+        }
+
+        public override string Keyword
+        {
+            get { return "Critical Strike Multiplier"; }
+        }
+
+        public override string Help
+        {
+            get { return "Items with additional Critical Strike Multiplier"; }
+        }
+
+        public override FilterGroup Group
+        {
+            get { return FilterGroup.Crit; }
+        }
+    }
+}

Procurement/ViewModel/Filters/ForumExport/DamageChaos.cs

@@ -1,14 +1,14 @@
 namespace Procurement.ViewModel.Filters.ForumExport
 {
-    internal class DamageChaos : StatFilter
+    internal class DamageChaos : OrStatFilter
     {
         public override FilterGroup Group
         {
             get { return FilterGroup.Damage; }
         }
 
         public DamageChaos()
-            : base("Adds Chaos Damage", "Adds Chaos Damage", "Adds \\d+ to \\d+ Chaos Damage")
+            : base("Adds Chaos Damage", "Adds Chaos Damage", "Adds \\d+ to \\d+ Chaos Damage", "as Extra Chaos Damage")
         { }
     }
 }

Procurement/ViewModel/Filters/ForumExport/DamageCold.cs

@@ -1,14 +1,14 @@
 namespace Procurement.ViewModel.Filters.ForumExport
 {
-    internal class DamageCold : StatFilter
+    internal class DamageCold : OrStatFilter
     {
         public override FilterGroup Group
         {
             get { return FilterGroup.Damage; }
         }
 
         public DamageCold()
-            : base("Adds Cold Damage", "Adds Cold Damage", "Adds \\d+ to \\d+ Cold Damage")
+            : base("Adds Cold Damage", "Adds Cold Damage", "Adds \\d+ to \\d+ Cold Damage", "as Extra Cold Damage", "as Extra Damage of each Element", "as Extra Damage of a random Element")
         { }
     }
 }

Procurement/ViewModel/Filters/ForumExport/DamageFire.cs

@@ -1,14 +1,14 @@
 namespace Procurement.ViewModel.Filters.ForumExport
 {
-    internal class DamageFire : StatFilter
+    internal class DamageFire : OrStatFilter
     {
         public override FilterGroup Group
         {
             get { return FilterGroup.Damage; }
         }
 
         public DamageFire()
-            : base("Adds Fire Damage", "Adds Fire Damage", "Adds \\d+ to \\d+ Fire Damage")
+            : base("Adds Fire Damage", "Adds Fire Damage", "Adds \\d+ to \\d+ Fire Damage", "as Extra Fire Damage", "as Extra Damage of each Element", "as Extra Damage of a random Element")
         { }
     }
 }

Procurement/ViewModel/Filters/ForumExport/DamageLightning.cs

@@ -1,14 +1,14 @@
 namespace Procurement.ViewModel.Filters.ForumExport
 {
-    internal class DamageLightning: StatFilter
+    internal class DamageLightning: OrStatFilter
     {
         public override FilterGroup Group
         {
             get { return FilterGroup.Damage; }
         }
 
         public DamageLightning()
-            : base("Adds Lightning Damage", "Adds Lightning Damage", "Adds \\d+ to \\d+ Lightning Damage")
+            : base("Adds Lightning Damage", "Adds Lightning Damage", "Adds \\d+ to \\d+ Lightning Damage", "as Extra Lightning Damage", "as Extra Damage of each Element", "as Extra Damage of a random Element")
         { }
     }
 }

Procurement/ViewModel/Filters/ForumExport/DamageTriple.cs

@@ -6,7 +6,7 @@ namespace Procurement.ViewModel.Filters.ForumExport
 {
     internal class DamageTriple : IFilter
     {
-        private List<StatFilter> resistances;
+        private List<OrStatFilter> resistances;
 
         public FilterGroup Group
         {
@@ -15,7 +15,7 @@ public FilterGroup Group
 
         public DamageTriple()
         {
-            resistances = new List<StatFilter>();
+            resistances = new List<OrStatFilter>();
             resistances.Add(new DamageCold());
             resistances.Add(new DamageFire());
             resistances.Add(new DamageLightning());

Procurement/ViewModel/Filters/ForumExport/EvasionFilter.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Procurement.ViewModel.Filters.ForumExport
+{
+    public class EvasionFilter : OrStatFilter
+    {
+        public EvasionFilter()
+            : base("Evasion", "Items with additional or increased Evasion", "Evasion Rating", "increased Armour and Evasion", "increased Evasion and Energy Shield", "increased Armour, Evasion and Energy Shield", "increased Global Defences")
+        { }
+
+        public override FilterGroup Group
+        {
+            get { return FilterGroup.Default; }
+        }
+    }
+}