Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-15 08:47:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update some comparisons

Browse source
This commit is contained in:
Kurt 2019-11-19 18:02:57 -08:00
parent 85fa6e0273
commit 0f4598ff66
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/Legality/Encounters/Data/Encounters8Nest.cs
View file

@ -100,7 +100,7 @@
// Abilities Allowed
private const int A3 = -1; // 1/2/H
private const int A4 = 4; // H only
internal const int A4 = 4; // H only
internal static readonly EncounterStatic8N[] Nest_Common =
{

12
PKHeX.Core/Legality/Encounters/EncounterStatic8N.cs
View file

@ -8,10 +8,10 @@
public bool CanGigantamax { get; set; }
public byte DynamaxLevel { get; set; }
private readonly int MinRank;
private readonly int MaxRank;
private readonly uint MinRank;
private readonly uint MaxRank;
public EncounterStatic8N(int loc, int minRank, int maxRank, byte val)
public EncounterStatic8N(int loc, uint minRank, uint maxRank, byte val)
{
Location = loc;
MinRank = minRank;
@ -33,8 +33,8 @@
protected override bool IsMatchLevel(PKM pkm, int lvl)
{
var metLevel = pkm.Met_Level - 15;
var rank = metLevel / 10;
if ((uint)rank > 4u)
var rank = (uint)(metLevel / 10);
if (rank > 4)
return false;
if (rank < MinRank || MaxRank < rank)
return false;
@ -44,7 +44,7 @@
public override bool IsMatch(PKM pkm, int lvl)
{
if (Ability != -1 && pkm.AbilityNumber != 4)
if (Ability != Encounters8Nest.A4 && pkm.AbilityNumber != 4)
return false;
if (pkm is IDynamaxLevel d && d.DynamaxLevel < DynamaxLevel)
return false;