More generator updates

* B2 has an error in the encounter table for Route 3 Corphish Special
water encounter; GF edited from Basculin-1 to Corphish-1 and forgot to
update the form to 0.
* Ranch Trade egg locations
* Trade gender-PID set correctly
* static roamer glitch does not apply for emerald
* Mirage Island wild Wynaut case now allowed (collision with Gift Wynaut
egg hatched on Mirage Island?)

gen1-3 done; now at 413 (Wormadam) which currently yields an
EncounterEgg AS wormadam, which isn't right...
This commit is contained in:
Kurt 2018-05-08 21:17:31 -07:00
parent c21f8bf45f
commit 4913ef9647
4 changed files with 10 additions and 3 deletions

View file

@ -193,7 +193,7 @@ namespace PKHeX.Core
{
switch (Generation)
{
case 3 when Roaming:
case 3 when Roaming && Version != GameVersion.E: // Roamer IV glitch was fixed in Emerald
return PIDType.Method_1_Roamer;
case 4 when Shiny == Shiny.Always: // Lake of Rage Gyarados
return PIDType.ChainShiny;

View file

@ -76,13 +76,19 @@ namespace PKHeX.Core
pk.Met_Level = level;
pk.Met_Location = Location > 0 ? Location : DefaultMetLocation[Generation - 1];
}
pk.MetDate = DateTime.Today;
var today = DateTime.Today;
pk.MetDate = today;
if (EggLocation != 0)
{
pk.Egg_Location = EggLocation;
pk.EggMetDate = today;
}
SAV.ApplyToPKM(pk);
int nature = Nature == Nature.Random ? Util.Rand.Next(25) : (int)Nature;
pk.Nature = nature;
pk.Version = (int)version;
pk.Gender = Gender < 0 ? pk.PersonalInfo.RandomGender : Gender;
pk.Gender = pk.GetSaneGender(Gender < 0 ? pk.PersonalInfo.RandomGender : Gender);
pk.AltForm = Form;
pk.Language = lang;

View file

@ -353,6 +353,7 @@ namespace PKHeX.Core
int species = pkm.Species;
var deferNoFrame = new Queue<IEncounterable>();
var deferFrame = new Queue<IEncounterable>();
pkm.WasEgg = false; // clear flag if set from static
var slots = FrameFinder.GetFrames(info.PIDIV, pkm).ToList();
foreach (var z in GetValidWildEncounters34(pkm))
{