Taiko_Stuff/TaikoLocalServer
1
0
Fork 0
mirror of synced 2024-11-23 22:41:01 +01:00
Code Releases Activity

Add PerSong dani conditions

Browse Source
This commit is contained in:
shiibe 2022-09-12 20:50:33 -04:00
parent e090ec08ab
commit 7708e3a268
2 changed files with 81 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
TaikoWebUI/Pages/DaniDojo.razor
View File

@ -246,7 +246,7 @@
resultText = "Gold";
}
<MudProgressLinear Class="@barClass" Rounded="true" Size="Size.Large" Max="goldRequirement" Value="@bestData">
<MudProgressLinear Class="@barClass" Rounded="true" Size="Size.Large" Max="@goldRequirement" Value="@bestData">
<MudText Typo="Typo.caption">@bestData</MudText>
</MudProgressLinear>
<MudText Typo="Typo.caption" Style="text-align: right">@resultText</MudText>
@ -285,27 +285,82 @@
}
else
{
<MudStack Row="true">
<MudGrid>
@for (var k = 0; k < 3; k++)
{
var songNumber = k;
<MudText>
@GetDanRequirementPerSong(border, songNumber)
</MudText>
@if (!bestDataMap.ContainsKey(danId))
{
continue;
}
var bestData = bestDataMap[danId];
if (k >= bestData.DanBestStageDataList.Count)
{
break;
}
<MudText>
Best: @GetSongBestFromData((DanConditionType)border.OdaiType, bestData, songNumber)
</MudText>
var redRequirement = border.RedBorderTotal;
var goldRequirement = border.GoldBorderTotal;
var barClass = "bar-default";
var resultText = "Failed";
<MudItem xs="12" md="4">
<MudCard Outlined="true">
<MudCardHeader>
<CardHeaderContent>
<MudText Typo="Typo.body1" Style="font-weight:bold">Stage @(songNumber + 1)</MudText>
</CardHeaderContent>
</MudCardHeader>
<MudCardContent>
<MudText Typo="Typo.subtitle2" Style="font-weight:bold;">Result</MudText>
@if (bestDataMap.ContainsKey(danId))
{
var danBestData = bestDataMap[danId];
var bestData = GetSongBestFromData((DanConditionType)border.OdaiType, danBestData, songNumber);
if ((DanConditionType)border.OdaiType is DanConditionType.BadCount)
{
if (bestData <= redRequirement)
{
barClass = "bar-pass-red";
resultText = "Passed";
}
if (bestData <= goldRequirement)
{
barClass = "bar-pass-gold";
resultText = "Gold";
}
<MudProgressLinear Class="@barClass" Rounded="true" Size="Size.Large" Max="@redRequirement" Value="@(redRequirement - bestData)">
<MudText Typo="Typo.caption">@bestData</MudText>
</MudProgressLinear>
<MudText Typo="Typo.caption" Style="text-align: right">@resultText</MudText>
}
else
{
if (bestData >= redRequirement)
{
barClass = "bar-pass-red";
resultText = "Passed";
}
if (bestData >= goldRequirement)
{
barClass = "bar-pass-gold";
resultText = "Gold";
}
@goldRequirement
<MudProgressLinear Class="@barClass" Rounded="true" Size="Size.Large" Max="@goldRequirement" Value="@bestData">
<MudText Typo="Typo.caption">@bestData</MudText>
</MudProgressLinear>
<MudText Typo="Typo.caption" Style="text-align: right">@resultText</MudText>
}
}
else
{
<MudProgressLinear Class="@barClass" Rounded="true" Size="Size.Large" Max="100" Value="0">
<MudText Typo="Typo.caption">0</MudText>
</MudProgressLinear>
<MudText Typo="Typo.caption" Style="text-align: right">N/A</MudText>
}
</MudCardContent>
</MudCard>
</MudItem>
}
</MudStack>
</MudGrid>
}
</MudCardContent>
</MudCard>

16
TaikoWebUI/Pages/DaniDojo.razor.cs
View File

@ -125,19 +125,19 @@ public partial class DaniDojo
};
}
private static string GetSongBestFromData(DanConditionType type, DanBestData data, int songNumber)
private static uint GetSongBestFromData(DanConditionType type, DanBestData data, int songNumber)
{
songNumber.Throw().IfOutOfRange(0, 2);
return type switch
{
DanConditionType.SoulGauge => throw new ArgumentException("Soul gauge should not be here"),
DanConditionType.GoodCount => data.DanBestStageDataList[songNumber].GoodCount.ToString(),
DanConditionType.OkCount => data.DanBestStageDataList[songNumber].OkCount.ToString(),
DanConditionType.BadCount => data.DanBestStageDataList[songNumber].BadCount.ToString(),
DanConditionType.ComboCount => data.DanBestStageDataList[songNumber].ComboCount.ToString(),
DanConditionType.DrumrollCount => data.DanBestStageDataList[songNumber].DrumrollCount.ToString(),
DanConditionType.Score => data.DanBestStageDataList[songNumber].PlayScore.ToString(),
DanConditionType.TotalHitCount => data.DanBestStageDataList[songNumber].TotalHitCount.ToString(),
DanConditionType.GoodCount => data.DanBestStageDataList[songNumber].GoodCount,
DanConditionType.OkCount => data.DanBestStageDataList[songNumber].OkCount,
DanConditionType.BadCount => data.DanBestStageDataList[songNumber].BadCount,
DanConditionType.ComboCount => data.DanBestStageDataList[songNumber].ComboCount,
DanConditionType.DrumrollCount => data.DanBestStageDataList[songNumber].DrumrollCount,
DanConditionType.Score => data.DanBestStageDataList[songNumber].PlayScore,
DanConditionType.TotalHitCount => data.DanBestStageDataList[songNumber].TotalHitCount,
_ => throw new ArgumentOutOfRangeException(nameof(type), type, null)
};
}