diff --git a/AideDeJeu/AideDeJeu/Models/Item.cs b/AideDeJeu/AideDeJeu/Models/Item.cs index d4d1fcd5..807a8a57 100644 --- a/AideDeJeu/AideDeJeu/Models/Item.cs +++ b/AideDeJeu/AideDeJeu/Models/Item.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Text.RegularExpressions; using System.Xml; namespace AideDeJeuLib @@ -17,6 +18,15 @@ namespace AideDeJeuLib { public string Name { get; set; } public string NameVO { get; set; } + public string NameVOText + { + get + { + var regex = new Regex("\\[(?.*?)\\]"); + var match = regex.Match(NameVO ?? string.Empty); + return match.Groups["text"].Value; + } + } public Properties Properties { get; set; } diff --git a/AideDeJeu/AideDeJeu/ViewModels/FilterViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/FilterViewModel.cs index b127f9b1..d7308475 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/FilterViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/FilterViewModel.cs @@ -133,7 +133,10 @@ namespace AideDeJeu.ViewModels spell.Source.Contains(source) && spell.Source.Contains(classe) && spell.Rituel.Contains(rituel) && - Helpers.RemoveDiacritics(spell.Name).ToLower().Contains(Helpers.RemoveDiacritics(SearchText ?? string.Empty).ToLower()); + ( + (Helpers.RemoveDiacritics(spell.Name).ToLower().Contains(Helpers.RemoveDiacritics(SearchText ?? string.Empty).ToLower())) || + (Helpers.RemoveDiacritics(spell.NameVOText ?? string.Empty).ToLower().Contains(Helpers.RemoveDiacritics(SearchText ?? string.Empty).ToLower())) + ); }).OrderBy(spell => spell.Name) .AsEnumerable(); }, token); @@ -379,7 +382,10 @@ namespace AideDeJeu.ViewModels monster.Source.Contains(source) && powerComparer.Compare(monster.Challenge, minPower) >= 0 && powerComparer.Compare(monster.Challenge, maxPower) <= 0 && - Helpers.RemoveDiacritics(monster.Name).ToLower().Contains(Helpers.RemoveDiacritics(SearchText ?? string.Empty).ToLower()); + ( + (Helpers.RemoveDiacritics(monster.Name).ToLower().Contains(Helpers.RemoveDiacritics(SearchText ?? string.Empty).ToLower())) || + (Helpers.RemoveDiacritics(monster.NameVOText ?? string.Empty).ToLower().Contains(Helpers.RemoveDiacritics(SearchText ?? string.Empty).ToLower())) + ); }) .OrderBy(monster => monster.Name) .AsEnumerable(); diff --git a/AideDeJeu/AideDeJeu/Views/MainPage.xaml b/AideDeJeu/AideDeJeu/Views/MainPage.xaml index 494ae1c1..b41bf248 100644 --- a/AideDeJeu/AideDeJeu/Views/MainPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/MainPage.xaml @@ -45,8 +45,9 @@ - +