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

Ignore encounter if bad catch rate

Browse source 
Waffling on this, let's just be less lenient in error messages and just outright reject the encounter.
This commit is contained in:
Kurt 2022-01-02 15:03:04 -08:00
parent 3f769d6f52
commit bee4a54148
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/Legality/Areas/EncounterArea1.cs
View file

@ -60,7 +60,7 @@ namespace PKHeX.Core
if (rate != -1)
{
var expect = (slot.Version == GameVersion.YW ? PersonalTable.Y : PersonalTable.RB)[slot.Species].CatchRate;
if (expect != rate && !GBRestrictions.IsTradebackCatchRate(rate))
if (expect != rate && !(ParseSettings.AllowGen1Tradeback && GBRestrictions.IsTradebackCatchRate(rate)))
break;
}
yield return slot;

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

@ -48,6 +48,8 @@
protected override bool IsMatchPartial(PKM pkm)
{
if (ParseSettings.AllowGen1Tradeback)
return false;
if (pkm is not PK1 pk1)
return false;
if (IsCatchRateValid(pk1))