From 9408255bee4e1f9677c9b76cd882ee97c2960d68 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 6 Feb 2018 23:09:00 -0800 Subject: [PATCH] Add other international (non english) gen2 tradeOTs --- .../Legality/Encounters/Data/Encounters2.cs | 22 ++++++++----------- .../Legality/Encounters/EncounterGenerator.cs | 11 ++++++++-- PKHeX.Core/PKHeX.Core.csproj | 14 ++++++++++++ .../Resources/text/de/text_tradegsc_de.txt | 22 +++++++++++++++++++ .../Resources/text/en/text_tradegsc_en.txt | 22 +++++++++++++++++++ .../Resources/text/es/text_tradegsc_es.txt | 22 +++++++++++++++++++ .../Resources/text/fr/text_tradegsc_fr.txt | 22 +++++++++++++++++++ .../Resources/text/it/text_tradegsc_it.txt | 22 +++++++++++++++++++ .../Resources/text/ja/text_tradegsc_ja.txt | 22 +++++++++++++++++++ .../Resources/text/ko/text_tradegsc_ko.txt | 22 +++++++++++++++++++ 10 files changed, 186 insertions(+), 15 deletions(-) create mode 100644 PKHeX.Core/Resources/text/de/text_tradegsc_de.txt create mode 100644 PKHeX.Core/Resources/text/en/text_tradegsc_en.txt create mode 100644 PKHeX.Core/Resources/text/es/text_tradegsc_es.txt create mode 100644 PKHeX.Core/Resources/text/fr/text_tradegsc_fr.txt create mode 100644 PKHeX.Core/Resources/text/it/text_tradegsc_it.txt create mode 100644 PKHeX.Core/Resources/text/ja/text_tradegsc_ja.txt create mode 100644 PKHeX.Core/Resources/text/ko/text_tradegsc_ko.txt diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters2.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters2.cs index 366c224b4..5b65aa24e 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters2.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters2.cs @@ -256,19 +256,15 @@ private static EncounterArea[] GetSlots_C(EncounterArea[] f) }; internal static readonly string[][] TradeGift_GSC_OTs = { - new[] { "コンタ", "KYLE" }, - new[] { "ナオキ", "MIKE" }, - new[] { "ゲン", "TIM" }, - new[] { "ミサコ", "EMY" }, - new[] { "キヨミ", "KIM" }, - new[] { "デンジ", "CHRIS" }, - - new[] { "ミサコ", "EMY" }, - new[] { "デンジ", "CHRIS" }, - new[] { "モリオ", "FOREST" }, - - new[] { "マニア", "MANIA" }, - new[] { "ユウジ", "RANDY" }, + new string[0], // 0 - None + Util.GetStringList("tradegsc", "ja"), // 1 + Util.GetStringList("tradegsc", "en"), // 2 + Util.GetStringList("tradegsc", "fr"), // 3 + Util.GetStringList("tradegsc", "it"), // 4 + Util.GetStringList("tradegsc", "de"), // 5 + new string[0], // 6 - None + Util.GetStringList("tradegsc", "es"), // 7 + Util.GetStringList("tradegsc", "ko"), // 8 }; } } diff --git a/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs b/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs index 61bbe0492..f457878d5 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs @@ -907,8 +907,15 @@ private static IEnumerable GetValidEncounterTradesVC2(PKM pkm, D continue; int index = Array.IndexOf(Encounters2.TradeGift_GSC, z); - int lang = pkm.Japanese ? 0 : 1; - if (Encounters2.TradeGift_GSC_OTs[index][lang] != pkm.OT_Name) + int otIndex = Encounters2.TradeGift_GSC.Length + index; + bool valid; + if (pkm.Japanese) + valid = Encounters2.TradeGift_GSC_OTs[(int)LanguageID.Japanese][otIndex] == pkm.OT_Name; + else if (pkm.Korean) + valid = Encounters2.TradeGift_GSC_OTs[(int)LanguageID.Korean][otIndex] == pkm.OT_Name; + else + valid = Array.FindIndex(Encounters2.TradeGift_GSC_OTs, 2, 6, arr => arr.Length > index && arr[otIndex] == pkm.OT_Name) >= 0; + if (!valid) continue; yield return z; diff --git a/PKHeX.Core/PKHeX.Core.csproj b/PKHeX.Core/PKHeX.Core.csproj index c9585c4c1..e03af9e8b 100644 --- a/PKHeX.Core/PKHeX.Core.csproj +++ b/PKHeX.Core/PKHeX.Core.csproj @@ -144,6 +144,7 @@ + @@ -190,6 +191,7 @@ + @@ -236,6 +238,7 @@ + @@ -282,6 +285,7 @@ + @@ -351,6 +355,7 @@ + @@ -396,6 +401,7 @@ + @@ -441,6 +447,7 @@ + @@ -824,6 +831,7 @@ + @@ -870,6 +878,7 @@ + @@ -916,6 +925,7 @@ + @@ -962,6 +972,7 @@ + @@ -1031,6 +1042,7 @@ + @@ -1076,6 +1088,7 @@ + @@ -1121,6 +1134,7 @@ + diff --git a/PKHeX.Core/Resources/text/de/text_tradegsc_de.txt b/PKHeX.Core/Resources/text/de/text_tradegsc_de.txt new file mode 100644 index 000000000..972964df0 --- /dev/null +++ b/PKHeX.Core/Resources/text/de/text_tradegsc_de.txt @@ -0,0 +1,22 @@ +AARON +HERAKLES +KUGO +HORLIK +AEROY +HÜHOTTI +DORI +AVIO +LORETTA +HABSI +MODRI +TOBI +RALF +TIM +CARMEN +KIM +PAUL +CARMEN +PAUL +WALDO +HARALD +GABRIELE \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_tradegsc_en.txt b/PKHeX.Core/Resources/text/en/text_tradegsc_en.txt new file mode 100644 index 000000000..f9070f591 --- /dev/null +++ b/PKHeX.Core/Resources/text/en/text_tradegsc_en.txt @@ -0,0 +1,22 @@ +ROCKY +MUSCLE +VOLTY +DON +AEROY +RUNNY +DORIS +PAUL +MAGGIE +KENYA +SHUCKIE +KYLE +MIKE +TIM +EMY +KIM +CHRIS +EMY +CHRIS +FOREST +RANDY +MANIA \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_tradegsc_es.txt b/PKHeX.Core/Resources/text/es/text_tradegsc_es.txt new file mode 100644 index 000000000..bed9cfe78 --- /dev/null +++ b/PKHeX.Core/Resources/text/es/text_tradegsc_es.txt @@ -0,0 +1,22 @@ +ROCKY +CACHAS +VOLTI +RINO +NORMA +RAPID +VIDRI +OMA +TATO +ESPI +SHUCKI +KEVIN +MIKI +FALCÁN +EMY +NORMA +GABI +EMY +GABI +GREPPI +LUCAS +MANÍA \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_tradegsc_fr.txt b/PKHeX.Core/Resources/text/fr/text_tradegsc_fr.txt new file mode 100644 index 000000000..268be5d6d --- /dev/null +++ b/PKHeX.Core/Resources/text/fr/text_tradegsc_fr.txt @@ -0,0 +1,22 @@ +ROCKY +MUSCLE +VOLTY +RIRI +AERO +SPEEDY +DODODO +QUETZACOA +TRIPHASE +ALFRED +NESSY +OLIVE +LUC +URBAIN +MIMI +KIM +AMEDEE +MIMI +AMEDEE +SYLVAIN +BOBBY +MANIA \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_tradegsc_it.txt b/PKHeX.Core/Resources/text/it/text_tradegsc_it.txt new file mode 100644 index 000000000..7dc8db0f2 --- /dev/null +++ b/PKHeX.Core/Resources/text/it/text_tradegsc_it.txt @@ -0,0 +1,22 @@ +NIXY +MACHY +VOLTY +DON +DACTY +DASHY +DORIS +PAUL +MAGGIE +SPEAPI +SHUCKI +GIBI +MIKI +TEO +EMI +MANU +CRI +EMI +CRI +FOREST +RANDY +MATTIA \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_tradegsc_ja.txt b/PKHeX.Core/Resources/text/ja/text_tradegsc_ja.txt new file mode 100644 index 000000000..ed4e31bdd --- /dev/null +++ b/PKHeX.Core/Resources/text/ja/text_tradegsc_ja.txt @@ -0,0 +1,22 @@ +ブルブル +きんにく +ビリー +ドンドコ +プッチー +カケアシ +ドリス +ポール +てつまる +ひきゃく +ネッシー +コンタ +ナオキ +ゲン +ミサコ +キヨミ +デンジ +ミサコ +デンジ +モリオ +ユウジ +マニア \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_tradegsc_ko.txt b/PKHeX.Core/Resources/text/ko/text_tradegsc_ko.txt new file mode 100644 index 000000000..36e8d61f2 --- /dev/null +++ b/PKHeX.Core/Resources/text/ko/text_tradegsc_ko.txt @@ -0,0 +1,22 @@ +덜덜이 +근육 +찌릭 +동동이 +파치 +장달이 + + + +심부름꾼 +네이시 +수빈 +청수 +중수 +미사 +정숙 +정진 + + + +유지 +매니아 \ No newline at end of file