mirror of
https://github.com/kwsch/PKHeX
synced 2024-11-10 14:44:24 +00:00
Ignore encounter if bad catch rate
Waffling on this, let's just be less lenient in error messages and just outright reject the encounter.
This commit is contained in:
parent
3f769d6f52
commit
bee4a54148
2 changed files with 3 additions and 1 deletions
|
@ -60,7 +60,7 @@ namespace PKHeX.Core
|
||||||
if (rate != -1)
|
if (rate != -1)
|
||||||
{
|
{
|
||||||
var expect = (slot.Version == GameVersion.YW ? PersonalTable.Y : PersonalTable.RB)[slot.Species].CatchRate;
|
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;
|
break;
|
||||||
}
|
}
|
||||||
yield return slot;
|
yield return slot;
|
||||||
|
|
|
@ -48,6 +48,8 @@
|
||||||
|
|
||||||
protected override bool IsMatchPartial(PKM pkm)
|
protected override bool IsMatchPartial(PKM pkm)
|
||||||
{
|
{
|
||||||
|
if (ParseSettings.AllowGen1Tradeback)
|
||||||
|
return false;
|
||||||
if (pkm is not PK1 pk1)
|
if (pkm is not PK1 pk1)
|
||||||
return false;
|
return false;
|
||||||
if (IsCatchRateValid(pk1))
|
if (IsCatchRateValid(pk1))
|
||||||
|
|
Loading…
Reference in a new issue