Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-24 14:14:16 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add other international (non english) gen2 tradeOTs

Browse Source
This commit is contained in:
Kurt
2018-02-06 23:09:00 -08:00
parent af0e05f6af
commit 9408255bee
10 changed files with 186 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
PKHeX.Core/Legality/Encounters/Data/Encounters2.cs
View File

@@ -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
};
}
}

11
PKHeX.Core/Legality/Encounters/EncounterGenerator.cs
View File

@@ -907,8 +907,15 @@ private static IEnumerable<EncounterTrade> 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;

14
PKHeX.Core/PKHeX.Core.csproj
View File

@@ -144,6 +144,7 @@
<None Remove="Resources\text\de\text_tradebw_de.txt" />
<None Remove="Resources\text\de\text_tradedppt_de.txt" />
<None Remove="Resources\text\de\text_tradefrlg_de.txt" />
<None Remove="Resources\text\de\text_tradegsc_de.txt" />
<None Remove="Resources\text\de\text_tradehgss_de.txt" />
<None Remove="Resources\text\de\text_traderse_de.txt" />
<None Remove="Resources\text\de\text_tradesm_de.txt" />
@@ -190,6 +191,7 @@
<None Remove="Resources\text\en\text_tradebw_en.txt" />
<None Remove="Resources\text\en\text_tradedppt_en.txt" />
<None Remove="Resources\text\en\text_tradefrlg_en.txt" />
<None Remove="Resources\text\en\text_tradegsc_en.txt" />
<None Remove="Resources\text\en\text_tradehgss_en.txt" />
<None Remove="Resources\text\en\text_traderse_en.txt" />
<None Remove="Resources\text\en\text_tradesm_en.txt" />
@@ -236,6 +238,7 @@
<None Remove="Resources\text\es\text_tradebw_es.txt" />
<None Remove="Resources\text\es\text_tradedppt_es.txt" />
<None Remove="Resources\text\es\text_tradefrlg_es.txt" />
<None Remove="Resources\text\es\text_tradegsc_es.txt" />
<None Remove="Resources\text\es\text_tradehgss_es.txt" />
<None Remove="Resources\text\es\text_traderse_es.txt" />
<None Remove="Resources\text\es\text_tradesm_es.txt" />
@@ -282,6 +285,7 @@
<None Remove="Resources\text\fr\text_tradebw_fr.txt" />
<None Remove="Resources\text\fr\text_tradedppt_fr.txt" />
<None Remove="Resources\text\fr\text_tradefrlg_fr.txt" />
<None Remove="Resources\text\fr\text_tradegsc_fr.txt" />
<None Remove="Resources\text\fr\text_tradehgss_fr.txt" />
<None Remove="Resources\text\fr\text_traderse_fr.txt" />
<None Remove="Resources\text\fr\text_tradesm_fr.txt" />
@@ -351,6 +355,7 @@
<None Remove="Resources\text\it\text_tradebw_it.txt" />
<None Remove="Resources\text\it\text_tradedppt_it.txt" />
<None Remove="Resources\text\it\text_tradefrlg_it.txt" />
<None Remove="Resources\text\it\text_tradegsc_it.txt" />
<None Remove="Resources\text\it\text_tradehgss_it.txt" />
<None Remove="Resources\text\it\text_traderse_it.txt" />
<None Remove="Resources\text\it\text_tradesm_it.txt" />
@@ -396,6 +401,7 @@
<None Remove="Resources\text\ja\text_tradebw_ja.txt" />
<None Remove="Resources\text\ja\text_tradedppt_ja.txt" />
<None Remove="Resources\text\ja\text_tradefrlg_ja.txt" />
<None Remove="Resources\text\ja\text_tradegsc_ja.txt" />
<None Remove="Resources\text\ja\text_tradehgss_ja.txt" />
<None Remove="Resources\text\ja\text_traderse_ja.txt" />
<None Remove="Resources\text\ja\text_tradesm_ja.txt" />
@@ -441,6 +447,7 @@
<None Remove="Resources\text\ko\text_tradeb2w2_ko.txt" />
<None Remove="Resources\text\ko\text_tradebw_ko.txt" />
<None Remove="Resources\text\ko\text_tradedppt_ko.txt" />
<None Remove="Resources\text\ko\text_tradegsc_ko.txt" />
<None Remove="Resources\text\ko\text_tradehgss_ko.txt" />
<None Remove="Resources\text\ko\text_tradesm_ko.txt" />
<None Remove="Resources\text\ko\text_tradeusum_ko.txt" />
@@ -824,6 +831,7 @@
<EmbeddedResource Include="Resources\text\de\text_tradebw_de.txt" />
<EmbeddedResource Include="Resources\text\de\text_tradedppt_de.txt" />
<EmbeddedResource Include="Resources\text\de\text_tradefrlg_de.txt" />
<EmbeddedResource Include="Resources\text\de\text_tradegsc_de.txt" />
<EmbeddedResource Include="Resources\text\de\text_tradehgss_de.txt" />
<EmbeddedResource Include="Resources\text\de\text_traderse_de.txt" />
<EmbeddedResource Include="Resources\text\de\text_tradesm_de.txt" />
@@ -870,6 +878,7 @@
<EmbeddedResource Include="Resources\text\en\text_tradebw_en.txt" />
<EmbeddedResource Include="Resources\text\en\text_tradedppt_en.txt" />
<EmbeddedResource Include="Resources\text\en\text_tradefrlg_en.txt" />
<EmbeddedResource Include="Resources\text\en\text_tradegsc_en.txt" />
<EmbeddedResource Include="Resources\text\en\text_tradehgss_en.txt" />
<EmbeddedResource Include="Resources\text\en\text_traderse_en.txt" />
<EmbeddedResource Include="Resources\text\en\text_tradesm_en.txt" />
@@ -916,6 +925,7 @@
<EmbeddedResource Include="Resources\text\es\text_tradebw_es.txt" />
<EmbeddedResource Include="Resources\text\es\text_tradedppt_es.txt" />
<EmbeddedResource Include="Resources\text\es\text_tradefrlg_es.txt" />
<EmbeddedResource Include="Resources\text\es\text_tradegsc_es.txt" />
<EmbeddedResource Include="Resources\text\es\text_tradehgss_es.txt" />
<EmbeddedResource Include="Resources\text\es\text_traderse_es.txt" />
<EmbeddedResource Include="Resources\text\es\text_tradesm_es.txt" />
@@ -962,6 +972,7 @@
<EmbeddedResource Include="Resources\text\fr\text_tradebw_fr.txt" />
<EmbeddedResource Include="Resources\text\fr\text_tradedppt_fr.txt" />
<EmbeddedResource Include="Resources\text\fr\text_tradefrlg_fr.txt" />
<EmbeddedResource Include="Resources\text\fr\text_tradegsc_fr.txt" />
<EmbeddedResource Include="Resources\text\fr\text_tradehgss_fr.txt" />
<EmbeddedResource Include="Resources\text\fr\text_traderse_fr.txt" />
<EmbeddedResource Include="Resources\text\fr\text_tradesm_fr.txt" />
@@ -1031,6 +1042,7 @@
<EmbeddedResource Include="Resources\text\it\text_tradebw_it.txt" />
<EmbeddedResource Include="Resources\text\it\text_tradedppt_it.txt" />
<EmbeddedResource Include="Resources\text\it\text_tradefrlg_it.txt" />
<EmbeddedResource Include="Resources\text\it\text_tradegsc_it.txt" />
<EmbeddedResource Include="Resources\text\it\text_tradehgss_it.txt" />
<EmbeddedResource Include="Resources\text\it\text_traderse_it.txt" />
<EmbeddedResource Include="Resources\text\it\text_tradesm_it.txt" />
@@ -1076,6 +1088,7 @@
<EmbeddedResource Include="Resources\text\ja\text_tradebw_ja.txt" />
<EmbeddedResource Include="Resources\text\ja\text_tradedppt_ja.txt" />
<EmbeddedResource Include="Resources\text\ja\text_tradefrlg_ja.txt" />
<EmbeddedResource Include="Resources\text\ja\text_tradegsc_ja.txt" />
<EmbeddedResource Include="Resources\text\ja\text_tradehgss_ja.txt" />
<EmbeddedResource Include="Resources\text\ja\text_traderse_ja.txt" />
<EmbeddedResource Include="Resources\text\ja\text_tradesm_ja.txt" />
@@ -1121,6 +1134,7 @@
<EmbeddedResource Include="Resources\text\ko\text_tradeb2w2_ko.txt" />
<EmbeddedResource Include="Resources\text\ko\text_tradebw_ko.txt" />
<EmbeddedResource Include="Resources\text\ko\text_tradedppt_ko.txt" />
<EmbeddedResource Include="Resources\text\ko\text_tradegsc_ko.txt" />
<EmbeddedResource Include="Resources\text\ko\text_tradehgss_ko.txt" />
<EmbeddedResource Include="Resources\text\ko\text_tradesm_ko.txt" />
<EmbeddedResource Include="Resources\text\ko\text_tradeusum_ko.txt" />

22
PKHeX.Core/Resources/text/de/text_tradegsc_de.txt Normal file
View File

@@ -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

22
PKHeX.Core/Resources/text/en/text_tradegsc_en.txt Normal file
View File

@@ -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

22
PKHeX.Core/Resources/text/es/text_tradegsc_es.txt Normal file
View File

@@ -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

22
PKHeX.Core/Resources/text/fr/text_tradegsc_fr.txt Normal file
View File

@@ -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

22
PKHeX.Core/Resources/text/it/text_tradegsc_it.txt Normal file
View File

@@ -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

22
PKHeX.Core/Resources/text/ja/text_tradegsc_ja.txt Normal file
View File

@@ -0,0 +1,22 @@
ブルブル
きんにく
ビリー
ドンドコ
プッチー
カケアシ
ドリス
ポール
てつまる
ひきゃく
ネッシー
コンタ
ナオキ
ゲン
ミサコ
キヨミ
デンジ
ミサコ
デンジ
モリオ
ユウジ
マニア

22
PKHeX.Core/Resources/text/ko/text_tradegsc_ko.txt Normal file
View File

@@ -0,0 +1,22 @@
덜덜이
근육
찌릭
동동이
파치
장달이
심부름꾼
네이시
수빈
청수
중수
미사
정숙
정진
유지
매니아