1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-10-30 23:16:09 +00:00

Corrections monstres md

This commit is contained in:
Yan Maniez 2018-06-16 17:56:51 +02:00
parent 3ce454055a
commit 65421cc952
5 changed files with 29 additions and 7 deletions

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="7385YanManiez.AidedeJeu" Publisher="CN=2C78A91E-528B-4FF0-A4BE-FD7F7EBABB44" Version="1.1.0.0" />
<Identity Name="7385YanManiez.AidedeJeu" Publisher="CN=2C78A91E-528B-4FF0-A4BE-FD7F7EBABB44" Version="1.1.1.0" />
<mp:PhoneIdentity PhoneProductId="7b75e00f-ae8d-472e-9d0f-cbfe5e44017c" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>Aide de Jeu</DisplayName>

View file

@ -60,4 +60,9 @@
<Folder Include="Services\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\..\Data\monsters_hd.md" Link="Data\monsters_hd.md" />
<EmbeddedResource Include="..\..\Data\spells_hd.md" Link="Data\spells_hd.md" />
</ItemGroup>
</Project>

View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Net.Http;
using System.Reflection;
@ -22,6 +23,18 @@ namespace AideDeJeu.Tools
}
}
public static async Task<string> GetResourceStringAsync(string resourceName)
{
var assembly = typeof(Helpers).GetTypeInfo().Assembly;
using (var stream = assembly.GetManifestResourceStream(resourceName))
{
using (var sr = new StreamReader(stream))
{
return await sr.ReadToEndAsync();
}
}
}
public static async Task<string> GetStringFromUrl(string url)
{
using (var client = new HttpClient())

View file

@ -15,13 +15,15 @@ namespace AideDeJeu.Tools
{
public static IEnumerable<Spell> MarkdownToSpells(string md)
{
var document = Markdig.Parsers.MarkdownParser.Parse(md);
var pipeline = new MarkdownPipelineBuilder().UsePipeTables().Build();
var document = Markdig.Parsers.MarkdownParser.Parse(md, pipeline);
return document.ToSpells();
}
public static IEnumerable<Monster> MarkdownToMonsters(string md)
{
var document = Markdig.Parsers.MarkdownParser.Parse(md);
var pipeline = new MarkdownPipelineBuilder().UsePipeTables().Build();
var document = Markdig.Parsers.MarkdownParser.Parse(md, pipeline);
return document.ToMonsters();
}
@ -162,6 +164,7 @@ namespace AideDeJeu.Tools
List<string> actions = new List<string>();
foreach (var block in document)
{
Debug.WriteLine(block.GetType());
//DumpBlock(block);
if (block is Markdig.Syntax.HeadingBlock)
{
@ -221,7 +224,7 @@ namespace AideDeJeu.Tools
case "NameVO":
monster.NameVO = value;
break;
case "CastingTime":
case "SizeAlignment":
{
var regexx = new Regex("(?<type>.*) de taille (?<size>.*), (?<alignment>.*)");
var matchh = regexx.Match(value);

View file

@ -45,8 +45,9 @@ namespace AideDeJeu.ViewModels
_AllItems = Tools.Helpers.GetResourceObject<IEnumerable<Monster>>(resourceName);
break;
case ItemSourceType.MonsterHD:
resourceName = "AideDeJeu.Data.monsters_hd.json";
var mdm = await Tools.Helpers.GetStringFromUrl("https://raw.githubusercontent.com/Nioux/AideDeJeu/master/Data/monsters_hd.md");
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);
break;
@ -61,7 +62,7 @@ namespace AideDeJeu.ViewModels
_AllItems = Tools.Helpers.GetResourceObject<IEnumerable<Spell>>(resourceName);
break;
case ItemSourceType.SpellHD:
resourceName = "AideDeJeu.Data.spells_hd.json";
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);