mirror of
https://github.com/kwsch/PKHeX.git
synced 2026-09-13 21:05:42 -05:00
Fix cosplay pikachu static fetch
with the addition of forme checking, these 'can switch forme' cosplay pikachu are currently not recognized. just add a skip toggle instead of duplicating the encounters (variant location and formes)
This commit is contained in:
@@ -259,7 +259,7 @@ internal static EncounterStatic getValidStaticEncounter(PKM pkm)
|
||||
continue;
|
||||
if (e.Level != pkm.Met_Level)
|
||||
continue;
|
||||
if (e.Form != pkm.AltForm && !FormChange.Contains(pkm.Species))
|
||||
if (e.Form != pkm.AltForm && !FormChange.Contains(pkm.Species) && !e.SkipFormCheck)
|
||||
continue;
|
||||
|
||||
// Defer to EC/PID check
|
||||
|
||||
@@ -23,5 +23,6 @@ public class EncounterStatic
|
||||
|
||||
public bool Fateful = false;
|
||||
public bool RibbonWishing = false;
|
||||
public bool SkipFormCheck = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -426,10 +426,10 @@ public static partial class Legal
|
||||
new EncounterStatic { Species = 498, Level = 5, Location = 204, Gift = true }, // Tepig
|
||||
new EncounterStatic { Species = 501, Level = 5, Location = 204, Gift = true }, // Oshawott
|
||||
|
||||
new EncounterStatic { Species = 25, Level = 20, Location = 178, Gender = 1, Ability = 4, IVs = new[] {-1, -1, -1, 31, -1, -1}, Contest = new[] {70,70,70,70,70,0}, Gift = true, Shiny = false }, // Pikachu
|
||||
new EncounterStatic { Species = 25, Level = 20, Location = 180, Gender = 1, Ability = 4, IVs = new[] {-1, -1, -1, 31, -1, -1}, Contest = new[] {70,70,70,70,70,0}, Gift = true, Shiny = false }, // Pikachu
|
||||
new EncounterStatic { Species = 25, Level = 20, Location = 186, Gender = 1, Ability = 4, IVs = new[] {-1, -1, -1, 31, -1, -1}, Contest = new[] {70,70,70,70,70,0}, Gift = true, Shiny = false }, // Pikachu
|
||||
new EncounterStatic { Species = 25, Level = 20, Location = 194, Gender = 1, Ability = 4, IVs = new[] {-1, -1, -1, 31, -1, -1}, Contest = new[] {70,70,70,70,70,0}, Gift = true, Shiny = false }, // Pikachu
|
||||
new EncounterStatic { Species = 25, Level = 20, Location = 178, Gender = 1, Ability = 4, IVs = new[] {-1, -1, -1, 31, -1, -1}, Contest = new[] {70,70,70,70,70,0}, Gift = true, Shiny = false, SkipFormCheck = true }, // Pikachu
|
||||
new EncounterStatic { Species = 25, Level = 20, Location = 180, Gender = 1, Ability = 4, IVs = new[] {-1, -1, -1, 31, -1, -1}, Contest = new[] {70,70,70,70,70,0}, Gift = true, Shiny = false, SkipFormCheck = true }, // Pikachu
|
||||
new EncounterStatic { Species = 25, Level = 20, Location = 186, Gender = 1, Ability = 4, IVs = new[] {-1, -1, -1, 31, -1, -1}, Contest = new[] {70,70,70,70,70,0}, Gift = true, Shiny = false, SkipFormCheck = true }, // Pikachu
|
||||
new EncounterStatic { Species = 25, Level = 20, Location = 194, Gender = 1, Ability = 4, IVs = new[] {-1, -1, -1, 31, -1, -1}, Contest = new[] {70,70,70,70,70,0}, Gift = true, Shiny = false, SkipFormCheck = true }, // Pikachu
|
||||
|
||||
new EncounterStatic { Species = 360, Level = 1, EggLocation = 60004, Ability = 1, Gift = true }, // Wynaut
|
||||
new EncounterStatic { Species = 175, Level = 1, EggLocation = 60004, Ability = 1, Gift = true }, // Togepi
|
||||
|
||||
Reference in New Issue
Block a user