mirror of
https://github.com/kwsch/PKHeX.git
synced 2026-08-28 08:16:02 -05:00
Fix comparison to watchtower, not wild area
unshuffle the IVs for comparison, oops
This commit is contained in:
@@ -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 =
|
||||
{
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user