1
0
mirror of synced 2025-02-17 19:19:18 +01:00

Fixed dani dojo page bar logic to follow official in-game logic

This commit is contained in:
S-Sebb 2024-06-05 15:31:15 +01:00
parent 67e531f461
commit 9b9009ac42

View File

@ -1,9 +1,9 @@
@using Blazored.LocalStorage
@using System.ComponentModel.DataAnnotations
@using Blazored.LocalStorage
@inject IGameDataService GameDataService
@inject HttpClient Client
@inject AuthService AuthService
@inject IJSRuntime JsRuntime
@inject NavigationManager NavigationManager
@inject ILocalStorageService LocalStorage
@ -217,7 +217,7 @@ else
var redRequirement = GetSoulGauge(danData, false);
var goldRequirement = GetSoulGauge(danData, true);
var barClass = "bar-default";
var resultText = @Localizer["Not Passed"];
var resultText = Localizer["Not Passed"];
}
<MudStack Spacing="1">
<MudText Typo="Typo.subtitle2" Style="font-weight:bold;">@Localizer["Result"]</MudText>
@ -225,12 +225,12 @@ else
{
if (danBestData.SoulGaugeTotal >= redRequirement) {
barClass = "bar-pass-red";
resultText = @Localizer["Pass"];
resultText = Localizer["Pass"];
}
if (danBestData.SoulGaugeTotal >= goldRequirement) {
barClass = "bar-pass-gold";
resultText = @Localizer["Gold"];
resultText = Localizer["Gold"];
}
<MudProgressLinear Class="@barClass" Rounded="true" Size="Size.Large" Max="100" Value="@danBestData.SoulGaugeTotal">
@ -287,7 +287,7 @@ else
var redRequirement = border.RedBorderTotal;
var goldRequirement = border.GoldBorderTotal;
var barClass = "bar-default";
var resultText = @Localizer["Not Passed"];
var resultText = Localizer["Not Passed"];
}
<MudStack Spacing="1">
<MudText Typo="Typo.subtitle2" Style="font-weight:bold;">@Localizer["Result"]</MudText>
@ -297,18 +297,17 @@ else
if ((DanConditionType)border.OdaiType is DanConditionType.BadCount or DanConditionType.OkCount)
{
if (bestData <= redRequirement)
{
barClass = "bar-pass-red";
resultText = @Localizer["Pass"];
}
if (bestData <= goldRequirement)
{
barClass = "bar-pass-gold";
resultText = @Localizer["Gold"];
resultText = Localizer["Gold"];
}
else if (bestData <= redRequirement)
{
barClass = "bar-pass-red";
resultText = Localizer["Pass"];
}
var resultValue = redRequirement - bestData;
if (resultValue < 0) resultValue = 0;
@ -319,19 +318,20 @@ else
}
else
{
if (bestData >= redRequirement)
{
barClass = "bar-pass-red";
resultText = @Localizer["Pass"];
}
if (bestData >= goldRequirement)
{
barClass = "bar-pass-gold";
resultText = @Localizer["Gold"];
resultText = Localizer["Gold"];
}
else if (bestData >= redRequirement)
{
barClass = "bar-pass-red";
resultText = Localizer["Pass"];
}
<MudProgressLinear Class="@barClass" Rounded="true" Size="Size.Large" Max="@goldRequirement" Value="@bestData">
var resultValue = Math.Min(bestData, redRequirement);
<MudProgressLinear Class="@barClass" Rounded="true" Size="Size.Large" Max="@redRequirement" Value="@resultValue">
<MudText Typo="Typo.caption">@bestData</MudText>
</MudProgressLinear>
<MudText Typo="Typo.caption" Style="text-align: right">@resultText</MudText>