Skip to content

Commit

Permalink
Fix types, conditionally hide stuff in main tab
Browse files Browse the repository at this point in the history
  • Loading branch information
@codemonkey85
codemonkey85 committed Sep 26, 2023
1 parent 8acafd9 commit e4d10a8
Show file tree
Hide file tree
Showing 3 changed files with 119 additions and 88 deletions.
3 changes: 3 additions & 0 deletions Pkmds.Rcl/Components/BasePkmdsComponent.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
}
</MudStack>;

public static RenderFragment TypeSummary((byte Type1, byte Type2) types) =>
TypeSummary(types.Type1, types.Type2);

public static RenderFragment TeraTypeSummary(byte type) =>
@<MudStack Row="@true"
Class="my-2"
Expand Down
191 changes: 103 additions & 88 deletions Pkmds.Rcl/Components/EditForms/Tabs/MainTab.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@ EntityContext.SplitInvalid or
EntityContext.MaxInvalid &&
((AppState.SelectedBoxNumber is not null && AppState.SelectedBoxSlotNumber is not null) || (AppState.SelectedPartySlotNumber is not null)))
{
<MudNumericField Label="PID"
Variant="@Variant.Outlined"
@bind-Value="@Pokemon.PID"
@bind-Value:after="@(() => { AppService.LoadPokemonStats(Pokemon); RefreshService.Refresh(); })"
For="@(() => Pokemon.PID)" />
@if (Pokemon.Generation >= 3)
{
<MudNumericField Label="PID"
Variant="@Variant.Outlined"
@bind-Value="@Pokemon.PID"
@bind-Value:after="@(() => { AppService.LoadPokemonStats(Pokemon); RefreshService.Refresh(); })"
For="@(() => Pokemon.PID)" />
}

<MudAutocomplete T="ComboItem"
Label="Species"
Expand All @@ -22,7 +25,7 @@ EntityContext.MaxInvalid &&
SearchFunc="@((searchString) => Task.FromResult(AppService.SearchPokemonNames(searchString)))"
ToStringFunc="@((species) => species.Text)" />

@TypeSummary(Pokemon.PersonalInfo.Type1, Pokemon.PersonalInfo.Type2)
@TypeSummary(Pokemon.GetGenerationTypes())

@if (Pokemon is PK9 pK9)
{
Expand Down Expand Up @@ -50,39 +53,42 @@ EntityContext.MaxInvalid &&
@bind-Value:after="@(() => AppService.LoadPokemonStats(Pokemon))"
For="@(() => Pokemon.CurrentLevel)" />

<MudSelect Label="Nature"
Variant="@Variant.Outlined"
@bind-Value="@Pokemon.Nature"
@bind-Value:after="@(() => AppService.LoadPokemonStats(Pokemon))"
For="@(() => Pokemon.Nature)">
@foreach (var nature in GameInfo.FilteredSources.Natures)
{
<MudSelectItem Value="@(nature.Value)">
<MudStack>
<MudText>
@nature.Text
</MudText>
@{
var str = AppService.GetStatModifierString(nature.Value);
@if (Pokemon.Generation >= 3)
{
<MudSelect Label="Nature"
Variant="@Variant.Outlined"
@bind-Value="@Pokemon.Nature"
@bind-Value:after="@(() => AppService.LoadPokemonStats(Pokemon))"
For="@(() => Pokemon.Nature)">
@foreach (var nature in GameInfo.FilteredSources.Natures)
{
<MudSelectItem Value="@(nature.Value)">
<MudStack>
<MudText>
@nature.Text
</MudText>
@{
var str = AppService.GetStatModifierString(nature.Value);
}
@if (str is { Length: > 0 })
{
<MudText>
@str
</MudText>
}
@if (str is { Length: > 0 })
{
<MudText>
@str
</MudText>
}
</MudStack>
</MudSelectItem>
}
</MudSelect>
</MudStack>
</MudSelectItem>
}
</MudSelect>
}

@if (Pokemon is { PersonalInfo.HasForms: true } || Pokemon is { Species: (ushort)Species.Unown })
@if (Pokemon is IFormArgument && (Pokemon is { PersonalInfo.HasForms: true } || Pokemon is { Species: (ushort)Species.Unown }))
{
var forms = FormConverter.GetFormList(Pokemon.Species, GameInfo.Strings.types, GameInfo.Strings.forms, GameInfo.GenderSymbolUnicode, Pokemon.Context);
if (forms.AsEnumerable().Any(f => !string.IsNullOrEmpty(f)))
{
<MudSelect T="byte"
@ref="@FormSelect"
@ref="@FormSelect"
Label="Forme"
Variant="@Variant.Outlined"
@bind-Value="@Pokemon.Form"
Expand All @@ -97,7 +103,7 @@ EntityContext.MaxInvalid &&
}
</MudSelect>

@if (Pokemon is IFormArgument f && FormArgumentUtil.GetFormArgumentMax(Pokemon.Species, Pokemon.Form, Pokemon.Context) > 0 && FormConverter.GetFormArgumentIsNamedIndex(Pokemon.Species))
@if (Pokemon is IFormArgument && FormArgumentUtil.GetFormArgumentMax(Pokemon.Species, Pokemon.Form, Pokemon.Context) > 0 && FormConverter.GetFormArgumentIsNamedIndex(Pokemon.Species))
{
<MudSelect T="uint?"
Label="Forme Arg"
Expand Down Expand Up @@ -145,60 +151,69 @@ EntityContext.MaxInvalid &&
</ItemTemplate>
</MudAutocomplete>

<MudAutocomplete T="ComboItem"
Label="Ability"
Variant="@Variant.Outlined"
@bind-Value:get="@(AppService.GetAbilityComboItem(Pokemon.Ability))"
@bind-Value:set="@((ability) => Pokemon.Ability = ability.Value)"
SearchFunc="@((searchString) => Task.FromResult(AppService.SearchAbilityNames(searchString)))"
ToStringFunc="@((ability) => ability.Text)" />

<MudSelect Label="Language"
Variant="@Variant.Outlined"
@bind-Value="@Pokemon.Language"
For="@(() => Pokemon.Language)">
@foreach (var language in GameInfo.FilteredSources.Languages)
{
<MudSelectItem Value="language.Value">
@language.Text
</MudSelectItem>
}
</MudSelect>
@if (Pokemon.Generation >= 3)
{
<MudAutocomplete T="ComboItem"
Label="Ability"
Variant="@Variant.Outlined"
@bind-Value:get="@(AppService.GetAbilityComboItem(Pokemon.Ability))"
@bind-Value:set="@((ability) => Pokemon.Ability = ability.Value)"
SearchFunc="@((searchString) => Task.FromResult(AppService.SearchAbilityNames(searchString)))"
ToStringFunc="@((ability) => ability.Text)" />
}

<MudNumericField Label="Friendship"
Variant="@Variant.Outlined"
Min="0"
Max="255"
@bind-Value="@Pokemon.CurrentFriendship"
For="@(() => Pokemon.CurrentFriendship)" />

<MudStack Row="@true">

<MudCheckBox Label="Is Egg"
@bind-Checked="@Pokemon.IsEgg"
@bind-Checked:after="@RefreshService.Refresh"
For="@(() => Pokemon.IsEgg)" />

<MudCheckBox Label="Infected"
@bind-Checked="@Pokemon.PKRS_Infected"
@bind-Checked:after="@RefreshService.Refresh"
For="@(() => Pokemon.PKRS_Infected)" />

<MudCheckBox Label="Cured"
@bind-Checked="@Pokemon.PKRS_Cured"
@bind-Checked:after="@RefreshService.Refresh"
For="@(() => Pokemon.PKRS_Cured)" />
@*
<MudCheckBox Label="N's Sparkle"
@bind-Checked="@Pokemon"
@bind-Checked:after="@RefreshService.Refresh"
For="@(() => Pokemon.PKRS_Cured)" />
*@

<MudCheckBox Label="Shiny"
Checked="@Pokemon.IsShiny"
ReadOnly="@true"
For="@(() => Pokemon.IsShiny)" />

</MudStack>
@if (Pokemon.Generation >= 4)
{
<MudSelect Label="Language"
Variant="@Variant.Outlined"
@bind-Value="@Pokemon.Language"
For="@(() => Pokemon.Language)">
@foreach (var language in GameInfo.FilteredSources.Languages)
{
<MudSelectItem Value="language.Value">
@language.Text
</MudSelectItem>
}
</MudSelect>
}

@if (Pokemon.Generation >= 2)
{
<MudNumericField Label="Friendship"
Variant="@Variant.Outlined"
Min="0"
Max="255"
@bind-Value="@Pokemon.CurrentFriendship"
For="@(() => Pokemon.CurrentFriendship)" />

<MudStack Row="@true">

<MudCheckBox Label="Is Egg"
@bind-Checked="@Pokemon.IsEgg"
@bind-Checked:after="@RefreshService.Refresh"
For="@(() => Pokemon.IsEgg)" />

<MudCheckBox Label="Infected"
@bind-Checked="@Pokemon.PKRS_Infected"
@bind-Checked:after="@RefreshService.Refresh"
For="@(() => Pokemon.PKRS_Infected)" />

<MudCheckBox Label="Cured"
@bind-Checked="@Pokemon.PKRS_Cured"
@bind-Checked:after="@RefreshService.Refresh"
For="@(() => Pokemon.PKRS_Cured)" />
@*
<MudCheckBox Label="N's Sparkle"
@bind-Checked="@Pokemon"
@bind-Checked:after="@RefreshService.Refresh"
For="@(() => Pokemon.PKRS_Cured)" />
*@

<MudCheckBox Label="Shiny"
Checked="@Pokemon.IsShiny"
ReadOnly="@true"
For="@(() => Pokemon.IsShiny)" />

</MudStack>
}
}
13 changes: 13 additions & 0 deletions Pkmds.Rcl/Extensions/PKMExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,17 @@ public static class PKMExtensions
{
public static uint? GetFormArgument(this PKM pkm, uint? valueIfNull = null) =>
(pkm as IFormArgument)?.FormArgument ?? valueIfNull;

public static (byte Type1, byte Type2) GetGenerationTypes(this PKM pkm)
{
var type1 = pkm.PersonalInfo.Type1;
var type2 = pkm.PersonalInfo.Type2;
var generation = pkm.Generation;

return generation <= 2
? (ConvertGenerationType(type1, generation), ConvertGenerationType(type2, generation))
: (type1, type2);

static byte ConvertGenerationType(byte type, int generation) => (byte)((MoveType)type).GetMoveTypeGeneration(generation);
}
}

0 comments on commit e4d10a8

Please sign in to comment.