Fix comparison to watchtower, not wild area

unshuffle the IVs for comparison, oops
This commit is contained in:
Kurt
2020-03-19 21:04:17 -07:00
parent a188317e84
commit 61cbf04c2e
3 changed files with 3 additions and 2 deletions

View File

@@ -203,6 +203,7 @@ internal static partial class Encounters8Nest
internal const int A4 = -1; // 1/2/H
internal const int SharedNest = 162;
internal const int Watchtower = 126;
internal static readonly EncounterStatic8N[] Nest_Common =
{

View File

@@ -8,7 +8,7 @@ internal static partial class Encounters8Nest
{
new EncounterStatic8NC { Species = 782, Level = 16, Ability = A4, Location = 126, IVs = new []{31,31,31,-1,-1,-1}, DynamaxLevel = 2, Moves = new[] {033,029,525,043}, }, // ★And458 Jangmo-o
new EncounterStatic8NC { Species = 246, Level = 16, Ability = A4, Location = 126, IVs = new []{31,31,31,-1,-1,-1}, DynamaxLevel = 2, Moves = new[] {033,157,371,044}, }, // ★And15 Larvitar
new EncounterStatic8NC { Species = 823, Level = 50, Ability = A4, Location = 126, IVs = new []{31,31,31,-1,31,-1}, DynamaxLevel = 5, Moves = new[] {065,442,034,796}, CanGigantamax = true }, // ★And337 4-Star Gigantamax Corviknight
new EncounterStatic8NC { Species = 823, Level = 50, Ability = A4, Location = 126, IVs = new []{31,31,31,-1,-1,31}, DynamaxLevel = 5, Moves = new[] {065,442,034,796}, CanGigantamax = true }, // ★And337 4-Star Gigantamax Corviknight
};
#endregion
}

View File

@@ -12,7 +12,7 @@ public sealed class EncounterStatic8NC : EncounterStatic8Nest<EncounterStatic8NC
protected override bool IsMatchLocation(PKM pkm)
{
var loc = pkm.Met_Location;
return loc == SharedNest || EncounterArea8.IsWildArea8(loc);
return loc == SharedNest || loc == Watchtower;
}
}
}