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 0b187427..6e5bc2aa 100644 Binary files a/GlobalTerminalService/cert.pfx and b/GlobalTerminalService/cert.pfx differ 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; }