From 10a3d0c94542aafb8caa9ea0515830381a03e6b2 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Fri, 22 Jun 2018 14:48:39 +0200
Subject: [PATCH] Switch complet vers markdown

---
 AideDeJeu/AideDeJeu/AideDeJeu.csproj          | 14 +++---
 .../AideDeJeu/ViewModels/ItemsViewModel.cs    | 45 +++++++++----------
 2 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/AideDeJeu.csproj b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
index 65ff4cb0..fdb70528 100644
--- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj
+++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
@@ -21,15 +21,6 @@
     <None Remove="OGL.txt" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="..\..\Data\spells_hd.json" Link="Data\spells_hd.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="..\..\Data\monsters_vo.json" Link="Data\monsters_vo.json" />
-    <EmbeddedResource Include="..\..\Data\spells_vo.json" Link="Data\spells_vo.json" />
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="OGL.txt" />
   </ItemGroup>
@@ -66,4 +57,9 @@
     <EmbeddedResource Include="..\..\Data\spells_hd.md" Link="Data\spells_hd.md" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="..\..\Data\monsters_vo.md" Link="Data\monsters_vo.md" />
+    <EmbeddedResource Include="..\..\Data\spells_vo.md" Link="Data\spells_vo.md" />
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs
index afadffb8..7fa46f8e 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs
@@ -36,36 +36,35 @@ namespace AideDeJeu.ViewModels
                 string resourceName = null;
                 switch (ItemSourceType)
                 {
-                    //case ItemSourceType.MonsterVF:
-                    //    resourceName = "AideDeJeu.Data.monsters_vf.json";
-                    //    _AllItems = Tools.Helpers.GetResourceObject<IEnumerable<Monster>>(resourceName);
-                    //    break;
                     case ItemSourceType.MonsterVO:
-                        resourceName = "AideDeJeu.Data.monsters_vo.json";
-                        _AllItems = Tools.Helpers.GetResourceObject<IEnumerable<Monster>>(resourceName);
+                        {
+                            resourceName = "AideDeJeu.Data.monsters_vo.md";
+                            var md = await Tools.Helpers.GetResourceStringAsync(resourceName);
+                            _AllItems = Tools.MarkdownExtensions.MarkdownToMonsters(md);
+                        }
                         break;
                     case ItemSourceType.MonsterHD:
-                        resourceName = "AideDeJeu.Data.monsters_hd.md";
-                        //var mdm = await Tools.Helpers.GetStringFromUrl("https://raw.githubusercontent.com/Nioux/AideDeJeu/master/Data/monsters_hd.md");
-                        var mdm = await Tools.Helpers.GetResourceStringAsync(resourceName);
-                        _AllItems = Tools.MarkdownExtensions.MarkdownToMonsters(mdm);
-                        //_AllItems = Tools.Helpers.GetResourceObject<IEnumerable<Monster>>(resourceName);
+                        {
+                            resourceName = "AideDeJeu.Data.monsters_hd.md";
+                            //var md = await Tools.Helpers.GetStringFromUrl("https://raw.githubusercontent.com/Nioux/AideDeJeu/master/Data/monsters_hd.md");
+                            var md = await Tools.Helpers.GetResourceStringAsync(resourceName);
+                            _AllItems = Tools.MarkdownExtensions.MarkdownToMonsters(md);
+                        }
                         break;
-                    //case ItemSourceType.SpellVF:
-                    //    resourceName = "AideDeJeu.Data.spells_vf.json";
-                    //    _AllItems = Tools.Helpers.GetResourceObject<IEnumerable<Spell>>(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<IEnumerable<Spell>>(resourceName);
+                        {
+                            resourceName = "AideDeJeu.Data.spells_vo.md";
+                            var md = await Tools.Helpers.GetResourceStringAsync(resourceName);
+                            _AllItems = Tools.MarkdownExtensions.MarkdownToMonsters(md);
+                        }
                         break;
                     case ItemSourceType.SpellHD:
-                        resourceName = "AideDeJeu.Data.spells_hd.md";
-                        var mds = await Tools.Helpers.GetStringFromUrl("https://raw.githubusercontent.com/Nioux/AideDeJeu/master/Data/spells_hd.md");
-                        _AllItems = Tools.MarkdownExtensions.MarkdownToSpells(mds);
-                        //_AllItems = Tools.Helpers.GetResourceObject<IEnumerable<Spell>>(resourceName);
+                        {
+                            resourceName = "AideDeJeu.Data.spells_hd.md";
+                            //var md = await Tools.Helpers.GetStringFromUrl("https://raw.githubusercontent.com/Nioux/AideDeJeu/master/Data/spells_hd.md");
+                            var md = await Tools.Helpers.GetResourceStringAsync(resourceName);
+                            _AllItems = Tools.MarkdownExtensions.MarkdownToSpells(md);
+                        }
                         break;
                 }
             }