3.15.3

ffhighwind · Jul 26, 2021 · 4a119b8 · 4a119b8
1 parent cd44a55
commit 4a119b8
Show file tree

Hide file tree

Showing 17 changed files with 3,054 additions and 2,831 deletions.
diff --git a/DataModel.cs b/DataModel.cs
@@ -419,8 +419,13 @@ private void GetFilterUniqueData(IEnumerable<string> lines)
 				line = lines.First().TrimStart();
 				if (line.StartsWith("BaseType ")) {
 					IEnumerable<string> baseTypes = SplitQuotedList(line).Skip(1);
-					FillFilterUniqueData(SC, baseTypes, value);
-					FillFilterUniqueData(HC, baseTypes, value);
+					if (baseTypes.Any()) {
+						if (new string[]{ "=", "==", ">=", "<=" }.Contains(baseTypes.First())) {
+							baseTypes = baseTypes.Skip(1);
+						}
+						FillFilterUniqueData(SC, baseTypes, value);
+						FillFilterUniqueData(HC, baseTypes, value);
+					}
 				}
 			}
 		}

diff --git a/Enchants/EnchantCsv.cs b/Enchants/EnchantCsv.cs
@@ -41,7 +41,7 @@ public class EnchantCsv
 		public EnchantmentSource Source { get; set; }
 
 		//[FieldConverter(ConverterKind.PercentDouble)] // not working?
-		public string DropRate { get; set; }
+		//public string DropRate { get; set; }
 
 		internal class DifficultyConverter : ConverterBase
 		{

diff --git a/Resources/Filters/Filters.zip b/Resources/Filters/Filters.zip
diff --git a/Resources/Filters/L1_Regular_Highwind.filter b/Resources/Filters/L1_Regular_Highwind.filter
diff --git a/Resources/Filters/L2_Mapping_Highwind.filter b/Resources/Filters/L2_Mapping_Highwind.filter
diff --git a/Resources/Filters/L3_Semi_Strict_Highwind.filter b/Resources/Filters/L3_Semi_Strict_Highwind.filter
diff --git a/Resources/Filters/L4_Strict_Highwind.filter b/Resources/Filters/L4_Strict_Highwind.filter
diff --git a/Resources/Filters/L5_Very_Strict_Highwind.filter b/Resources/Filters/L5_Very_Strict_Highwind.filter
diff --git a/Resources/Filters/S1_Regular_Highwind.filter b/Resources/Filters/S1_Regular_Highwind.filter
diff --git a/Resources/Filters/S2_Mapping_Highwind.filter b/Resources/Filters/S2_Mapping_Highwind.filter
diff --git a/Resources/Filters/S3_Semi_Strict_Highwind.filter b/Resources/Filters/S3_Semi_Strict_Highwind.filter
diff --git a/Resources/Filters/S4_Strict_Highwind.filter b/Resources/Filters/S4_Strict_Highwind.filter
diff --git a/Resources/Filters/S5_Very_Strict_Highwind.filter b/Resources/Filters/S5_Very_Strict_Highwind.filter
diff --git a/Resources/filterblast_config.txt b/Resources/filterblast_config.txt
@@ -1,7 +1,7 @@
 Filter [Highwind's Loot Filter]
 
-Version [3.15.2]
-LastUpdate [7.23.2021]
+Version [3.15.3]
+LastUpdate [7.25.2021]
 PoEVersion [3.15.x]
 ForumThread [https://www.pathofexile.com/forum/view-thread/1490867]
 

diff --git a/poe_base_types.csv b/poe_base_types.csv
diff --git a/poe_enchants.csv b/poe_enchants.csv
diff --git a/poe_uniques.csv b/poe_uniques.csv
@@ -985,3 +985,14 @@ Zerphi's Heart,Jewellery,,Amulet,Paua Amulet,6/1/2018,3.3.0,Incursion,,,Crafted,
 Zerphi's Last Breath,Flasks,,Mana Flask,Grand Mana Flask,4/14/2016,2.2.2,Perandus,,,,https://pathofexile.fandom.com/wiki/Zerphi%27s_Last_Breath,
 Yaomac's Accord,One Handed Weapon,,Sceptres,Vaal Sceptre,4/16/2021,3.14.0,Ultimatum,,,Ultimatum Boss,https://pathofexile.fandom.com/wiki/Yaomac%27s_Accord,
 Hateforge,Armour,Armour,Gloves,Ancient Gauntlets,4/16/2021,3.14.0,Ultimatum,,,,https://pathofexile.fandom.com/wiki/Hateforge,
+Elixir of the Unbroken Circle,Flasks,,Utility Flask,Iron Flask,7/23/2021,3.15.0,Expedition,,,,https://pathofexile.fandom.com/wiki/Elixir_of_the_Unbroken_Circle,
+Faithguard,Armour,Ward,Helmet,Runic Helm,7/23/2021,3.15.0,Expedition,,,,https://pathofexile.fandom.com/wiki/Faithguard,
+Medved's Challenge,Armour,Ward,Gloves,Runic Gauntlets,7/23/2021,3.15.0,Expedition,,,,https://pathofexile.fandom.com/wiki/Medved%27s_Challenge,
+Nightgrip,Armour,Ward,Gloves,Runic Gages,7/23/2021,3.15.0,Expedition,,,,https://pathofexile.fandom.com/wiki/Nightgrip,
+Olroth's Charge,Armour,Ward,Boots,Runic Sollerets,7/23/2021,3.15.0,Expedition,,,,https://pathofexile.fandom.com/wiki/Olroth%27s_Charge,
+Olroth's Resolve,Flasks,,Utility Flask,Iron Flask,7/23/2021,3.15.0,Expedition,,,,https://pathofexile.fandom.com/wiki/Olroth%27s_Resolve,
+Starlight Chalice,Flasks,,Utility Flask,Iron Flask,7/23/2021,3.15.0,Expedition,,,,https://pathofexile.fandom.com/wiki/Starlight_Chalice,
+Triumvirate Authority,Jewellery,,Ring,Unset Ring,7/23/2021,3.15.0,Expedition,,,Atziri | Uber Atziri,https://pathofexile.fandom.com/wiki/Triumvirate_Authority,
+Vorana's March,Armour,Ward,Boots,Runic Sabatons,7/23/2021,3.15.0,Expedition,,,,https://pathofexile.fandom.com/wiki/Vorana%27s_March,
+Vorana's Preparation,Flasks,,Utility Flask,Iron Flask,7/23/2021,3.15.0,Expedition,,,,https://pathofexile.fandom.com/wiki/Vorana%27s_Preparation,
+Cadigan's Crown,Armour,Ward,Helmet,Runic Crown,7/23/2021,3.15.0,Expedition,,,,https://pathofexile.fandom.com/wiki/Cadigan%27s_Crown,