From f5199f470b5ad269097c71d51c7eef9707ed1c43 Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Fri, 19 Jul 2019 00:19:07 +0200 Subject: [PATCH] * et - pour les filtres --- .../AideDeJeu/Models/Items/FilteredItems.cs | 2 +- .../ViewModels/Library/FilterViewModel.cs | 2 +- Data/HD/hd_spells.md | 10 +++++----- Data/library.db | Bin 23252992 -> 23252992 bytes Data/spells_hd.md | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AideDeJeu/AideDeJeu/Models/Items/FilteredItems.cs b/AideDeJeu/AideDeJeu/Models/Items/FilteredItems.cs index d3b6857a..642fdb5b 100644 --- a/AideDeJeu/AideDeJeu/Models/Items/FilteredItems.cs +++ b/AideDeJeu/AideDeJeu/Models/Items/FilteredItems.cs @@ -15,7 +15,7 @@ namespace AideDeJeuLib { if (collapsed == null) return new List>(); var split = collapsed.Split(new string[] { "|" }, StringSplitOptions.None).Select(s => new KeyValuePair(s, s)).ToList(); - split.Insert(0, new KeyValuePair("", "-")); + split.Insert(0, new KeyValuePair("", "*")); return split; } diff --git a/AideDeJeu/AideDeJeu/ViewModels/Library/FilterViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/Library/FilterViewModel.cs index f1bb7504..19b09d89 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/Library/FilterViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/Library/FilterViewModel.cs @@ -36,7 +36,7 @@ namespace AideDeJeu.ViewModels.Library public bool MatchContainsOrNot(string itemValue, string filterValue) { - if (!string.IsNullOrEmpty(filterValue) && string.IsNullOrWhiteSpace(filterValue)) + if (filterValue == "-") { return string.IsNullOrEmpty(itemValue); } diff --git a/Data/HD/hd_spells.md b/Data/HD/hd_spells.md index d4a4261e..a77aeb52 100644 --- a/Data/HD/hd_spells.md +++ b/Data/HD/hd_spells.md @@ -3,13 +3,13 @@ Classes: Barde|Clerc|Druide|Ensorceleur|Magicien|Ombrelame|Paladin|Rôdeur|Sorcier Levels: Sorts mineurs|Niveau 1|Niveau 2|Niveau 3|Niveau 4|Niveau 5|Niveau 6|Niveau 7|Niveau 8|Niveau 9 Schools: Abjuration|Divination|Enchantement|Évocation|Illusion|Invocation|Nécromancie|Transmutation -Rituals: 'Rituel| ' +Rituals: Rituel|- CastingTimes: 1 action|1 action bonus|1 réaction|1 minute|10 minutes|1 heure|8 heures|12 heures|24 heures Ranges: personnel|contact|vision|selon l'arme utilisée|spéciale|1,5 mètre|3 mètres|4,50 mètres|9 mètres|12 mètres|18 mètres|27 mètres|30 mètres|36 mètres|45 mètres|90 mètres|150 mètres|450 mètres|1 kilomètre|1,5 kilomètre|7,5 kilomètres|750 kilomètres|illimitée -VerbalComponents: 'V| ' -SomaticComponents: 'S| ' -MaterialComponents: 'M| ' -Concentrations: 'concentration| ' +VerbalComponents: V|- +SomaticComponents: S|- +MaterialComponents: M|- +Concentrations: concentration|- Durations: instantané|1 round|1 minute|10 minutes|1 heure|2 heures|8 heures|24 heures|1 jour|7 jours|10 jours|30 jours|dissipation|déclenchement|spéciale Sources: SRD|MDR Family: SpellHD diff --git a/Data/library.db b/Data/library.db index bb3b94265f7794031f20f5a0f0c46f6f1a44ae10..8fa101adf6cb12f1be790ea0db0bcd6089d5efb5 100644 GIT binary patch delta 1406 zcmWmE_n!^~0LSsyW1MmJIP>g%_t+fH-s{ddoHOrSa^&tQu9S|hd?k)#lvP%l4Jz4% zLW?wI6_MT0KxRJQAKsro;gh{GCp_B}P%hMAzHB)oN zsD)apm15OeZPZrn)LtFbQJvITUDQ?G)LlK)Q@zw%aa-cgrU!!C&ZWnP0ujN4tYBPL zFg28sIyxhBLQ3Y?P)1g8Mp`Hyeb5*E&>smHfPol$Q925A_Jad-sdk&X<6@F*U`1WZIG9>)`ygeUP7CgW*jVG5?=8D!&GJcnrzrsH|c zzzdj(S;)a`%)yJ8il* ze2GIijIVG6U*j8mi|_C~e!x-uh+{a86F7-e_z6GbG|u1`oW(i(iu1UDi@1c#xPq(r z4Zq_L{E2J$3xDGu{EO?jft&abw{RPGa2NM*AOGj1g#vToQ@i za%wwuoVrduC(4O-f=+#>fz!}wE?8IdN@6uUQTZ(&WU&WIDMUdPJbuC8Q=_b204k&U?<5L;tX|$Im4Y1 R&PXTONeS#>FoDI%4*iS%>B6U`@ZKsw_&brj;*DJwnv&2li@3|N;itq;p}wIeRfAt z&K!k^QiX)m1&!R|7RvBQ;hNHB~b;R|~aNE45Y| zwN*Q{R|j=eCv{e|x~QwVsk?fpr+TTk`lzq^slQ^@$DU0O1ar@&$A$ut!T79TOja;8 zl#x0nBXeR(=Gah1R&Y*QC>C)TfPoljWjk4KP>41_QNk76PoLnbESaZJV&coI`E6Jd5Y>Jm%vCyoi_ZGG4)}cnu4%5R33S-oRok!JBvsOYt_|!Mk`5%di|PuoA1V z8t>x+e29ti?L4#|CUfE;eB^wqPr^VLNtUCw5^s_FykQ#b@{&U*Jo8g|G1q z_F+H1#dkP>gZLgl;1CYu2#(?yj^jt1z)76KY5atraRz5`4!__$F5p*O#3lTO-*Fj# z;7|O8EBG5%aSi|AI&R=5Zs9iW;4c2ffA}Bwa?(P9`Ec?$d7XStey4y_&?)2;cEX%+ zr-)P3DdrS+N;oB*Qci?Z+9~5iI%SQr;8J2jk|PA#Xl zQ^%?6)N|@P4V;EfBd4*`#A)g@bDBFXoR&^2r?u0@Y3sCe+B+Sbj!q}1vlH!fak@I) zobFB!r>E1)>FxA!`a1ob{!WY&>%=(&oPo|DC*B$C3~`1!!<^wxf|KYZIU}5r&M0TJ OlkB7fb~2d2!sPpfY)an% diff --git a/Data/spells_hd.md b/Data/spells_hd.md index 857b0953..6495622e 100644 --- a/Data/spells_hd.md +++ b/Data/spells_hd.md @@ -1,5 +1,5 @@  - + > [Manuel des règles](index.md)