Misc Nest Fixes (#2490)

* fix A3 and A4 ability values

private > internal so it can be used in Encounter Nest matching

* reject ability number 4 if ability is from A3
This commit is contained in:
Archit Date
2019-11-22 12:03:02 +08:00
committed by Kurt
parent b9e32c67a0
commit e93bc5e67c
2 changed files with 4 additions and 4 deletions

View File

@@ -198,8 +198,8 @@ internal static class Encounters8Nest
};
// Abilities Allowed
private const int A3 = -1; // 1/2/H
internal const int A4 = 4; // H only
internal const int A3 = 0; // 1/2 only
internal const int A4 = -1; // 1/2/H
internal static readonly EncounterStatic8N[] Nest_Common =
{

View File

@@ -60,7 +60,7 @@ protected override bool IsMatchLocation(PKM pkm)
public override bool IsMatch(PKM pkm, int lvl)
{
if (Ability == Encounters8Nest.A4 && pkm.AbilityNumber != 4)
if (Ability == Encounters8Nest.A3 && pkm.AbilityNumber == 4)
return false;
if (pkm is IDynamaxLevel d && d.DynamaxLevel < DynamaxLevel)
return false;
@@ -81,4 +81,4 @@ public override bool IsMatchDeferred(PKM pkm)
return false;
}
}
}
}