Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-27 20:14:24 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't update catch rate if it's already zero

Browse Source
This commit is contained in:
Kurt
2021-10-04 22:55:18 -07:00
parent 3e5cf73b78
commit aa5b8c217b
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
PKHeX.Core/PKM/PK1.cs
View File

@@ -79,6 +79,16 @@ public override PKM Clone() => new PK1((byte[])Data.Clone(), Japanese)
private static bool IsCatchRateHeldItem(int rate) => ParseSettings.AllowGen1Tradeback && Array.IndexOf(Legal.HeldItems_GSC, (ushort)rate) >= 0;
private static bool IsCatchRatePreEvolutionRate(int baseSpecies, int finalSpecies, int rate)
{
for (int species = baseSpecies; species <= finalSpecies; species++)
{
if (rate == PersonalTable.RB[species].CatchRate || rate == PersonalTable.Y[species].CatchRate)
return true;
}
return false;
}
private void SetSpeciesValues(int value)
{
var updated = SpeciesConverter.SetG1Species(value);
@@ -91,18 +101,17 @@ private void SetSpeciesValues(int value)
Type_B = PersonalInfo.Type2;
// Before updating catch rate, check if non-standard
if (IsCatchRateHeldItem(Catch_Rate))
int rate = Catch_Rate;
if (rate is 0 || IsCatchRateHeldItem(rate))
return;
if (value == (int)Core.Species.Pikachu && Catch_Rate == 0xA3) // Light Ball (starter)
if (value == (int)Core.Species.Pikachu && rate == 0xA3) // Light Ball (starter)
return;
int Rate = Catch_Rate;
int baseSpecies = EvoBase.GetBaseSpecies(this).Species;
for (int z = baseSpecies; z <= value; z++)
{
if (Rate == PersonalTable.RB[z].CatchRate || Rate == PersonalTable.Y[z].CatchRate)
return;
}
if (IsCatchRatePreEvolutionRate(baseSpecies, value, rate))
return;
// Matches nothing possible; just reset to current Species' rate.
Catch_Rate = PersonalTable.RB[value].CatchRate;
}