diff --git a/AideDeJeu/AideDeJeu/AideDeJeu.csproj b/AideDeJeu/AideDeJeu/AideDeJeu.csproj index 9e3600c8..67536a5d 100644 --- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj +++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj @@ -18,11 +18,18 @@ - + + + + - + + + + + @@ -51,6 +58,7 @@ + diff --git a/AideDeJeu/AideDeJeu/ViewModels/MonsterDetailViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/MonsterDetailViewModel.cs index 3ba97ede..341d5980 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/MonsterDetailViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/MonsterDetailViewModel.cs @@ -294,8 +294,8 @@ namespace AideDeJeu.ViewModels try { - Item.ParseHtml(); - Item = _Item; + //Item.ParseHtml(); + //Item = _Item; //Items.Clear(); //var item = await new MonstersScrappers().GetMonster(Item.Id); //Item = item; diff --git a/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs index 99ae4846..f5596539 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs @@ -243,7 +243,7 @@ namespace AideDeJeu.ViewModels var serializer = new DataContractJsonSerializer(typeof(IEnumerable)); var assembly = typeof(AboutViewModel).GetTypeInfo().Assembly; //var names = assembly.GetManifestResourceNames(); - using (var stream = assembly.GetManifestResourceStream("AideDeJeu.monsters.json")) + using (var stream = assembly.GetManifestResourceStream("AideDeJeu.Data.monsters_vf.json")) { _AllMonsters = serializer.ReadObject(stream) as IEnumerable; } diff --git a/AideDeJeu/AideDeJeu/ViewModels/SpellDetailViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/SpellDetailViewModel.cs index 61c40f18..5b855a69 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/SpellDetailViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/SpellDetailViewModel.cs @@ -138,8 +138,8 @@ namespace AideDeJeu.ViewModels try { - Item.ParseHtml(); - Item = _Item; + //Item.ParseHtml(); + //Item = _Item; //using (var spellsScrappers = new SpellsScrappers()) //{ // var item = await spellsScrappers.GetSpell(Item.Id); diff --git a/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs index bb34479d..7409ed43 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs @@ -189,7 +189,7 @@ namespace AideDeJeu.ViewModels var serializer = new DataContractJsonSerializer(typeof(IEnumerable)); var assembly = typeof(AboutViewModel).GetTypeInfo().Assembly; //var names = assembly.GetManifestResourceNames(); - using (var stream = assembly.GetManifestResourceStream("AideDeJeu.spells.json")) + using (var stream = assembly.GetManifestResourceStream("AideDeJeu.Data.spells_vf.json")) { _AllSpells = serializer.ReadObject(stream) as IEnumerable; }