5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-10-29 22:45:44 +00:00
Code Issues Projects Releases Wiki Activity

Simplification

Browse source
This commit is contained in:
Yan Maniez 2018-05-23 23:59:58 +02:00
parent 2000fc12e4
commit 38f9ea177a
5 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
AideDeJeu/AideDeJeu/AideDeJeu.csproj
View file

@ -18,11 +18,18 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\..\Data\monsters.json" Link="monsters.json" />
<EmbeddedResource Include="..\..\Data\monsters_vf.json" Link="Data\monsters_vf.json" />
<EmbeddedResource Include="..\..\Data\monsters_vo.json" Link="Data\monsters_vo.json" />
<EmbeddedResource Include="..\..\Data\spells_vf.json" Link="Data\spells_vf.json" />
<EmbeddedResource Include="..\..\Data\spells_vo.json" Link="Data\spells_vo.json" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\..\Data\spells.json" Link="spells.json" />
<EmbeddedResource Include="..\..\Data\monsters.json" Link="Data\monsters.json" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\..\Data\spells.json" Link="Data\spells.json" />
</ItemGroup>
<ItemGroup>
@ -51,6 +58,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Data\" />
<Folder Include="Services\" />
</ItemGroup>

4
AideDeJeu/AideDeJeu/ViewModels/MonsterDetailViewModel.cs
View file

@ -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;

2
AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs
View file

@ -243,7 +243,7 @@ namespace AideDeJeu.ViewModels
var serializer = new DataContractJsonSerializer(typeof(IEnumerable<Monster>));
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<Monster>;
}

4
AideDeJeu/AideDeJeu/ViewModels/SpellDetailViewModel.cs
View file

@ -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);

2
AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs
View file

@ -189,7 +189,7 @@ namespace AideDeJeu.ViewModels
var serializer = new DataContractJsonSerializer(typeof(IEnumerable<Spell>));
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<Spell>;
}