Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-23 12:33:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sanity check friendship and level values parsed

Browse source 
Don't accept Level: 101, for example.
This commit is contained in:
Kurt 2022-08-31 22:22:23 -07:00
parent d8cdc9fe34
commit 4a008e510d
2 changed files with 56 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
PKHeX.Core/Editing/Showdown/ShowdownSet.cs
View file

@ -200,34 +200,38 @@ public sealed class ShowdownSet : IBattleTemplate
return (Nature = StringUtil.FindIndexIgnoreCase(Strings.natures, naturestr)) >= 0;
}
private bool ParseEntry(string identifier, string value)
private bool ParseEntry(string identifier, string value) => identifier switch
{
switch (identifier)
{
case "Ability" or "Trait": return (Ability = StringUtil.FindIndexIgnoreCase(Strings.abilitylist, value)) >= 0;
case "Shiny": return Shiny = StringUtil.IsMatchIgnoreCase("Yes", value);
case "Gigantamax": return CanGigantamax = StringUtil.IsMatchIgnoreCase("Yes", value);
case "Nature": return (Nature = StringUtil.FindIndexIgnoreCase(Strings.natures, value)) >= 0;
case "EV" or "EVs": ParseLineEVs(value); return true;
case "IV" or "IVs": ParseLineIVs(value); return true;
case "Dynamax Level": return ParseDynamax(value);
case "Level":
{
if (!int.TryParse(value.Trim(), out int val))
return false;
Level = val;
return true;
}
case "Friendship" or "Happiness":
{
if (!int.TryParse(value.Trim(), out int val))
return false;
Friendship = val;
return true;
}
default:
return false;
}
"Ability" or "Trait" => (Ability = StringUtil.FindIndexIgnoreCase(Strings.abilitylist, value)) >= 0,
"Nature" => (Nature = StringUtil.FindIndexIgnoreCase(Strings.natures , value)) >= 0,
"Shiny" => Shiny = StringUtil.IsMatchIgnoreCase("Yes", value),
"Gigantamax" => CanGigantamax = StringUtil.IsMatchIgnoreCase("Yes", value),
"Friendship" or "Happiness" => ParseFriendship(value),
"EV" or "EVs" => ParseLineEVs(value),
"IV" or "IVs" => ParseLineIVs(value),
"Level" => ParseLevel(value),
"Dynamax Level" => ParseDynamax(value),
_ => false,
};
private bool ParseLevel(string value)
{
if (!int.TryParse(value.Trim(), out var val))
return false;
if ((uint)val is 0 or > 100)
return false;
Level = val;
return true;
}
private bool ParseFriendship(string value)
{
if (!int.TryParse(value.Trim(), out var val))
return false;
if ((uint)val > byte.MaxValue)
return false;
Friendship = val;
return true;
}
private bool ParseDynamax(string value)
@ -630,7 +634,7 @@ public sealed class ShowdownSet : IBattleTemplate
return hiddenPowerName;
}
private void ParseLineEVs(string line)
private bool ParseLineEVs(string line)
{
var list = SplitLineStats(line);
if ((list.Length & 1) == 1)
@ -647,9 +651,10 @@ public sealed class ShowdownSet : IBattleTemplate
}
EVs[index] = value;
}
return true;
}
private void ParseLineIVs(string line)
private bool ParseLineIVs(string line)
{
var list = SplitLineStats(line);
if ((list.Length & 1) == 1)
@ -666,6 +671,7 @@ public sealed class ShowdownSet : IBattleTemplate
}
IVs[index] = value;
}
return true;
}
private static string RemoveAll(string original, ReadOnlySpan<char> remove)

21
Tests/PKHeX.Core.Tests/Simulator/ShowdownSetTests.cs
View file

@ -182,6 +182,27 @@ public class ShowdownSetTests
la.Valid.Should().BeTrue();
}
[Theory]
[InlineData(-1)]
[InlineData(256)]
public void BadFriendshipNotParsed(int value)
{
string input = $@"Eevee\nFriendship: {value}";
var set = new ShowdownSet(input);
set.Level.Should().NotBe(value);
}
[Theory]
[InlineData(-1)]
[InlineData(0)]
[InlineData(101)]
public void BadLevelNotParsed(int value)
{
string input = $@"Eevee\nLevel: {value}";
var set = new ShowdownSet(input);
set.Level.Should().NotBe(value);
}
private const string LowLevelElectrode =
@"BOLICHI (Electrode)
IVs: 19 HP / 16 Atk / 18 Def / 25 SpA / 19 SpD / 25 Spe