Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-17 05:48:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Force Japanese language for JP-BU safe language fetch

Browse source
This commit is contained in:
Kurt 2021-01-31 10:19:12 -08:00
parent 4d25214c8d
commit d8e75ee85a
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot.cs
View file

@ -93,7 +93,7 @@ namespace PKHeX.Core
protected virtual void ApplyDetails(ITrainerInfo sav, EncounterCriteria criteria, PKM pk)
{
var version = this.GetCompatibleVersion((GameVersion) sav.Game);
int lang = (int)Language.GetSafeLanguage(Generation, (LanguageID) sav.Language);
int lang = (int)Language.GetSafeLanguage(Generation, (LanguageID) sav.Language, version);
int level = LevelMin;
pk.Species = Species;
pk.Language = lang;

4
PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic.cs
View file

@ -62,9 +62,9 @@ namespace PKHeX.Core
pk.Species = Species;
pk.Form = Form;
int lang = (int)Language.GetSafeLanguage(Generation, (LanguageID)sav.Language);
int level = GetMinimalLevel();
var version = this.GetCompatibleVersion((GameVersion)sav.Game);
int lang = (int)Language.GetSafeLanguage(Generation, (LanguageID)sav.Language, version);
int level = GetMinimalLevel();
pk.Version = (int)version;
pk.Language = lang = GetEdgeCaseLanguage(pk, lang);

2
PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTrade.cs
View file

@ -90,7 +90,7 @@ namespace PKHeX.Core
protected virtual void ApplyDetails(ITrainerInfo sav, EncounterCriteria criteria, PKM pk)
{
var version = this.GetCompatibleVersion((GameVersion)sav.Game);
int lang = (int)Language.GetSafeLanguage(Generation, (LanguageID)sav.Language);
int lang = (int)Language.GetSafeLanguage(Generation, (LanguageID)sav.Language, version);
int level = CurrentLevel > 0 ? CurrentLevel : LevelMin;
if (level == 0)
level = Math.Max(1, LevelMin);

1
PKHeX.Core/PKM/Util/Language.cs
View file

@ -35,6 +35,7 @@ namespace PKHeX.Core
public static LanguageID GetSafeLanguage(int generation, LanguageID prefer, GameVersion game = GameVersion.Any) => generation switch
{
1 when game == GameVersion.BU => Japanese,
1 or 2 => Languages_GB.Contains((int)prefer) && (prefer != Korean || game == GameVersion.C) ? prefer : SafeLanguage,
3 => Languages_3 .Contains((int)prefer) ? prefer : SafeLanguage,
4 or 5 or 6 => Languages_46.Contains((int)prefer) ? prefer : SafeLanguage,