3.11.2

ffhighwind · Jun 24, 2020 · 19b4a12 · 19b4a12
1 parent 3afed0e
commit 19b4a12
Show file tree

Hide file tree

Showing 15 changed files with 271 additions and 159 deletions.
diff --git a/DataModel.cs b/DataModel.cs
@@ -209,9 +209,15 @@ private void DivinationJsonHandler(JsonData jdata, LeagueData data)
 		private void LoadUniquesCsv()
 		{
 			FileHelperEngine<UniqueBaseTypeCsv> engine = new FileHelperEngine<UniqueBaseTypeCsv>(Encoding.UTF8);
-			string csvText = new FileInfo(uniquesCsvFile).Exists ?
-				File.ReadAllText("poe_uniques.csv", Encoding.UTF8)
-				: Util.ReadWebPage(repoURL + "poe_uniques.csv", "", Encoding.UTF8);
+			bool exists = new FileInfo(uniquesCsvFile).Exists;
+			string csvText;
+			if (exists) {
+				csvText = File.ReadAllText("poe_uniques.csv", Encoding.UTF7);
+				if (!csvText.Contains("Maelström Staff"))
+					csvText = File.ReadAllText("poe_uniques.csv", Encoding.UTF8);
+			}
+			else
+				csvText = Util.ReadWebPage(repoURL + "poe_uniques.csv", "", Encoding.UTF8);
 			UniqueBaseTypeCsv[] records = engine.ReadString(csvText);
 			foreach (UniqueBaseTypeCsv csvdata in records) {
 				if (!SC.Uniques.ContainsKey(csvdata.BaseType)) {
@@ -382,7 +388,7 @@ private void GetFilterUniqueData(IEnumerable<string> lines)
 					return;
 				string line = lines.ElementAt(0);
 
-				if (!line.Contains("# Uniques -")) { 
+				if (!line.Contains("# Uniques -")) {
 					lines = lines.Skip(1);
 					continue;
 				}

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.11.1]
-LastUpdate [6.18.2020]
+Version [3.11.2]
+LastUpdate [6.24.2020]
 PoEVersion [3.11.x]
 ForumThread [https://www.pathofexile.com/forum/view-thread/1490867]
 

diff --git a/poe_helm_enchants.csv b/poe_helm_enchants.csv
@@ -313,10 +313,10 @@ Enchantment Dominating Blow Duration 2,Eternal Labyrinth,30% increased Sentinel
 Enchantment Dominating Blow Additional Magic 1,Merciless Labyrinth,Dominating Blow can summon 2 additional Magic Sentinels of Dominance,Dominating Blow
 Enchantment Dominating Blow Duration 1,Merciless Labyrinth,20% increased Sentinel of Dominance Duration,Dominating Blow
 Enchantment Dominating Blow Additional Rare 1,Eternal Labyrinth,Dominating Blow can summon an additional Rare Sentinel of Dominance,Dominating Blow
-Enchantment Double Slash Added Phys To Bleeding 2,Eternal Labyrinth,Lacerate deals (14-18) to (20-25) added Physical Damage against Bleeding Enemies,Double Slash
+Enchantment Double Slash Added Phys To Bleeding 2,Eternal Labyrinth,Lacerate deals 14 to 25 added Physical Damage against Bleeding Enemies,Double Slash
 Enchantment Double Slash Critical Strikes 2,Eternal Labyrinth,60% increased Lacerate Critical Strike Chance,Double Slash
 Enchantment Double Slash Area Of Effect 2,Eternal Labyrinth,24% increased Lacerate Area of Effect,Double Slash
-Enchantment Double Slash Added Phys To Bleeding 1,Merciless Labyrinth,Lacerate deals (4-8) to (10-15) added Physical Damage against Bleeding Enemies,Double Slash
+Enchantment Double Slash Added Phys To Bleeding 1,Merciless Labyrinth,Lacerate deals 4 to 15 added Physical Damage against Bleeding Enemies,Double Slash
 Enchantment Double Slash Critical Strikes 1,Merciless Labyrinth,40% increased Lacerate Critical Strike Chance,Double Slash
 Enchantment Double Slash Area Of Effect 1,Merciless Labyrinth,16% increased Lacerate Area of Effect,Double Slash
 Enchantment Double Strike Attack Speed 2,Eternal Labyrinth,15% increased Double Strike Attack Speed,Double Strike
@@ -1151,3 +1151,4 @@ Enchantment Zombie Attack Speed 2,Eternal Labyrinth,Raised Zombies have 15% incr
 Enchantment Zombie Attack Speed 1,Merciless Labyrinth,Raised Zombies have 10% increased Attack Speed,Raise Zombies
 Enchantment Zombie Elemental Resistances 2,Eternal Labyrinth,Raised Zombies have +36% to Elemental Resistances,Raise Zombies
 Enchantment Zombie Elemental Resistances 1,Merciless Labyrinth,Raised Zombies have +24% to Elemental Resistances,Raise Zombies
+Enchantment Pyroclast Mine Additional Projectiles 2,Eternal Labyrinth,Pyroclast Mine fires 2 additional Projectiles,Pyroclast Mine
diff --git a/poe_uniques.csv b/poe_uniques.csv
@@ -831,4 +831,11 @@ Citrine Amulet,Retaliation Charm,,,,
 Necromancer Silks,Fleshcrafter,,,,
 Leather Belt,Bear's Girdle,,,,
 Ezomyte Axe,Wings of Entropy,,,,
-Archon Kite Shield,The Unshattered Will,Harbinger,,Crafted
+Archon Kite Shield,The Immortal Will,Harbinger,,,Crafted
+Blunt Arrow Quiver,The Shattered Divinity,Harbinger,,,Crafted
+Callous Mask,The Tempest's Liberation,Harbinger,,,Crafted
+Cloth Belt,The Torrent's Reclamation,Harbinger,,,Crafted
+Imperial Staff,The Yielding Mortality,Harbinger,,,Crafted
+Legion Sword,The Surging Thoughts,Harbinger,,,Crafted
+Bone Circlet,Plume of Pursuit,Harvest,,"Oshabi, Avatar of the Grove"
+Hellion's Paw,Law of the Wilds,Harvest,,"Oshabi, Avatar of the Grove"