From 66e8bf264501006e27457b50fe6bc566e1889eba Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 2 Jul 2024 23:51:10 -0500 Subject: [PATCH] Update 24.07.03 Update wc9 pkl update dependencies (qrcoder got some perf improvements) deduplicate HOME tracker message in SV by consolidating the methods --- Directory.Build.props | 2 +- PKHeX.Core/Legality/LegalityAnalysis.cs | 2 +- .../Legality/Verifiers/TransferVerifier.cs | 17 +---------------- PKHeX.Core/Resources/legality/mgdb/wc9.pkl | Bin 113920 -> 113920 bytes .../legality/wild/encounter_go_home.pkl | Bin 133516 -> 134868 bytes .../legality/wild/encounter_go_lgpe.pkl | Bin 29108 -> 29476 bytes PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj | 2 +- PKHeX.Drawing/PKHeX.Drawing.csproj | 2 +- PKHeX.WinForms/Resources/text/changelog.txt | 16 +++++++++++++++- .../PKHeX.Core.Tests/PKHeX.Core.Tests.csproj | 6 +++--- 10 files changed, 23 insertions(+), 24 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index e64c2a02e..e177d911c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 24.06.03 + 24.07.03 12 enable en diff --git a/PKHeX.Core/Legality/LegalityAnalysis.cs b/PKHeX.Core/Legality/LegalityAnalysis.cs index 20a0ef27b..6316bfde9 100644 --- a/PKHeX.Core/Legality/LegalityAnalysis.cs +++ b/PKHeX.Core/Legality/LegalityAnalysis.cs @@ -252,7 +252,7 @@ public sealed class LegalityAnalysis private void ParsePK9() { UpdateChecks(); - Transfer.VerifyTransferLegalityG9(this); + Transfer.VerifyTransferLegalityG8(this); } /// diff --git a/PKHeX.Core/Legality/Verifiers/TransferVerifier.cs b/PKHeX.Core/Legality/Verifiers/TransferVerifier.cs index 588f23a28..38deddde8 100644 --- a/PKHeX.Core/Legality/Verifiers/TransferVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/TransferVerifier.cs @@ -142,33 +142,18 @@ public sealed class TransferVerifier : Verifier } } - if (pk.Format >= 9) - { - VerifyTransferLegalityG9(data); - return; - } - // Starting in Generation 8, games have a selective amount of species/forms from prior games. IPersonalTable pt = pk switch { PA8 => PersonalTable.LA, PB8 => PersonalTable.BDSP, + PK9 => PersonalTable.SV, _ => PersonalTable.SWSH, }; if (!pt.IsPresentInGame(pk.Species, pk.Form)) data.AddLine(GetInvalid(LTransferBad)); } - public void VerifyTransferLegalityG9(LegalityAnalysis data) - { - var pk = data.Entity; - var pt = PersonalTable.SV; - if (!pt.IsPresentInGame(pk.Species, pk.Form)) - data.AddLine(GetInvalid(LTransferBad)); - if (HomeTrackerUtil.IsRequired(data.EncounterMatch, pk)) - VerifyHOMETracker(data, pk); - } - private void VerifyHOMETransfer(LegalityAnalysis data, PKM pk) { if (pk is not IScaledSize s) diff --git a/PKHeX.Core/Resources/legality/mgdb/wc9.pkl b/PKHeX.Core/Resources/legality/mgdb/wc9.pkl index 4f5e7d9545f9aa3ae6dd9dd8d7978d14f129207a..88193a4ed15a380fcb4cbcc73e4bacbde0e40b79 100644 GIT binary patch delta 64 zcmZqp#n$kPZLC3n4=Q diff --git a/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl b/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl index 54ada6006f197cef6af9faa699cc94f96076fdd5..091319545bea8179bdb1f9ff4861f04c274950ff 100644 GIT binary patch delta 6799 zcmb`~e_&fx*}(DVq-m37=@v#A~9F^n`yN<@ZWJC#_dC>80$Fs!GEv?GJs_s~{GOovFsAztY|U8M00k(v!6 z0qDy~1dZ<#F`g+>^8)@4lGKRXdMS4+KMdGOZAOpa% zS)?De=WvZWCkdebToOCaE7EzMi2Zy9L2tE4*N3>Vg&=78Fj-@?hS^@ggJ`^v^NUEd zR%9Ga7t{ZvB!uaYi8wD289?*LsUoCa#0~wWB%t{ONjKnfD(2-7xPk|f_#_WDGUF>L z*Ht`lH3Oq@CdNBa*z8d$&=w9qa*A zw-X#=$fD_X2K^t}5ktF=Ha`=(gZN+K*$&pt2tge+p;CdhY40x8t?F(CBcWgyhTjcM)rL4sib!X`9rkB_b|TCX71;W zz{Dfmf0V(0K(byA#sSKLFj8Ceq3}s6 zhLWcUI!xt$LnZex!0IdjO;N4+n<;j zYM!V41*$VnLN7AlpLr0jml$AzKuGRoHfVU60T4h0h5LAmCRy*l@QT9s3i0+6D@782 zB|o&hCer;H>u;Q59Z~x?W{H8<`S$>om}bB?81PMI1KZyzC$g}n85j-!U=2}mkQk6d z1jZ=b8L9#2VcP%6hD8U)(DD|Q%W~g)gju{zsZk+HYEhz;bi=4q5zTvh@ggVB?e zI17|GYz(|ki5s@{w84#Ow4SV_u#iE}Rz%-oB~utXMTx#dNd*F!hVxX~p)VydOrZZX zB_(#n_uozsxZcBz%eaA2q%ini?m3vj83fy)B!)DG-p5QadM3duXv6OJE3te)NfRPS z!&a%J9u*r&c9W9u*;J>Bihhv9Hq-AMFEepc)^l+l&Sy}#s+kS!A5zkT3|hA+8A1Dp z2~dLz=!1a^m2_UDq^gz#K0?B1x|k%<{86fl`Z@+j7RHY=^GlV~T}D4IhYZ{eWQ3Z_ zSq4nPeg&n)0H)#mB!goV_C~G|M)j2>j861p6lvJ5QqlmZF6OK1aOkDLpz6 zM)~KJG_+E+8;IYg#CId>pZOwzZc>tPQ;F?lc?+A)!vHA1mBel%Xgj66ok6?=^s$Nj z%=QkJ1_?|c1N)a443ntoppwwvNq?l#{$(Y@X#5J-DCs1iy^~U+9SLON`YN+VqokCKLY2;;Cmz_VyW1QRI#24zJO_1`2>l=sqx0D3Wi6iU9u z`Zsd0e4Dbs_Z>D$AG5#|`o7Dc4>H*IxJGA$b9f%&9!8Oc<6$O%evBdw+xJ-l^ugB8 zdSeQ8kI)Y#kFqR}vi=jCl>dOB7=mqpL@{1)F^r6}{*#pbfX7h^r8X<0{XwRX;FtRjKPxT6-Fxph+!Rpb2hRL?u^XevqBe(qu<3Q;Ko#oI zf@*KBPGWH6=_HJ47!5k9L@PQFK@$8Rlxk#o!H?-16t96F#3@|7Uq1N6rvg~w4)o%tLTqz^dW{JBv(Z*wiGL? z&X6+b;WHH&Q-<~MnWF9!8jo{lY)!Yyn|&tOUStdUtY;~G@Ue9T(GhF8vK=d0u80Z- z))hy~)>f;v$Lb*xZ7W!-TN?NNb=K&>I^%J&7+PO=oI6t|FU_ws+FP{AFdw(JtSowv zA8?D;rP0>1HLLSZ&eLiTylrD&v}DtT7Srr?%HTKcyucOAKH^a42VXq1AZotIZObXj zO9h|x*xtM1Wdo-MpUUTq|4oR`x?Z=>pmO$6!F7gxvu(Pdd7EoVk+td1bXLKm*QVdK zV9~a16?v9bvuSpMYuWm*pAbp13O}Qd9(e4&3D*%52BtsZZ@0dGw_>&)pxt14fouuH?3mI zwwWCkoeG{|H09=|40&Lm*}|L4-7HEcd_sQHY(m=hh*li5t=KX;P-Nd0~?re7pFH`CNT`KTDtme0M^dmxc}wzFqh(rMxWeE~|>@^ec8f zq4w}k=q{xO`8QstQ-g+On=NiODYMR`m0Umbxd~ZJ$`xuitKxXrtg3S36DO#n`G&c@ z6nfzlwIOaSQNG1B@GY!?&lGC5t7N>XOl@90(>lA=Lp>YS(IwaMo=s}An%lCWXUi=Uuv2i7s#D+`G@d3w712 z`}sFsaj6N#ay+>SG6+KwoW@A<6?oOtY+T(wtK9rI3n=U%l&ze3wne%|82&;zfit?{#7QQbKU z{g-}2LV;J6BmVlU>Y3byJ>xfp_>Je(HdW?;D$k$)tom5c$#$m*TdRnr{gL#Uv~TswnKQ}|c}tb% z&E5+=$+=0pW0|=dO1-73&5PIcc4Ys(r6sGbDb~K}v!C7-oM~D6OxoGZ`(GRy&Z;k- zv3&g5KFgn*?ae4PM^uAjd4JPPOs)THuf-=reMeNIW&YZ4)q3U|LYX6~Y++3Q%$&8q zPyE5)I8*nzo?4qWv!m*omGi$(eCqVj=||Ppg&!y77VSDS6^CoSgV$CMDth&j%n4l1y8NdIh+Sdqx&jv_sCL`GqpE7Fcp*mvR{eMq3q zAu@)tc_Jy)m+&5=D4)-K$T&rs7SL}Oks6oyq+(Z*DWrCz)9xa@=qjZReS3(E?2ZvQxt9K@JRT>IIS)=^Gd?cPlNpHGQy5rBx?nwx0q~wq5Q`avFtVsSgI%HZ zOd%DtqxmcXKb!lUa~R`gVKkpd>CR_-BSBms;=vFqE+iB1b^e7kHj(n2i`eNUyud&+ zsl1E z_IF7;-0zV^INqmB?^FLkoLaABkq;Pz0ICyY1=$Z7{1KhU>5LJKeN3RM*wrVT;t6(w zL5w2<%WB48*%~&nmW7kdh4ytU{wbwRao#>-_Za)kN8{)00-axo*d{qpuzkg(=>8gM zI-=$qYK^iD1PI5s1cfxb8B&h&?^qbd@2N9VsQ-b!S=K=qS#K)Zl$DNQ_>5wK}jRhIYyrIlvwkXxX^%@Nr|OENeia1%%Y@gJ0+9T z7+0vI&8lPolknN6D{*52ju{L>&Gt$LZA!vBC<)AD5rk&ZhBTV&N>b>at)#Vxi4fkA z$%~bE<|t`LA1rg}i$QpHq8(-j_i)T(&Uwlw<`N~%NT6*#FPsE~dX(?X=K>}EU0B$q z#I`Gg;oMzGCCWh)^OPwWf_ZP+(29Np_F?XQ$woOr?}vp-Dk_+>!bd9h zC(1=Q0F?|rkmyl<5YL!E)xq?Gt%~#_a0m{i&tXck7<03`!LGVYC4Oprv7mAN! zK_uZmT1j;c!5vGcYuT8OOWE-(2-gWjiE$L4$j;G=6kHw#U;yTmc!w6m(Rwmjz%Y_9 zpQ5A`wFscTj?A3OJM^ALxlU)Ddgg*}l8bRM(ZhWPi=ppKc8NG9VQe4(gyA@glwt%E zs5+ZT(Qpoj&`XMuK9>N_XFfDy2yu8D+3^LGuZj6D;#^!z{hiIcMCwv%csZxNg|seV z5!7741Xq&Yt0=|Qw6{_BYnAl;mBZsBAdFxV#&$A^0Me-KU=CQXqd(+&z6FTG+sX3{ z1bG7k%ebjR9lDW#{YEl^6l!lGQaHMp0DTxk29}%IB|0&Nid&c*0SqAp+pWwGKN6_$ z69k%XBM9H^bVlPH)FeOvf8#)*?oLt(V~7PXw3MCee0EdcyBUlGtoLxB(1b9?;kuW( zFov3CEC$zow84*M=tB~|;`=#`uslFb(AGnmA7oLa(DM+BKFnfap3(UT_h|V$?=Xri zoR4zQ(2G%|Ve4h*=z;AqvWFC^AEzIRpP>GMCx{xZJ|@L5Y)=vh#^HL3dnDn0nw=wr zK{)!^P0llTmj3WYNb3M|A%)532xgFSJ#(%RIoG6DI9(d7$PJ|G~0Ah$Ei42S@84oAQ;f7}=_4jhq zf=+}G#sFf7BZ&-*A20!&D2E#!c+rARgb>C6Vu&M&vIH4M2z`iQ9GL|5w|vN?sDuYi z=)^J%U=&F>KVmUVqUAsQ#e-3dA&vybF@Ypfn1uUd=32#KpYUy%;46p(oU19Bk4p$~ z*w%0`(1~7*!m^e&v?7cooJqb?=!bJ1V^RJoi@>;^dEh|^6L6$B0|;Oo#h>vWe)tBt zq*3`fhYTTPa`#`bDEg5?{Ukd@2KFy`hXjmYkrl)+jtneclX7^_ia})IO!Eyu3%W6s zrv4M$7{B3rp0j~}NOHbKhE7Pp{v8vd8ZGES3@Kz`{+eD(TzQ&Qpc-{(L@T<`jb035 z1QW=@n$I{?!RO`Dg+9bEjtq<@O>A(Y5*~Qbf&s)3M;66qP0CRN`!@7P4eHT^HuypA zRGw+VB>d@6cEcKzL@wEW8)cbgPMM0(UcfIpt<&qaYDvxrso-_CBMkgt9b7$oR%F6f zx>Xm)%(GR&@6$xOXU)_YVhfJWwrNZ{G26V=h^eCDty)TpH!ougu9{Pj8HMqSDB- zZyscc7+0RBMgE$&FfX{_V^^ejRjAmi{~Btu@U-M}aAS?dH0*D}9wxb4wf)(`;G&Yc2n0Ki#aU;{P|9 z9?(>;rseC43~G7qGvBC&`HYV6X)=~6(e%07DQ|SjqQYwPtv;<#57I*RC}I2xj@CEQ!cfrkT$)lLj9b3SG~Vlq;&rx z<;^{%7pZBvQxi2Grz~33alD$Tl~_#cO-1M^xQlr5x8?Bir(OGfX`LU~?f&TJ>u)btCq_q?tCJ1-!WF7Ze{Y3q(NB9vIcJDmtBI!a)^7Gl8l-ky*Q(aP5S*Cl~Z52QB@GBrhm9m z?MF~19;UI^T;e-&Rc@YA8@A1@o@;4Wh58|z)Vx15ST{FpF3FZ2(bOh2Lo3K*h&gv$ z3YJ>6lBJc}+@)TvYH2^Fv@=*`?$S-#Vtu93Y=7vh+ceE%`F$(_1T?KqpVG9FZGUU- sC~)b|7_`OYOz$^nXXJ8cH)=)Z68@LaAV%YF)#k-xTRlgcELx-XU(9OUx&QzG diff --git a/PKHeX.Core/Resources/legality/wild/encounter_go_lgpe.pkl b/PKHeX.Core/Resources/legality/wild/encounter_go_lgpe.pkl index f0b0010fa012e6392c16d4c979b242a2566fa7a9..a45ebc74b0b3ae083f3217a2c22836683a602f08 100644 GIT binary patch delta 1357 zcmb`_J!}(a9LMqB`Q^^NyfzqOOaK!SFcef%2o1=EK%zjYNogB`DIq{=O4_ESRXZ?5 z@_`r_q6+C@$iR>xLsV5&)XU(3fsp}K8KQ~-si>(c3uQs?;K(-Da+0S#& z^MAXWp0g(Yw(^%Q|D>sabUTQU6t$(KBV{8}zbmDySXWEqHPU^AY9$W^ETF4S8p0@& z^->2$F@>k-e^Z)4Vihr>l2%I-xQF@G%4=i|3#1#RR7`q=!dj^}F6~(-J;41YX%SuP zNrp+JHb~d8h?b4g6(}Ly#3F__Q2_2XOGh`;SPL=n7b30vM{G-8y0wL1Tcsb8(kxDF zBfxfozC}<(c2Edzp@{ySOyO;c!30K9{O+Rjcch3u| zzM^X6hWQA;CdoI99b=an-FF24-ux1HuqNOXoe(^?F;aBm@c3HI&EVq|9{JZpJ(gX* zW_}Ad2ROYDezwx-MZ3w0zAlNMh|E;Pi5c681|`S*6K*sqclx!L%!2#-N||P=vX$|u z%TL$zg_leHv7uC|Kh^N+6kC2Wdd+dy+2tWzbw@d;qWPmUw)Kra9sW9=Rl`4Cv%F|LFy~moIR?1anJe!FOltcEGu#%f=%zG`r3;qv z+Is%ifPQ@MqfmVui3t!TT5@TrLW1)o_P|k4u^}5jiqlYb77!rdD5P> S%^bgQ_T}U~%dZ}sta}c55hs=a delta 1033 zcmY+@KTK0m6vy#jOKY1_K(W$_wN?eKiV6V>Y84a|L`3|Dpg^#qqM~3zi~~t4abRG; zTn7gS1_ol#m^=mtMg|8424Wa6A!-aU#yBt#!{GP1h{GrE-t+D~=ic-3#=bcwzc^BN zdSC0EQyR&Tp1Gu7ZfRwm6!l6WA9KuRN{K9~8>0wkOP4W>MYwXL7^bmckJn2Lc!?GC zY>?jN5)Vj2DB2`7p?{N7a^*3>G~Nd(5|XMmlL%A!Qs)+ug{3E$#u8#%NeEYjIL5Go z^fqaIlo)T&(?=BKxX}44tqX>HTa(ev0z&>dl-Xf_D zvv_iV!yq$^pAzAA2Uf)1eIBy-GFbC4Qtd5WZno@PD9@By(}X$Jl}KJyv&*Gn~L zrBp=&?L9{jeT^hJPvHv`M#V)6T;imcNqB|iC}^etny!kg(y3PB*BD->^=%ZxY`Zky zL5@yx-=G`tCs~8{2zN=#n7O4=E#D^4O>un1_+66TV*!@#bMqeB{eT-hBylfoeq`P{ z=Y2u%k|!T&pLvz>ea+N*F|78`!?nYJN*APOIC|_)?OblaZkXs z`DXrmYZ93s|J&|w`McN}&1!a=!9c`{ZY09MNvhGnpvM%2NA2-U__x=T6-La@!kDAd zl!Ss-@ve~^lf6IROvWN68V@*H&GYJ@>5RwMMy*KsqRYxn^n2_yBh^WV{amf7ck(n% zwH^GakIkproz_Ba+8yxw7d?CmJ$2?~eEvI1JFS6p$xKt+(q->#Xl>50pA&7%ZZnaz Qx9>4;lI?bE;O2PFA4qZH$p8QV diff --git a/PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj b/PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj index 86ae1d568..e2d0d547b 100644 --- a/PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj +++ b/PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj @@ -12,7 +12,7 @@ - + diff --git a/PKHeX.Drawing/PKHeX.Drawing.csproj b/PKHeX.Drawing/PKHeX.Drawing.csproj index b69d3fefc..e04075958 100644 --- a/PKHeX.Drawing/PKHeX.Drawing.csproj +++ b/PKHeX.Drawing/PKHeX.Drawing.csproj @@ -6,7 +6,7 @@ - + diff --git a/PKHeX.WinForms/Resources/text/changelog.txt b/PKHeX.WinForms/Resources/text/changelog.txt index 4bbf4452e..ba8b8321c 100644 --- a/PKHeX.WinForms/Resources/text/changelog.txt +++ b/PKHeX.WinForms/Resources/text/changelog.txt @@ -1,7 +1,21 @@ PKHeX - By Kaphotics http://projectpokemon.org/pkhex/ -24/06/03 - New Update: +24/07/03 - New Update: + - Legality: + - - Added: Slot source legality checks for miscellaneous slots like Daycare. Shouldn't flag anyone ;) + - Added: Gen4 trainer stat record editor. Thanks @abcboy101 ! + - Added: Gen3 memory cards can now be auto-detected as the latest save file on startup/request. + - Added: Gen3 Berry Powder, Pokéblock, and Decoration editors. Thanks @abcboy101 ! + - Fixed: Gen9 eggs now no longer auto-clear trash bytes for nicknames (and no longer flag in doing so). + - Fixed: Gen5 misc editor now opens correctly for editing the Key system. + - Fixed: Gen4 pk4->ranch conversion no longer throws an error. + - Fixed: Gen4 battle revolution nickname/OT now reads correctly. + - Fixed: Gen1-3 saves with misc footers are retained as intended. + - Changed: Some internals changed to better work with web browsers (wasm). Thanks @arleypadua ! + - Changed: Resource fetching abstraction extracted for better reuse with plugins. + +24/06/03 - New Update: (96798) [8875111] - Legality: Added automatic (basic) Trash Byte checks for Switch-era (Gen7b+) files. Further refinement & expansion in the future. - - Fixed: Mystery gifts distributed with nicknames no longer flag IsNicknamed as invalid. - Added: Entity editor move dropdown now displays the move's type on the left side. diff --git a/Tests/PKHeX.Core.Tests/PKHeX.Core.Tests.csproj b/Tests/PKHeX.Core.Tests/PKHeX.Core.Tests.csproj index 33cf134f0..239fd4512 100644 --- a/Tests/PKHeX.Core.Tests/PKHeX.Core.Tests.csproj +++ b/Tests/PKHeX.Core.Tests/PKHeX.Core.Tests.csproj @@ -7,9 +7,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive