From 71d355804a14be71e9120b665ca45d7e29d57096 Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 17 Mar 2021 21:59:00 -0700 Subject: [PATCH] Move enc7b sky encounter fudging to reformatter project https://github.com/kwsch/PKHeX.EncounterSlotDumper/commit/50c53d6b33983a12606a3a6a414ec7e738cad7b8 --- .../Legality/Encounters/Data/Encounters7b.cs | 72 +----------------- PKHeX.Core/Resources/byte/encounter_ge.pkl | Bin 2604 -> 3200 bytes PKHeX.Core/Resources/byte/encounter_gp.pkl | Bin 2604 -> 3200 bytes 3 files changed, 3 insertions(+), 69 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters7b.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters7b.cs index 3887b6690..f2ac344c1 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters7b.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters7b.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using static PKHeX.Core.EncounterUtil; +using static PKHeX.Core.EncounterUtil; using static PKHeX.Core.GameVersion; namespace PKHeX.Core @@ -12,12 +9,6 @@ internal static class Encounters7b internal static readonly EncounterArea7b[] SlotsGE = EncounterArea7b.GetAreas(Get("ge", "gg"), GE); private static byte[][] Get(string resource, string ident) => BinLinker.Unpack(Util.GetBinaryResource($"encounter_{resource}.pkl"), ident); - static Encounters7b() - { - ManuallyAddRareSpawns(SlotsGP); - ManuallyAddRareSpawns(SlotsGE); - } - private static readonly EncounterStatic7b[] Encounter_GG = { // encounters @@ -75,64 +66,7 @@ static Encounters7b() new(GG) { Species = 074, Form = 1, Level = 16, TrainerNames = T8, TID7 = 551873, OTGender = 0, IVs = new[] {31,31,-1,-1,-1,-1} }, // Geodude @ Vermilion City, AV rand [0-5) }; - private class RareSpawn - { - public readonly int Species; - public readonly byte[] Locations; - - protected internal RareSpawn(int species, params byte[] locations) - { - Species = species; - Locations = locations; - } - } - - private static readonly byte[] Sky = {003, 004, 005, 006, 009, 010, 011, 012, 013, 014, 015, 016, 017, 018, 019, 020, 021, 022, 023, 024, 025, 026, 027}; - - private static readonly RareSpawn[] Rare = - { - // Normal - new(001, 039), - new(004, 005, 006, 041), - new(007, 026, 027, 044), - new(106, 045), - new(107, 045), - new(113, 007, 008, 010, 011, 012, 013, 014, 015, 016, 017, 018, 019, 020, 023, 025, 040, 042, 043, 045, 047, 051), - new(137, 009), - new(143, 046), - - // Water - new(131, 021, 022), - - // Fly - new(006, Sky), - new(144, Sky), - new(145, Sky), - new(146, Sky), - new(149, Sky), - }; - - private static void ManuallyAddRareSpawns(IEnumerable areas) - { - foreach (var table in areas) - { - var loc = table.Location; - var species = Rare.Where(z => z.Locations.Contains((byte)loc)).Select(z => z.Species).ToArray(); - if (species.Length == 0) - continue; - var slots = table.Slots; - var first = slots[0]; - var extra = species - .Select(z => new EncounterSlot7b(table, z, (z is 006 or >= 144) ? 03 : first.LevelMin, (z is 006 or >= 144) ? 56 : first.LevelMax)).ToArray(); - - int count = slots.Length; - Array.Resize(ref slots, count + extra.Length); - extra.CopyTo(slots, count); - table.Slots = slots; - } - } - - internal static readonly EncounterStatic[] StaticGP = GetEncounters(Encounter_GG, GP); - internal static readonly EncounterStatic[] StaticGE = GetEncounters(Encounter_GG, GE); + internal static readonly EncounterStatic7b[] StaticGP = GetEncounters(Encounter_GG, GP); + internal static readonly EncounterStatic7b[] StaticGE = GetEncounters(Encounter_GG, GE); } } diff --git a/PKHeX.Core/Resources/byte/encounter_ge.pkl b/PKHeX.Core/Resources/byte/encounter_ge.pkl index 339ae8c4d943369c1902ffe271f3df8561126bc4..4037d7eca8626576849796b4b1d0c7953e2f0026 100644 GIT binary patch literal 3200 zcmdVcU2_vv9LMn=cAKQnyV*?&mbQtcjR~bz+reI>!XT+hJ3atKW)P+fPwgmBR$45M z0*mE>8D>zZ@4yRRKrgxQ1^6Po@CA73rQfaW%qAY7VYu<)GdXAX{D0X!n{zfxOZ&AY z=}%O4NmsCiKd|==X&GDi8)w?2r|>MsVGF5tX#u~$N=S#XiN7$Gls51?yp&YH6pms6 z7qN;BY~m@b4$fg65Aka!bzRbL*xfDNMVqQ>vs~Cnt8Ll=?db%5#7}sPpFw6gKGlOx zP?utCDqa`nao*y53%Tv;f0mcwGs}1JIc?E4Uq?a*mF(_^iwx?hAwX0geOeqd=OpE* z%RYo6M&QCm{GNRJJfH2c2Wgwef5Y*c2=L$94vi{1a2OsO96}KzaA6}}_kh0nnmb$0 z@}Ha4r6D=lJO+`2hb&xVw%h+c3!k?6db)L9>HZ<)F^C*IWZ@!%P1NxOH3W#BPxR?? z%={faiqDOwp0tB+aSkqQtf7uo)DR$E=kuE~=l60C!-W%=MHLs|z{VQtSVav18gqvW z=G;DV^P?v)iz+U_fsHlPv5Fc3H0I_<&AGPjFgD73m-YniBFf%bj?*x&tz|xMF4J0I zemuB1iD(|<*A#F2j4|J*%R0}Geu9s25)1I);yzltUr)^$rutjthRC-mnzPbHgm}0-L zVgfee?}qrCCOK!$86c;lcM4TZz{U(J2+)|*(QD4x+pxaGjK%B3?%UWOZtAm>vS&r_ zWQiTNp}()GUufzV!}oQf4|~vyF7SR%@P1D4?oRB2^tK9W?_9(_jAITZ?DUw=SgE8N z?BUB;!6J@e9%am-gq@7B7$=qWJ-@$exQa`-h~qeh@V6=L=UaQylXwq4_`js@SU;!m zIX=UuD5Hcg5U#V+h}PQwY5a?>^+o5B+^=*%*I7R+Sj2}of_coLj1pegm@mot3gMcS z##vXB)7Pl~KZ3oWV|yh2x{z auqLeaAx&z7dA|)0F0SD!Ue|G-Ea@LL$%KOd delta 373 zcmWO2El2|a90l-qpS#-}%G?Jk!jKEoO_*-s!jKCmEEvXE5`$qd5QD+4$iS+;1%pWp z2GcYR5u+Gn(I5s{mL;<<{NR;8y!Ss{c*vggdSyHT7)#awDzYbid6uaJCeV@_nMhy( zT^Yz&Y#V4uU+!fhB}X@MA+ItOxWJqgr7Dq&5G{p$Ig){VN{|3z>Byl6e95s7yh$Yq zSlH&QQMmkxbAW>aEN@ojS)0k_-+uiTiwZi#D&h-Zl^-zDSSapc7`{T;UbVj3u873oY( dHXqOZB}4Pq!H;B90Z{w}yq?65_z6GbKFAFFr-v~J z>eBR0$Lqp8?kBk4LvFwFabFoJnC?eMGH*?h%%yMf@|ii zlxz)I$5F-+IIs{On@?LxZ}&aSxvBp}u78IB|EwL*QRVV)!iA0FDB}nmScuo%qHTWW z!Jf1Hr)CXlTz0OAF%;k;2M5{h^S|GR&$;<|GWuMjd&W`37z%KagM%#Yp@q9>B0%(h zqNC3>^KT3*J~yt0M{QijXK-L)9WAucM1Xjm&;QDtKf)L$N+(f673W~X!a7=Lqlo~W zxf3OG?rw66lP6I_73W~X!a7=Lqlo~Wxy4CyuB9vVjWQ2%K8`FTil6)RF^|(>trsWX!P_{6MYwQq6TOYsRdZ($A#m`4R3o>!l*$od-LT9u|) zQ#187tl|PT@dg$!j|w~-!z>yI;3HlWW^~v5*X%oFNw4X=@`VaKe2TN!>9w$bR2$ZW YwLYX7Z8Gmaz=eY|IF09Z-6u=>3zbxY7XSbN delta 355 zcmWO2El5Lg6b10}e_z|%hsqd=A7RLXvL`&}!jOd*9n8Xu)aJg_U_uh-ehx~cFUBWYfcgY(dl$P{lB)<|^z`hJ* zDuE4j8$l*mIByDARlSZ-t@#e@b*Q#wiDL(Y8Q zO@b6)qr_RWaQzu`+pMr_Djb?MewnJa@p)oxvTLbl1^lxbJhJP2wIeP$5l@|vL#M_W zx55Lr%6qrYlvm`ASL3Z0^T%6bIT7(H5pXQIQdxty3dz%lk=IDKJ^c5+(-EU