From 5abbe6dceb7316744add4c84ff3786a2590ae4b4 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 11 Nov 2018 22:46:03 -0800 Subject: [PATCH] Add fetching for lgpe encounters (legality checks) --- .../Generator/EncounterSlotGenerator.cs | 4 ++++ .../Generator/EncounterStaticGenerator.cs | 4 ++++ .../Generator/EncounterTradeGenerator.cs | 2 +- .../Generator/MysteryGiftGenerator.cs | 8 ++++---- .../img/Shiny Pokemon Sprites/808s.png | Bin 362 -> 367 bytes .../img/Shiny Pokemon Sprites/809s.png | Bin 745 -> 786 bytes 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs index 1ff11af1e..929839712 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs @@ -10,6 +10,7 @@ using static PKHeX.Core.Encounters5; using static PKHeX.Core.Encounters6; using static PKHeX.Core.Encounters7; +using static PKHeX.Core.Encounters7b; namespace PKHeX.Core { @@ -500,6 +501,9 @@ private static IEnumerable GetEncounterTable(PKM pkm, GameVersion case GameVersion.US: return SlotsUS; case GameVersion.UM: return SlotsUM; + case GameVersion.GP: return SlotsGP; + case GameVersion.GE: return SlotsGE; + default: return Enumerable.Empty(); } } diff --git a/PKHeX.Core/Legality/Encounters/Generator/EncounterStaticGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/EncounterStaticGenerator.cs index 7b0c55e28..31bd58b00 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/EncounterStaticGenerator.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/EncounterStaticGenerator.cs @@ -9,6 +9,7 @@ using static PKHeX.Core.Encounters5; using static PKHeX.Core.Encounters6; using static PKHeX.Core.Encounters7; +using static PKHeX.Core.Encounters7b; namespace PKHeX.Core { @@ -363,6 +364,9 @@ private static IEnumerable GetEncounterStaticTable(PKM pkm, Gam case GameVersion.US: return StaticUS; case GameVersion.UM: return StaticUM; + case GameVersion.GP: return StaticGP; + case GameVersion.GE: return StaticGE; + default: return Enumerable.Empty(); } } diff --git a/PKHeX.Core/Legality/Encounters/Generator/EncounterTradeGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/EncounterTradeGenerator.cs index 682143d51..620ee1ec4 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/EncounterTradeGenerator.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/EncounterTradeGenerator.cs @@ -77,7 +77,7 @@ private static IEnumerable GetEncounterTradeTable(PKM pkm) case 4: return pkm.HGSS ? Encounters4.TradeGift_HGSS : Encounters4.TradeGift_DPPt; case 5: return pkm.B2W2 ? Encounters5.TradeGift_B2W2 : Encounters5.TradeGift_BW; case 6: return pkm.XY ? Encounters6.TradeGift_XY : Encounters6.TradeGift_AO; - case 7: return pkm.SM ? Encounters7.TradeGift_SM : Encounters7.TradeGift_USUM; + case 7: return pkm.GG ? Encounters7b.TradeGift_GG : pkm.SM ? Encounters7.TradeGift_SM : Encounters7.TradeGift_USUM; } return null; } diff --git a/PKHeX.Core/Legality/Encounters/Generator/MysteryGiftGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/MysteryGiftGenerator.cs index 6af8624b8..a7b4968fc 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/MysteryGiftGenerator.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/MysteryGiftGenerator.cs @@ -16,7 +16,7 @@ public static IEnumerable GetPossible(PKM pkm) public static IEnumerable GetPossible(PKM pkm, IReadOnlyList vs) { - var table = GetTable(pkm.GenNumber); + var table = GetTable(pkm.GenNumber, pkm); return table.Where(wc => vs.Any(dl => dl.Species == wc.Species)); } @@ -28,12 +28,12 @@ public static IEnumerable GetValidGifts(PKM pkm) case 4: return GetMatchingPCD(pkm, MGDB_G4); case 5: return GetMatchingPGF(pkm, MGDB_G5); case 6: return GetMatchingWC6(pkm, MGDB_G6); - case 7: return GetMatchingWC7(pkm, MGDB_G7); + case 7: return pkm.GG ? GetMatchingWC7(pkm, MGDB_G7GG) : GetMatchingWC7(pkm, MGDB_G7); default: return Enumerable.Empty(); } } - private static IEnumerable GetTable(int generation) + private static IEnumerable GetTable(int generation, PKM pkm) { switch (generation) { @@ -41,7 +41,7 @@ private static IEnumerable GetTable(int generation) case 4: return MGDB_G4; case 5: return MGDB_G5; case 6: return MGDB_G6; - case 7: return MGDB_G7; + case 7: return pkm.GG ? MGDB_G7GG : MGDB_G7; default: return Enumerable.Empty(); } } diff --git a/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/808s.png b/PKHeX.WinForms/Resources/img/Shiny Pokemon Sprites/808s.png index 012917a27185d97a0de34db32235b33329aa6620..981aa19e8e8ca457afb90be1e9035db30631e992 100644 GIT binary patch delta 281 zcmV+!0p|Yd0`CHlJPN-601m$aI0aKAkwzzf?MXyIR9Hvtld%oLFc3vE0ZULZMm9h} zumB@arl6o?4ut5_vH}CJLmCz^`sdu~Y?2b6i+j?SW8X!7vXjPf9LI60AS}cj5_z1r zNyhu0GS$rp{c$HUI(i*_vAsNDeBCGz!kpGBkrcVMZF7MiNvy?E8DwL~fv!8vO5%He zL@!3H#nS(g6M`V*mIM)tQ}ViREai fs>Ga%X__yRzjV;-8Wi*Z0000Ab6!?+EUM{skUJN-%ZqK)>B+esxam8MK zF8v>w5CkE&B#2l{QC^B`?Gtm|YJy-kAtg!o`scBbV`h?^UgQ{&)PY>()0;suWsdhN zO%nComXAPQwufXORR*%CZ`Px%>4}EOx#MU#WVIVv%wCSelIWRY1_|^iR-&c45_38x ZgfDWEY=Z#3!>ch8gLb#eDU>0CXDf2QT_ zb>8iE=O5pX?qBR@`L;^9FK;@3{q!zOJ!3DU?!fu=HK_f5-@(2#U>tsb|Je^+z_I6l z`}1{G%f;0*Dc}x=gAZ?TdRj=J)CNy6=Ez*<_S4i21;8O3u+|D-)HH{iwHy9xErxQf z;j97S(_mt)eaxP2?l}R^$K!D^lxuyum0=B>gV&7U*n0|O1N4D1zjwS|d^(*vDS)j7^KOR1Rbgx=-9MB-IR=X<=c32Etg>*O239dfH3g?jX zZ|g<1*WhL#fYb#j$dUCOe0cw=Wz|~&S<7314aO}<>KV(wQW*#VRSS?g^kE0|`Q?nE zT4TMt5hVN90Fu+w&(;L>xqi-EU#J6fUucf~5ukc-fpaxDowW(*gVm({QM3Pl;kem% zPtnn#k!3#8IqYZok2(lh&6gS{1pxJL)2F^)0;88qM&r|GwE6Pd&BRcKyB!dd%Xp^- zS0PK^`R(hUKBLvi%7dF)KD`lKZ8Al63lKQ=SV!03Tz_lSGd3Tv1y_bQ>5i$7;8yzE zlVYD9S-r53i!hs8fC?A2gD`!6qh3rlTS6V6&c^CzO)kP75}+TJ- delta 662 zcmV;H0%`q{2I&QmJPN)501mzZ>O!%=kwzzfXGugsR9Hvlmceb?Pz;8>iw{0z3J0Aa zfG<5|i=4AXVdR(@GEKZh7jXTN`WZgz$x>>!4iExA^hEw7KS@d2)pv?x)!}ehp|23f z^?H4L|9Rhtyq9kq4)^lh>PC>w!r}7;)ONdVVgECrEq{Iam6wj-$mRTSUn6{Wccn0Y zxZQ4-hXdkN0<}+F-eQH5*tg`L#`p|b8c1D$ zg6v5@gKwK3;Z<)1G4(v&2#gfp+1TREbC0O<$HkYLCnDGElmWRcFh9T!4mhq=Gr6WUUahdmX5rC+>`h6 zM??__DK}3wo+9d8d%vN0+-lc6qw#h85jK?JS!WjI2;USW9(1?)oo7THuT*+0!lXCX zgR4y`!mDc!5IAz2t*f&)e>LiE8y3vLmEjS&&UImblcz^gFD&@XOmYrT<`RvEzFsfF z>n#?M&%2TOIpZ^PHeCWZC;Z-j=6_zu^#FCo=l0W~zUB-`-EB=oeW~d2Rtw8b0aACH zhZQPhXK0RQ`BKs6?c@Kz>c03QJ_|^UmeZSaRd}q^qx)jWdwCoxX3a(Q8VHM|Gk`<` w$i1ikZNw+jTbY0(ZURVXS=Llccvh=FGn&S5xgiij00000NkvXXu0mh|g83sxbpQYW