Build editor improvements (Closes #776) (#986)

Author: AlexMacocian

Daybreak.Shared/Models/Guildwars/Skill.cs

@@ -1494,7 +1494,7 @@ public sealed class Skill
     public static readonly Skill WeaponsofThreeForges = new() { Id = 3429, Name = "Weapons of Three Forges", Profession = Profession.Ritualist };
     public static readonly Skill VowofRevolution = new() { Id = 3430, Name = "Vow of Revolution", Profession = Profession.Dervish };
     public static readonly Skill HeroicRefrain = new() { Id = 3431, Name = "Heroic Refrain", Profession = Profession.Paragon };
-    public static IEnumerable<Skill> Skills = new List<Skill>
+    public static readonly IReadOnlyCollection<Skill> Skills = new List<Skill>
     {
         NoSkill,
         ResurrectionSignet,

Daybreak/Controls/Templates/BuildTemplate.xaml.cs

@@ -147,8 +147,21 @@ buildEntry.Primary is null ||
 
     private async void LoadSkills()
     {
-        var filteredSkills = await this.FilterSkills(this.SkillSearchText).ToListAsync().ConfigureAwait(true);
-        this.PrepareSkillListCache(filteredSkills);
+        var searchTerm = this.SkillSearchText;
+        var buildEntry = this.BuildEntry;
+        if (buildEntry is null)
+        {
+            return;
+        }
+
+        await Task.Factory.StartNew(() =>
+        {
+            var filteredSkills = this.FilterSkills(searchTerm, buildEntry).ToList();
+            this.Dispatcher.InvokeAsync(() =>
+            {
+                this.PrepareSkillListCache(filteredSkills);
+            }, System.Windows.Threading.DispatcherPriority.Background, CancellationToken.None);
+        }, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Current);
     }
 
     private void BrowseToInfo(string infoName)
@@ -215,7 +228,7 @@ private void PrepareSkillListCache(List<Skill> skills)
         }
     }
 
-    private async IAsyncEnumerable<Skill> FilterSkills(string searchTerm)
+    private IEnumerable<Skill> FilterSkills(string searchTerm, SingleBuildEntry buildEntry)
     {
         // Replace symbols to ease search
         searchTerm = searchTerm?.Replace("\"", "").Replace("!", "")!;
@@ -227,21 +240,25 @@ private async IAsyncEnumerable<Skill> FilterSkills(string searchTerm)
                 continue;
             }
 
-            if (skill.Profession != this.BuildEntry!.Primary &&
-                skill.Profession != this.BuildEntry!.Secondary &&
+            if (skill.Profession != buildEntry.Primary &&
+                skill.Profession != buildEntry.Secondary &&
                 skill.Profession != Profession.None)
             {
                 continue;
             }
 
+            if (skill.Name?.Contains("(PvP)") is true)
+            {
+                continue;
+            }
+
             if (searchTerm.IsNullOrWhiteSpace())
             {
                 yield return skill;
                 continue;
             }
 
-            var matchesName = await Task.Run(() => StringUtils.MatchesSearchString(skill.Name!.Replace("\"", "").Replace("!", ""), searchTerm!));
-            if (matchesName)
+            if (StringUtils.MatchesSearchString(skill.Name!.Replace("\"", "").Replace("!", ""), searchTerm!))
             {
                 yield return skill;
                 continue;