JonathanMcCaffrey/IGP-Fan-Reference
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(BuildCalc) Immortal filters

Browse Source
This commit is contained in:
Jonathan McCaffrey
2022-04-14 00:11:50 -04:00
parent a04a75a8fd
commit 231ce16dd6
11 changed files with 51 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IGP/Pages/BuildCalculator/Parts/FilterComponent.razor
+4 -4
View File
@@ -14,13 +14,13 @@
<ChildContent>
@if (FilterService.GetFactionType() == FactionType.QRath)
{
<option value="@ImmortalType.Orzum" selected>Orzum</option>
<option value="@ImmortalType.Ajari">Ajari</option>
<option value="@DataType.IMMORTAL_Orzum" selected>Orzum</option>
<option value="@DataType.IMMORTAL_Ajari">Ajari</option>
}
@if (FilterService.GetFactionType() == FactionType.Aru)
{
<option value="@ImmortalType.Mala" selected>Mala</option>
<option value="@ImmortalType.Xol">Xol</option>
<option value="@DataType.IMMORTAL_Mala" selected>Mala</option>
<option value="@DataType.IMMORTAL_Xol">Xol</option>
}
</ChildContent>
</FormSelectComponent>
IGP/Pages/BuildCalculator/Parts/HotkeyViewerComponent.razor
+5 -8
View File
@@ -1,5 +1,6 @@
@inject IJSRuntime jsRuntime;
@using System.Diagnostics
@implements IDisposable
@inject IKeyService keyService
@inject IBuildOrderService buildOrderService
@@ -176,7 +177,9 @@
// Move to Filter Service
bool InvalidVanguard(EntityModel entity)
{
if (entity.VanguardAdded() != null && entity.VanguardAdded()?.ImmortalId != filterService.GetImmortalType() && filterService.GetImmortalType() != ImmortalType.Any)
if (entity.VanguardAdded() != null
&& entity.VanguardAdded()?.ImmortalId != filterService.GetImmortalType()
&& filterService.GetImmortalType() != ImmortalType.Any)
{
return true;
}
@@ -189,19 +192,13 @@
{
if (entity.Replaceds().Count > 0)
{
var isReplaced = false;
foreach (var replaced in entity.Replaceds())
{
if (filterService.GetImmortalType() == replaced.ImmortalId)
{
isReplaced = true;
break;
return true;
}
}
if (isReplaced)
{
return true;
}
}
return false;