Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-28 19:17:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add RANDY Gen2 ingame trade

Browse Source 
closes #1538

rename pid deferral to pidiv deferral for clarity
This commit is contained in:
Kurt
2017-10-22 10:41:27 -07:00
parent c5b0ed6c35
commit 096f6bbd18
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PKHeX.Core/Legality/Encounters/Data/Encounters2.cs
View File

@@ -243,7 +243,8 @@ private static EncounterArea[] GetSlots_C(EncounterArea[] f)
new EncounterTrade { Species = 178, Generation = 2, Level = 15, Gender = 0, TID = 15616, IVs = new[] {08, 09, 06, 08, 06, 06} }, // Xatu @ Pewter City for Haunter [wild]
new EncounterTrade { Species = 082, Generation = 2, Level = 16, Gender = 2, TID = 50082, IVs = new[] {08, 09, 06, 06, 06, 06} }, // Magneton @ Power Plant for Dugtrio [wild]
new EncounterTrade { Species = 213, Generation = 2, Level = 15, TID = 00518 } // Shuckle @ Cianwood City for free
new EncounterTrade { Species = 213, Generation = 2, Level = 15, TID = 00518 }, // Shuckle @ Cianwood City for free
new EncounterTrade { Species = 021, Generation = 2, Level = 10, TID = 01001, Moves = new[] {64,45,43} }, // Spearow @ Goldenrod City for free
};
internal static readonly string[][] TradeGift_GSC_OTs =
{
@@ -259,6 +260,7 @@ private static EncounterArea[] GetSlots_C(EncounterArea[] f)
new[] { "モリオ", "FOREST" },
new[] { "セイジ", "MANIA" },
new[] { "ユウジ", "RANDY" },
};
}
}

8
PKHeX.Core/Legality/Encounters/EncounterGenerator.cs
View File

@@ -84,13 +84,13 @@ private static IEnumerable<IEncounterable> GetEncounters3(PKM pkm, LegalInfo inf
private static IEnumerable<IEncounterable> GetEncounters4(PKM pkm, LegalInfo info)
{
info.PIDIV = MethodFinder.Analyze(pkm);
var deferredPID = new List<IEncounterable>();
var deferredPIDIV = new List<IEncounterable>();
var deferredEType = new List<IEncounterable>();
foreach (var z in GenerateRawEncounters4(pkm))
{
if (!info.PIDIV.Type.IsCompatible4(z, pkm))
deferredPID.Add(z);
deferredPIDIV.Add(z);
else if (!IsEncounterTypeMatch(z, pkm.EncounterType))
deferredEType.Add(z);
else
@@ -100,11 +100,11 @@ private static IEnumerable<IEncounterable> GetEncounters4(PKM pkm, LegalInfo inf
foreach (var z in deferredEType)
yield return z;
if (deferredPID.Count == 0)
if (deferredPIDIV.Count == 0)
yield break;
info.PIDIVMatches = false;
foreach (var z in deferredPID)
foreach (var z in deferredPIDIV)
yield return z;
}
private static IEnumerable<GBEncounterData> GenerateRawEncounters12(PKM pkm, GameVersion game)