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

Nettoyage

Browse source
This commit is contained in:
Yan Maniez 2018-06-30 19:05:16 +02:00
parent 468a17131e
commit 8e6e7823bb
13 changed files with 23 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AideDeJeu/AideDeJeu/Models/Cards/Converters.cs
View file

@ -114,7 +114,7 @@ namespace AideDeJeuLib.Cards
var cardData = new CardData();
cardData.Count = 1;
//cardData.Color = color;
cardData.Title = spell.NamePHB;
cardData.Title = spell.Name;
cardData.TitleSize = "10";
cardData.Icon = "white-book-" + spell.Level;
cardData.IconBack = "robe";

45
AideDeJeu/AideDeJeu/Models/Item.cs
View file

@ -15,48 +15,17 @@ namespace AideDeJeuLib
public class Item
{
public string Id { get; set; }
public string IdVO { get; set; }
public string IdVF { get; set; }
public string Id
{
get
{
return AideDeJeu.Tools.Helpers.IdFromName(Name);
}
}
public string Name { get; set; }
public string NameVO { get; set; }
public string NamePHB { get; set; }
public Properties Properties { get; set; }
public string Html { get; set; }
public static IEnumerable<string> NodeListToStringList(IEnumerable<XmlNode> nodes)
{
if (nodes == null) return null;
var strings = new List<string>();
foreach (var node in nodes)
{
strings.Add(node.OuterXml);
}
return strings;
}
public static XmlNode StringToNode(string str)
{
if (str == null) return null;
var doc = new XmlDocument();
doc.LoadXml(str);
return doc.DocumentElement;
}
//public static IEnumerable<HtmlNode> StringListToNodeList(IEnumerable<string> strings)
//{
// if (strings == null) return null;
// var nodes = new List<HtmlNode>();
// foreach (var str in strings)
// {
// var doc = new HtmlDocument();
// doc.LoadHtml(str);
// nodes.Add(doc.DocumentNode);
// }
// return nodes;
//}
}
}

2
AideDeJeu/AideDeJeu/Tools/Comparers.cs
View file

@ -11,7 +11,7 @@ namespace AideDeJeu.Tools
{
public override int Compare(Item x, Item y)
{
return x.NamePHB.CompareTo(y.NamePHB);
return x.Name.CompareTo(y.Name);
}
}

10
AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs
View file

@ -54,8 +54,7 @@ namespace AideDeJeu.Tools
//yield return spell;
}
spell = new Spell();
spell.Name = spell.NamePHB = headingBlock.Inline.ToMarkdownString();
spell.Id = spell.IdVF = spell.IdVO = Tools.Helpers.IdFromName(spell.Name);
spell.Name = headingBlock.Inline.ToMarkdownString();
//Console.WriteLine(spell.Name);
}
}
@ -235,8 +234,7 @@ namespace AideDeJeu.Tools
//yield return monster;
}
monster = new Monster();
monster.Name = monster.NamePHB = headingBlock.Inline.ToMarkdownString();
monster.Id = monster.IdVF = monster.IdVO = Tools.Helpers.IdFromName(monster.Name);
monster.Name = headingBlock.Inline.ToMarkdownString();
//Console.WriteLine(spell.Name);
}
if (headingBlock.HeaderChar == '#' && headingBlock.Level == 2)
@ -620,7 +618,7 @@ namespace AideDeJeu.Tools
public static string ToMarkdownString(this Spell spell)
{
var md = string.Empty;
md += string.Format("# {0}\n", spell.NamePHB);
md += string.Format("# {0}\n", spell.Name);
md += string.Format("- NameVO: [{0}]\n", spell.NameVO);
md += string.Format("- CastingTime: {0}\n", spell.CastingTime);
md += string.Format("- Components: {0}\n", spell.Components);
@ -667,7 +665,7 @@ namespace AideDeJeu.Tools
public static string ToMarkdownString(this Monster monster)
{
var md = string.Empty;
md += string.Format("# {0}\n", monster.NamePHB?.Trim());
md += string.Format("# {0}\n", monster.Name?.Trim());
md += string.Format("- NameVO: [{0}]\n", monster.NameVO?.Trim());
md += string.Format("- {0} {1}, {2}\n", monster.Size?.Trim(), monster.Type?.Trim(), monster.Alignment?.Trim());
if (monster.ArmorClass != null) md += string.Format("- **Armor Class** {0}\n", monster.ArmorClass?.Trim());

8
AideDeJeu/AideDeJeu/ViewModels/FilterViewModel.cs
View file

@ -133,8 +133,8 @@ namespace AideDeJeu.ViewModels
spell.Source.Contains(source) &&
spell.Source.Contains(classe) &&
spell.Rituel.Contains(rituel) &&
Helpers.RemoveDiacritics(spell.NamePHB).ToLower().Contains(Helpers.RemoveDiacritics(SearchText ?? string.Empty).ToLower());
}).OrderBy(spell => spell.NamePHB)
Helpers.RemoveDiacritics(spell.Name).ToLower().Contains(Helpers.RemoveDiacritics(SearchText ?? string.Empty).ToLower());
}).OrderBy(spell => spell.Name)
.AsEnumerable();
}, token);
@ -379,9 +379,9 @@ namespace AideDeJeu.ViewModels
monster.Source.Contains(source) &&
powerComparer.Compare(monster.Challenge, minPower) >= 0 &&
powerComparer.Compare(monster.Challenge, maxPower) <= 0 &&
Helpers.RemoveDiacritics(monster.NamePHB).ToLower().Contains(Helpers.RemoveDiacritics(SearchText ?? string.Empty).ToLower());
Helpers.RemoveDiacritics(monster.Name).ToLower().Contains(Helpers.RemoveDiacritics(SearchText ?? string.Empty).ToLower());
})
.OrderBy(monster => monster.NamePHB)
.OrderBy(monster => monster.Name)
.AsEnumerable();
}, token);

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

@ -202,7 +202,7 @@ namespace AideDeJeu.ViewModels
public MonsterDetailViewModel(Monster item = null)
{
Title = item?.NamePHB;
Title = item?.Name;
Item = item;
LoadItemCommand = new Command(async () => await ExecuteLoadItemCommand());
}

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

@ -95,7 +95,7 @@ namespace AideDeJeu.ViewModels
public SpellDetailViewModel(Spell item = null)
{
Title = item?.NamePHB;
Title = item?.Name;
Item = item;
LoadItemCommand = new Command(async () => await ExecuteLoadItemCommand());
}

2
AideDeJeu/AideDeJeu/Views/MainPage.xaml
View file

@ -47,7 +47,7 @@
<DataTemplate>
<ViewCell>
<StackLayout Padding="10">
<Label Text="{Binding NamePHB}" LineBreakMode="NoWrap" Style="{DynamicResource subsubsection}" FontSize="16" />
<Label Text="{Binding Name}" LineBreakMode="NoWrap" Style="{DynamicResource subsubsection}" FontSize="16" />
</StackLayout>
</ViewCell>
</DataTemplate>

2
AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml
View file

@ -19,7 +19,7 @@
<skia:SKCanvasView PaintSurface="PaintHeaderBar" HorizontalOptions="FillAndExpand" HeightRequest="8" />
<Label Text="{Binding Item.NamePHB}" Style="{StaticResource Key=subsection}" />
<Label Text="{Binding Item.Name}" Style="{StaticResource Key=subsection}" />
<mdview:MarkdownView x:Name="mdNameVO" Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding Item.NameVO}" />
<Label FormattedText="{Binding TypeSizeAlignment}" />

1
AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml.cs
View file

@ -41,7 +41,6 @@ namespace AideDeJeu.Views
{
Name = "",
NameVO = "",
NamePHB = "",
//Description = "This is an item description."
};

2
AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml
View file

@ -15,7 +15,7 @@
</ContentPage.Resources>
<ScrollView VerticalScrollBarVisibility="Default" HorizontalScrollBarVisibility="Default">
<StackLayout Orientation="Vertical" Padding="15">
<Label Text="{Binding Item.NamePHB}" Style="{StaticResource Key=subsection}" />
<Label Text="{Binding Item.Name}" Style="{StaticResource Key=subsection}" />
<mdview:MarkdownView x:Name="mdNameVO" Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding Item.NameVO}" />
<Label Text=" " />

1
AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml.cs
View file

@ -30,7 +30,6 @@ namespace AideDeJeu.Views
{
Name = "",
NameVO = "",
NamePHB = "",
//Description = "This is an item description."
};

2
AideDeJeu/AideDeJeuWeb/Controllers/ValuesController.cs
View file

@ -19,7 +19,7 @@ namespace AideDeJeuWeb.Controllers
var md = await AideDeJeu.Tools.Helpers.GetResourceStringAsync("AideDeJeu.Data.spells_hd.md");
var items = AideDeJeu.Tools.MarkdownExtensions.MarkdownToSpells(md);
var fitems = items.Where(it => it.Source.Contains(classe)).OrderBy(it => it.Level).ThenBy(it => it.NamePHB);
var fitems = items.Where(it => it.Source.Contains(classe)).OrderBy(it => it.Level).ThenBy(it => it.Name);
var cardDatas = new List<CardData>();
foreach (var spell in fitems)