diff --git a/DBInitializer.cs b/DBInitializer.cs index 6f5008f..0addf96 100644 --- a/DBInitializer.cs +++ b/DBInitializer.cs @@ -287,7 +287,7 @@ private static async Task TransferMoves(ApplicationDbContext context, PokeApiCli ? m.EffectEntries.FirstOrDefault(n => n.Language.Name == "de").Effect : m.EffectEntries.FirstOrDefault(n => n.Language.Name == "en") != null ? m.EffectEntries.FirstOrDefault(n => n.Language.Name == "en").Effect - .Replace("1/16", "gradD4") + .Replace("1/16", "gradD4") .Replace("1/8", "(2*Grad)D4") : m.FlavorTextEntries.FirstOrDefault(n => n.Language.Name == "en") != null ? m.FlavorTextEntries.FirstOrDefault(n => n.Language.Name == "en").FlavorText @@ -309,6 +309,12 @@ private static async Task TransferMoves(ApplicationDbContext context, PokeApiCli ? m.FlavorTextEntries.FirstOrDefault(n => n.Language.Name == "en").FlavorText : "No Data"; + if (!m.Priority.Equals(0)) + { + var prio = $"\n\n Has a priority of {m.Priority}."; + ShortEffect += prio; + Effect += prio; + } Effect = accuracy_string_en(m.Accuracy) + Effect; Effect = Effect.Replace("Inflicts regular damage.", ""); diff --git a/Pages/LearnSet/Index.cshtml b/Pages/LearnSet/Index.cshtml index 56c7f21..d8df0b4 100644 --- a/Pages/LearnSet/Index.cshtml +++ b/Pages/LearnSet/Index.cshtml @@ -1,5 +1,5 @@ @page -@model pkmnWildLife.Pages.LearnSet.IndexModel +@model IndexModel @{ ViewData["Title"] = "Index"; @@ -15,7 +15,7 @@ Who What - + @Html.DisplayNameFor(model => model.Learnset[0].how) @@ -26,22 +26,23 @@ -@foreach (var item in Model.Learnset) { - - @item.mon.Name - @item.move.Name - - @Html.DisplayFor(modelItem => item.how) - - - @Html.DisplayFor(modelItem => item.level) - - - Edit | - Details | - Delete - - -} + @foreach (var item in Model.Learnset) + { + + @item.mon.Name + @item.move.Name + + @Html.DisplayFor(modelItem => item.how) + + + @Html.DisplayFor(modelItem => item.level) + + + Edit | + Details | + Delete + + + } - + \ No newline at end of file diff --git a/Pages/LearnSet/Index.cshtml.cs b/Pages/LearnSet/Index.cshtml.cs index 166ae89..5412922 100644 --- a/Pages/LearnSet/Index.cshtml.cs +++ b/Pages/LearnSet/Index.cshtml.cs @@ -1,28 +1,22 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.EntityFrameworkCore; using pkmnWildLife.Data; -namespace pkmnWildLife.Pages.LearnSet +namespace pkmnWildLife.Pages.LearnSet; + +public class IndexModel : PageModel { - public class IndexModel : PageModel - { - private readonly pkmnWildLife.Data.ApplicationDbContext _context; + private readonly ApplicationDbContext _context; - public IndexModel(pkmnWildLife.Data.ApplicationDbContext context) - { - _context = context; - } + public IndexModel(ApplicationDbContext context) + { + _context = context; + } - public IList Learnset { get;set; } = default!; + public IList Learnset { get; set; } = default!; - public async Task OnGetAsync() - { - Learnset = await _context.Learnsets.ToListAsync(); - } + public async Task OnGetAsync() + { + Learnset = await _context.Learnsets.ToListAsync(); } -} +} \ No newline at end of file diff --git a/Pages/pokemon/listwithstats.cshtml b/Pages/pokemon/listwithstats.cshtml index 554031c..912e9f6 100644 --- a/Pages/pokemon/listwithstats.cshtml +++ b/Pages/pokemon/listwithstats.cshtml @@ -66,7 +66,7 @@ @item.SP_ATK @item.SP_DEF @item.SPEED - + @Html.Raw($"{item.Type1.Name}") @@ -83,5 +83,4 @@ } - - + \ No newline at end of file diff --git a/app.db b/app.db index c6727f3..23b77ef 100644 Binary files a/app.db and b/app.db differ diff --git a/wwwroot/css/w3.css b/wwwroot/css/w3.css index b315d9e..a20e563 100644 --- a/wwwroot/css/w3.css +++ b/wwwroot/css/w3.css @@ -1170,7 +1170,6 @@ a { } - .w3-left-align { text-align: left !important }