diff --git a/AideDeJeu/AideDeJeu/AideDeJeu.csproj b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
index f52a0e44..60eea66f 100644
--- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj
+++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
@@ -26,20 +26,10 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/AideDeJeu/AideDeJeu/Tools/Converters.cs b/AideDeJeu/AideDeJeu/Tools/Converters.cs
index 5cf92636..5e9847c8 100644
--- a/AideDeJeu/AideDeJeu/Tools/Converters.cs
+++ b/AideDeJeu/AideDeJeu/Tools/Converters.cs
@@ -93,20 +93,20 @@ namespace AideDeJeu.Tools
public class ItemSourceTypeConverter : IValueConverter
{
- public T SpellVF { get; set; }
+ //public T SpellVF { get; set; }
public T SpellVO { get; set; }
public T SpellHD { get; set; }
- public T MonsterVF { get; set; }
+ //public T MonsterVF { get; set; }
public T MonsterVO { get; set; }
public T MonsterHD { get; set; }
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
var itemType = value as ItemSourceType?;
- if (itemType == ItemSourceType.SpellVF)
- {
- return SpellVF;
- }
+ //if (itemType == ItemSourceType.SpellVF)
+ //{
+ // return SpellVF;
+ //}
if (itemType == ItemSourceType.SpellVO)
{
return SpellVO;
@@ -115,10 +115,10 @@ namespace AideDeJeu.Tools
{
return SpellHD;
}
- if (itemType == ItemSourceType.MonsterVF)
- {
- return MonsterVF;
- }
+ //if (itemType == ItemSourceType.MonsterVF)
+ //{
+ // return MonsterVF;
+ //}
if (itemType == ItemSourceType.MonsterVO)
{
return MonsterVO;
diff --git a/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs
index 1ab2fade..4c2b68a8 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs
@@ -36,10 +36,10 @@ namespace AideDeJeu.ViewModels
string resourceName = null;
switch (ItemSourceType)
{
- case ItemSourceType.MonsterVF:
- resourceName = "AideDeJeu.Data.monsters_vf.json";
- _AllItems = Tools.Helpers.GetResourceObject>(resourceName);
- break;
+ //case ItemSourceType.MonsterVF:
+ // resourceName = "AideDeJeu.Data.monsters_vf.json";
+ // _AllItems = Tools.Helpers.GetResourceObject>(resourceName);
+ // break;
case ItemSourceType.MonsterVO:
resourceName = "AideDeJeu.Data.monsters_vo.json";
_AllItems = Tools.Helpers.GetResourceObject>(resourceName);
@@ -50,12 +50,12 @@ namespace AideDeJeu.ViewModels
_AllItems = Tools.MarkdownExtensions.MarkdownToMonsters(mdm);
//_AllItems = Tools.Helpers.GetResourceObject>(resourceName);
break;
- case ItemSourceType.SpellVF:
- resourceName = "AideDeJeu.Data.spells_vf.json";
- _AllItems = Tools.Helpers.GetResourceObject>(resourceName);
- //var md2 = await Tools.Helpers.GetStringFromUrl("https://raw.githubusercontent.com/Nioux/AideDeJeu/master/Data/spells_hd.md");
- //_AllItems = Tools.MarkdownExtensions.MarkdownToSpells(md2).ToList();
- break;
+ //case ItemSourceType.SpellVF:
+ // resourceName = "AideDeJeu.Data.spells_vf.json";
+ // _AllItems = Tools.Helpers.GetResourceObject>(resourceName);
+ // //var md2 = await Tools.Helpers.GetStringFromUrl("https://raw.githubusercontent.com/Nioux/AideDeJeu/master/Data/spells_hd.md");
+ // //_AllItems = Tools.MarkdownExtensions.MarkdownToSpells(md2).ToList();
+ // break;
case ItemSourceType.SpellVO:
resourceName = "AideDeJeu.Data.spells_vo.json";
_AllItems = Tools.Helpers.GetResourceObject>(resourceName);
diff --git a/AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs
index d15e19c6..0d548032 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs
@@ -24,20 +24,20 @@ namespace AideDeJeu.ViewModels
{
Spell = 0x01,
Monster = 0x10,
- VF = 0x0100,
+ //VF = 0x0100,
VO = 0x1100,
HD = 0x1000,
- SpellVF = Spell | VF,
+ //SpellVF = Spell | VF,
SpellVO = Spell | VO,
SpellHD = Spell | HD,
- MonsterVF = Monster | VF,
+ //MonsterVF = Monster | VF,
MonsterVO = Monster | VO,
MonsterHD = Monster | HD,
}
public class MainViewModel : BaseViewModel
{
- private ItemSourceType _ItemSourceType = ItemSourceType.SpellVF;
+ private ItemSourceType _ItemSourceType = ItemSourceType.SpellHD;
public ItemSourceType ItemSourceType
{
get
@@ -61,10 +61,10 @@ namespace AideDeJeu.ViewModels
public Dictionary> AllItemsViewModel = new Dictionary>()
{
- { ItemSourceType.SpellVF, new Lazy(() => new SpellsViewModel(ItemSourceType.SpellVF)) },
+ //{ ItemSourceType.SpellVF, new Lazy(() => new SpellsViewModel(ItemSourceType.SpellVF)) },
{ ItemSourceType.SpellVO, new Lazy(() => new SpellsViewModel(ItemSourceType.SpellVO)) },
{ ItemSourceType.SpellHD, new Lazy(() => new SpellsViewModel(ItemSourceType.SpellHD)) },
- { ItemSourceType.MonsterVF, new Lazy(() => new MonstersViewModel(ItemSourceType.MonsterVF)) },
+ //{ ItemSourceType.MonsterVF, new Lazy(() => new MonstersViewModel(ItemSourceType.MonsterVF)) },
{ ItemSourceType.MonsterVO, new Lazy(() => new MonstersViewModel(ItemSourceType.MonsterVO)) },
{ ItemSourceType.MonsterHD, new Lazy(() => new MonstersViewModel(ItemSourceType.MonsterHD)) },
};
@@ -76,10 +76,10 @@ namespace AideDeJeu.ViewModels
public Dictionary> AllFiltersViewModel = new Dictionary>()
{
- { ItemSourceType.SpellVF, new Lazy(() => new VFSpellFilterViewModel()) },
+ //{ ItemSourceType.SpellVF, new Lazy(() => new VFSpellFilterViewModel()) },
{ ItemSourceType.SpellVO, new Lazy(() => new VOSpellFilterViewModel()) },
{ ItemSourceType.SpellHD, new Lazy(() => new HDSpellFilterViewModel()) },
- { ItemSourceType.MonsterVF, new Lazy(() => new VFMonsterFilterViewModel()) },
+ //{ ItemSourceType.MonsterVF, new Lazy(() => new VFMonsterFilterViewModel()) },
{ ItemSourceType.MonsterVO, new Lazy(() => new VOMonsterFilterViewModel()) },
{ ItemSourceType.MonsterHD, new Lazy(() => new HDMonsterFilterViewModel()) },
};
@@ -125,7 +125,7 @@ namespace AideDeJeu.ViewModels
public Command SwitchToSpells { get; private set; }
public Command SwitchToMonsters { get; private set; }
- public Command SwitchToVF { get; private set; }
+ //public Command SwitchToVF { get; private set; }
public Command SwitchToVO { get; private set; }
public Command SwitchToHD { get; private set; }
public Command AboutCommand { get; private set; }
@@ -145,9 +145,9 @@ namespace AideDeJeu.ViewModels
});
SwitchToSpells = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.Monster) | ItemSourceType.Spell);
SwitchToMonsters = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.Spell) | ItemSourceType.Monster);
- SwitchToVF = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.VO & ~ItemSourceType.HD) | ItemSourceType.VF);
- SwitchToVO = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.VF & ~ItemSourceType.HD) | ItemSourceType.VO);
- SwitchToHD = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.VF & ~ItemSourceType.VO) | ItemSourceType.HD);
+ //SwitchToVF = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.VO & ~ItemSourceType.HD) | ItemSourceType.VF);
+ SwitchToVO = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.HD) | ItemSourceType.VO);
+ SwitchToHD = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.VO) | ItemSourceType.HD);
AboutCommand = new Command(async () => await Main.Navigator.GotoAboutPageAsync());
SearchCommand = new Command(async (text) =>
{
diff --git a/AideDeJeu/AideDeJeu/Views/MainPage.xaml b/AideDeJeu/AideDeJeu/Views/MainPage.xaml
index 0c5012a1..0ffcca9a 100644
--- a/AideDeJeu/AideDeJeu/Views/MainPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MainPage.xaml
@@ -2,7 +2,7 @@
-
+
@@ -33,7 +33,7 @@
-
+