From b0e672a7fce461e529e3f8327c9d683f3777ed20 Mon Sep 17 00:00:00 2001 From: Greg Edwards Date: Tue, 21 Sep 2021 19:48:11 -0400 Subject: [PATCH] Fixes --- GlobalTerminalService/GTServerBase.cs | 3 +++ GlobalTerminalService/cert.pfx | Bin 2571 -> 2513 bytes gts/src/FakeOpponentGenerator4.cs | 10 +++++----- gts/syachi2ds.ashx.cs | 2 +- library/Structures/StatValuesBase.cs | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/GlobalTerminalService/GTServerBase.cs b/GlobalTerminalService/GTServerBase.cs index 87f14929..6c2dd87d 100644 --- a/GlobalTerminalService/GTServerBase.cs +++ b/GlobalTerminalService/GTServerBase.cs @@ -55,6 +55,9 @@ namespace PkmnFoundations.GlobalTerminalService store.Open(OpenFlags.ReadOnly); X509Certificate2Collection cers = store.Certificates.Find(X509FindType.FindBySubjectName, "pkgdsprod.nintendo.co.jp", false); + // fixme: Screen any found certificates for errors like "The + // credentials supplied to the package were not recognized" and use + // the dummy if none are good. if (cers.Count > 0) return cers[0]; diff --git a/GlobalTerminalService/cert.pfx b/GlobalTerminalService/cert.pfx index 0b187427651f7cdb210cd799a15459750cc17791..6e5bc2aa55f5e0bffcebcacff30d7dbabdb1b7c9 100644 GIT binary patch delta 2374 zcmV-M3Ay%*6wwoZFoFrq0s#Xsf(eNR2`Yw2hW8Bt2LYgh33>#A33f1o334!k1=|J* zDuzgg_YDCD0ic2f%mji3$S{Hh#4v&dzy=E{hDe6@4FL=a0Ro_c1pY9B1o|)>1_~;M zNQU`|zM75cj z@OIXq4H1?6*gMFnxT3~qi_qdL@j?E=l$ph;vOp(-J?r{J`;3S=Y>&M<5q88nl{uhYh$OceAiIww{{X53z+T*Bhv`KC^4 z@}lgOn{tW>Ig$g+b#V)Utj;hR#R2(xxXE-dUEuPSU<4I0WN_~%S}t}yv1>)pj<-4=##F6o`jvb(Y7gg5YFM$EVzo>4;RklPl*Y4$smt2MyIIeSo4rGT2L=wKOqIOQ3qw+VHF1(p^-uwG|6$t@Co{u@^?rM(!(4k*0)DW+FVsP4H$}KN{Tm8no_z zixq$CQLX_^hOndtG0L0yP-|=>RgJ;{K&*vrX;&`T1uy^9|MiP#;pENFZK!7(QND3& zfxxTZ%4Z7(9axMuNm@HjlGc2ICo?@HJ9bpetR>Tzh>;8(qY4R?Vjw!SnhX%I!2TDS z9eMw%y*i0nlMLqT7WuWvS#1{^%^&!GeffBIv^?;5k%`!IKPDxTwgG0!=nfnTB(VHY zgZ0~1OvAn?pGGd9YTwmYEiE*wlbcYE_QHl39AqZ!vb!bEvZN8MV(J~He)wT%RHPhe z@GIA;_?2{?y}4q%X&y%f7+N@Hf1@1}aT@9`R17Jk*)~A80HKRshQZ%oXsW({M4##8 z0E?^hrZRY@nW%;bp$Ih4!!R(O_R_0=Nx5)F)Q%7o$nQ72w_JXj~dfmRaBn03?rjA{LqGJRmuRdb`oF%e8? zPwjDPL5Xe--GQ@?3GlP1f9s5Yom-D!rjhPyzTkNy)*+0u|Es}sanVV&3+y)043ichlb8 z0D6IRr*gH^BosQ9vjb)kOWRPrGT=wA%?_YJmiy(33&TvStl~@RZG7Zi`vLpKtxf?I zdl&Wjrh@Rp=CL-tbsc~mSQ~yXPQp8(2#0kv@ORim5n<%Vqe2Yz{aXVjYoYBr8h|ps zHbqR~CJQBs8mTI7a(=sW%iNy!fb?k*q=}8T1Hv(Zu9HgzB_16H2`Yw2hW8Bt2^299 z9u5Fg07U>y07d{)08;==lgI^b8;=GFDuzgg_YDCD2B3lifG~msd;$RgFoFYhlTij8 ze}9-n;ic~{K>`8?(13yiNWZbQTf%}1N?z42Hx(1L{T2km!-KjBd1Bol(%zSmD&kX} zt$H;m5yD0?6Gp7-i@u9C(=$el4KY?z0eQ?Uzuo*1hh?(QOk zXcX{Qx*gG}?vQM?RH|Y;*+*<^-IOF=1One#X$JNZOJ~-kVJd|+KK@F@x)6ZKe`uin z&_cEDV&M<&Kt$4$5g7!u^m>_;Q>R=dvQ74^6rX)AzcZdEIm)G;Sk$rbky5 zhc3w{bCe@&LN!qs21Fyf$Z3lCf3F>&>cK3;MD8jikjO}Ot3N*5Y8hCyCcaf{@_M#` zSCo)MW_rpI1g6;AH|>mRnAs9CMOJ8nPO5=WYXBdrxa*5Sq*$!}7mriERaB}WtR2&m z+WRmq*BwEdNu$3=17BpYmUg+3J|O4r@>Lv`S6xPpEgGn%gnbvJoPRo)e^_vh#?ZJ_ zYb=SgKFHUA?M#WwT*6IqCkc{1`LHRI3kuaUBhP@9=dfDavs^}UJsp^{7(_X*|e`)BW<|+8`B^iYP9Ha9T)&5&68k^zaNtnz1IA!vTD-!d+ zK7u#h%=eZQ+8k_Oc(`J0d|Am6ubajCCIR7LcfBsu=;@94078+$-k5~ne?CU#Tm*KPvtF&8 zPqr9^8$bqwB98%W*>>T>zbxS9kYmlc6$T(Metq5dgWIZW(9)|F5QY$2;CwG}2T%5L z5>|m;1yFV{_1YNeEF?c2mBHPhixIa|RP^$3M;SXXJ1`$G2L=Tz4g&%j1QZePRouP_ s;9>5(dN0c+@lkGB98Pcq6gs6W+WOv;Y7A delta 2432 zcmY*Zc{J1u8=e`nTFbtUeWwOlritN3i7<++*%@h?EZMs1H;tHNZR{Z=S9N6%DP&LA zU{ID&5<<2ivVU{$`M!J3cb@Z}_c_n|KF@#e%M^$g1Ta)i1O&{1p`zO0D79Gg*exC~ z0$e~v)j+AJ3btH|p~89oZv;DlQeit7Dr}QoEI8MHUEG{tNC6ef7NIPRB%JeqGCQ0X zitJ5Mop2qe@<1Snekc{%59v4#H#}Vez~)@U)lrl8xFb4NFMc<<@d1NmSj~Jm6<4w) zp_m7q0qwh&1u#^OG%GnBJTflSuh99WD*cABen$~F{qsjt5Pd)RblqOw3DxNX!ZrL| zZsv6Qgcufg{em&pPW^S{wxb^K2lGa&)mtXZ4Poq!6W*^pWH==MuG9OB*(OE=q9d_4 zp3wJFdvFbLV`vdpv&OC6&H9L-V_OzXWbTuQ5vAX)I4)@R<^9YMdhRdYgzQ}-X;096 zycwtX-Yef#)@jrffBk5r3R=ST#FhfRR?LFnv;D@*J`b(aU%IjuS3GM^ ziYR}~p*eC~WJku3Y4?3$+Jg!M+zwVNgtt6ocll>-#GuEz-bkH!ZIrBQTJ|SVX$%5! zu4#A58kcZ6n3klI;wq4guqavgB`_cVB)He1mfk#<^3+x>aBt^`$3m-cqG)8Vh>_i} zvygz4bLgObHKS;VIw-(`f99f5guix2E4smt`UGrb+H%kG%g!fGrGEtYbDs-z3|iTB zc0;o58sC|i5$w|Mmlvf8-WWRcN*6iSrWppD6e-?O2%8Fe_zG;$FC@_UdjH8!&|g`I zTYVZ9v@V&EQK7oSePxl;CWO);+YcR54XpEFde9APzwuw9ux>yiQU=bE&a5rp{pz|> zd^i%ixH1o{X)9Qsj8+BU$(J1Sq>mKlz531M*ErU?jGtNVN-)2#j#sL;FLVgE(>F#h zh3}4qUHg(V@raZv)(~tNC@#5N?@sz2SFU6-Sz3Am#QWUj{ee2;FWniYocyxs(!T7w zS9uYYZG&d9@A6K$*bt56XH@zHGYLTYq)&CKR`pjJeP~`Cx#tUnW!tWAY#O?^P>6~v zyccr`2URD#k%2fPJv{Zc zeK-7>E1fy6PR~mmAlph%f07{b)nwaXY*~F^$T7<@>99Gac(+)RED&5_5aH$Nvv zSUR@J3^*Ti0ba9KTD?hfh3&^Cgyl2h61ovdBlC96+kD+(qBWK<(F)Uk+{WbXwyQ42 z69u&8C~lQ=Rji))WS-{4EZMlhIiJZZmOaF0$L%wXH+}smU-LW9c6vOnCF-OtI%lkR ze2uD%ZBY+2?yNrd{yd}na$Rcig%~%UDz82Jo(f_hU5buedl68)8FKsSoLSKQ*q*2H zzZ0ZYAjbFV*0kIJ<;|Yyvr8A`o09 z=6q>uY2CbFR3%qY^$HDV&^v`)GKhbDj3xq@|nhS zzpf*;3Za`EB)v*{I4PV-;Ui!20uPfZ_kL8;xVrEA--c8x(;f;GIhdL~wSMBN@pSIA z=1>CpQn4l^hjR7cOh9Ij2dAX)^bUi}uu;|i4b>-u6O*E2I}U&5i2ee9P65g|>tiS) zd6R#I8k`wXt^o1XS~J&sCgjq-%NMPz8&Okko@FJBu)aKyh*}$j8aZ39_5~>1K9?cp z7ZOr@5q{ZELef)CfrCIT-zr%RZKPz6X>$KizHPzQyWJpcavRHK zd~+6L+ObQLUwKI~ojvzPrV?&Fr$(4hmA-t<;Dxm15E=MX6vF5N0*aO-=ZPoghBozS zxZh?c6gQlV(vvQIG7s7mUUX=OtMQQr(;RUNQ3=SiWLBL_^yc`g5s9=UK*wFEc s&pX~w1-z%#g(HJBtB5YBAhAI*q8iO}aNJB4nXi)SkJ?>7_V-=>2mPgYQvd(} diff --git a/gts/src/FakeOpponentGenerator4.cs b/gts/src/FakeOpponentGenerator4.cs index 50b45acc..7f9acbaa 100644 --- a/gts/src/FakeOpponentGenerator4.cs +++ b/gts/src/FakeOpponentGenerator4.cs @@ -219,7 +219,7 @@ namespace PkmnFoundations.GTS 104, // Double team 329 // Sheer cold }, - 5, 5, // Bold + 5, 5, // Bold, shiny BattleTowerPokemon4.PackIVs(31, 10, 20, 31, 10, 31), new byte[] { 252, 0, 0, 252, 0, 6 }, 0, Languages.English, 47, // Thick fat @@ -249,7 +249,7 @@ namespace PkmnFoundations.GTS 89, // EQ 444 // Stone edge }, - 13, 13, // Jolly + 13, 13, // Jolly, shiny BattleTowerPokemon4.PackIVs(31, 31, 20, 31, 10, 20), new byte[] { 6, 252, 0, 252, 0, 0 }, 0, Languages.English, 45, // Sand stream @@ -346,7 +346,7 @@ namespace PkmnFoundations.GTS 8, // Ice punch 67 // Low kick }, - 13, 13, // Jolly + 13, 13, // Jolly, shiny BattleTowerPokemon4.PackIVs(31, 31, 20, 31, 10, 20), new byte[] { 40, 252, 0, 218, 0, 0 }, 0, Languages.English, 46, // Pressure @@ -376,7 +376,7 @@ namespace PkmnFoundations.GTS 95, // Hypnosis 153 // Explosion }, - 22, 22, // Sassy + 22, 22, // Sassy, shiny BattleTowerPokemon4.PackIVs(31, 20, 31, 0, 10, 20), new byte[] { 252, 0, 252, 0, 0, 6 }, 0, Languages.English, 26, // Levitate @@ -438,7 +438,7 @@ namespace PkmnFoundations.GTS 411, // Focus blast 324 // Signal beam }, - 15, 15, // Modest + 15, 15, // Modest, shiny BattleTowerPokemon4.PackIVs(31, 10, 20, 31, 31, 20), new byte[] { 6, 0, 0, 252, 252, 6 }, 0, Languages.English, 39, // Inner focus diff --git a/gts/syachi2ds.ashx.cs b/gts/syachi2ds.ashx.cs index 8eb93857..a5794b81 100644 --- a/gts/syachi2ds.ashx.cs +++ b/gts/syachi2ds.ashx.cs @@ -520,7 +520,7 @@ namespace PkmnFoundations.GTS byte[] fakeLeader = new BattleSubwayProfile5 ( new EncodedString5("-----", 16), - Versions.Platinum, Languages.English, + Versions.White, Languages.English, 0, 0, 0x00000000, new TrendyPhrase5(0, 20, 0, 0), 0, 0 ).Save(); diff --git a/library/Structures/StatValuesBase.cs b/library/Structures/StatValuesBase.cs index 1b7cf45f..54a25670 100644 --- a/library/Structures/StatValuesBase.cs +++ b/library/Structures/StatValuesBase.cs @@ -10,9 +10,9 @@ namespace PkmnFoundations.Structures protected StatValuesBase(IEnumerable s) { // fail without enumerating if possible - if (s is IList && ((IList)s).Count != 6) throw new ArgumentException("s must have exactly 6 elements.", "s"); + if (s is IList && ((IList)s).Count != 6) throw new ArgumentException("Collection must have exactly 6 elements.", "s"); var arr = s.ToArray(); - if (arr.Length != 6) throw new ArgumentException("s must have exactly 6 elements.", "s"); + if (arr.Length != 6) throw new ArgumentException("Collection must have exactly 6 elements.", "s"); Stats = arr; }