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

Check catchrate tradeback separately

Browse source 
Closes #3510
Thanks @CodeWithMa !
This commit is contained in:
Kurt 2022-06-02 18:32:22 -07:00
parent 48ace3ca49
commit e571a0b95f
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic1.cs
View file

@ -62,7 +62,7 @@
{
if (pkm is not PK1 pk1)
return false;
if (PK1.IsCatchRateHeldItem(pk1.Catch_Rate))
if (ParseSettings.AllowGen1Tradeback && PK1.IsCatchRateHeldItem(pk1.Catch_Rate))
return false;
if (IsCatchRateValid(pk1))
return false;

12
PKHeX.Core/Legality/Encounters/Generator/EncounterFinder.cs
View file

@ -126,10 +126,16 @@ namespace PKHeX.Core
return false;
}
}
else if (pkm is PK1 pk1 && !ParseSettings.AllowGen1Tradeback)
else if (pkm is PK1 pk1)
{
if (!Array.TrueForAll(info.Moves, z => z.Generation is 1) && !PK1.IsCatchRateHeldItem(pk1.Catch_Rate))
return false;
var hasGen2 = Array.Exists(info.Moves, z => z.Generation is not 1);
if (hasGen2)
{
if (!ParseSettings.AllowGen1Tradeback)
return false;
if (!PK1.IsCatchRateHeldItem(pk1.Catch_Rate))
return false;
}
}
info.Parse.Add(evo);

4
PKHeX.Core/PKM/PK1.cs
View file

@ -80,7 +80,7 @@ namespace PKHeX.Core
public override int Stat_SPD { get => Stat_SPC; set { } }
#endregion
public static bool IsCatchRateHeldItem(int rate) => ParseSettings.AllowGen1Tradeback && Array.IndexOf(Legal.HeldItems_GSC, (ushort)rate) >= 0;
public static bool IsCatchRateHeldItem(int rate) => rate == 0 || Array.IndexOf(Legal.HeldItems_GSC, (ushort)rate) >= 0;
private static bool IsCatchRatePreEvolutionRate(int baseSpecies, int finalSpecies, int rate)
{
@ -113,7 +113,7 @@ namespace PKHeX.Core
private static bool IsValidCatchRateAnyPreEvo(int species, int rate)
{
if (rate is 0 || IsCatchRateHeldItem(rate))
if (IsCatchRateHeldItem(rate))
return true;
if (species == (int)Core.Species.Pikachu && rate == 0xA3) // Light Ball (starter)
return true;

BIN
Tests/PKHeX.Core.Tests/Legality/Legal/Generation 1 Only/135 - JOLTEON - 7E45.pk1 Normal file
View file

Binary file not shown.