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

More switch expressions

Browse source
This commit is contained in:
Kurt 2020-12-24 17:12:08 -08:00
parent 4d0108331a
commit 95e3337f2c
10 changed files with 143 additions and 240 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
PKHeX.Core/Legality/Encounters/Information/EncounterSuggestion.cs
View file

@ -2,6 +2,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using static PKHeX.Core.GameVersion;
namespace PKHeX.Core namespace PKHeX.Core
{ {
/// <summary> /// <summary>
@ -53,19 +55,13 @@ namespace PKHeX.Core
public static int GetSuggestedEncounterEggLocationEgg(int generation, bool traded = false) public static int GetSuggestedEncounterEggLocationEgg(int generation, bool traded = false)
{ {
switch (generation) return generation switch
{ {
case 1: 1 or 2 or 3 => 0,
case 2: 4 => traded ? Locations.LinkTrade4 : Locations.Daycare4,
case 3: 5 => traded ? Locations.LinkTrade5 : Locations.Daycare5,
return 0; _ => traded ? Locations.LinkTrade6 : Locations.Daycare5,
case 4: };
return traded ? Locations.LinkTrade4 : Locations.Daycare4;
case 5:
return traded ? Locations.LinkTrade5 : Locations.Daycare5;
default:
return traded ? Locations.LinkTrade6 : Locations.Daycare5;
}
} }
private static EncounterSuggestionData GetSuggestedEncounterWild(PKM pkm, EncounterSlot first, int loc = -1) private static EncounterSuggestionData GetSuggestedEncounterWild(PKM pkm, EncounterSlot first, int loc = -1)
@ -87,59 +83,31 @@ namespace PKHeX.Core
public static int GetSuggestedEggMetLocation(PKM pkm) public static int GetSuggestedEggMetLocation(PKM pkm)
{ {
// Return one of legal hatch locations for game // Return one of legal hatch locations for game
switch ((GameVersion)pkm.Version) return ((GameVersion)pkm.Version) switch
{ {
case GameVersion.R: R or S or E or FR or LG => pkm.Format switch
case GameVersion.S: {
case GameVersion.E: 3 => (pkm.FRLG ? Locations.HatchLocationFRLG : Locations.HatchLocationRSE),
case GameVersion.FR: 4 => Locations.Transfer3, // Pal Park
case GameVersion.LG: _ => Locations.Transfer4,
return pkm.Format switch },
{
3 => (pkm.FRLG ? Locations.HatchLocationFRLG : Locations.HatchLocationRSE),
4 => Locations.Transfer3, // Pal Park
_ => Locations.Transfer4,
};
case GameVersion.D: D or P or Pt => pkm.Format > 4 ? Locations.Transfer4 : Locations.HatchLocationDPPt,
case GameVersion.P: HG or SS => pkm.Format > 4 ? Locations.Transfer4 : Locations.HatchLocationHGSS,
case GameVersion.Pt:
return pkm.Format > 4 ? Locations.Transfer4 /* Transporter */ : Locations.HatchLocationDPPt;
case GameVersion.HG:
case GameVersion.SS:
return pkm.Format > 4 ? Locations.Transfer4 /* Transporter */ : Locations.HatchLocationHGSS;
case GameVersion.B: B or W or B2 or W2 => Locations.HatchLocation5,
case GameVersion.W:
case GameVersion.B2:
case GameVersion.W2:
return Locations.HatchLocation5;
case GameVersion.X: X or Y => Locations.HatchLocation6XY,
case GameVersion.Y: AS or OR => Locations.HatchLocation6AO,
return Locations.HatchLocation6XY;
case GameVersion.AS:
case GameVersion.OR:
return Locations.HatchLocation6AO;
case GameVersion.SN: SN or MN or US or UM => Locations.HatchLocation7,
case GameVersion.MN: RD or BU or GN or Y => Locations.Transfer1,
case GameVersion.US: GD or SV or C => Locations.Transfer2,
case GameVersion.UM: GSC or RBY => pkm.Met_Level == 0 ? 0 : Locations.HatchLocationC,
return Locations.HatchLocation7;
case GameVersion.SW: SW or SH => Locations.HatchLocation8,
case GameVersion.SH: _ => -1,
return Locations.HatchLocation8; };
case GameVersion.GD:
case GameVersion.SV:
case GameVersion.C:
case GameVersion.GSC:
case GameVersion.RBY:
return pkm.Format > 2 ? Locations.Transfer2 : pkm.Met_Level == 0 ? 0 : Locations.HatchLocationC;
}
return -1;
} }
/// <summary> /// <summary>
@ -151,7 +119,7 @@ namespace PKHeX.Core
/// </remarks> /// </remarks>
public static int GetSuggestedTransferLocation(PKM pkm) public static int GetSuggestedTransferLocation(PKM pkm)
{ {
if (pkm.Version == (int)GameVersion.GO) if (pkm.Version == (int)GO)
return Locations.GO8; return Locations.GO8;
if (pkm.HasOriginalMetLocation) if (pkm.HasOriginalMetLocation)
return -1; return -1;

16
PKHeX.Core/MysteryGifts/PGF.cs
View file

@ -282,18 +282,12 @@ namespace PKHeX.Core
private int GetAbilityIndex(EncounterCriteria criteria, PersonalInfo pi) private int GetAbilityIndex(EncounterCriteria criteria, PersonalInfo pi)
{ {
switch (AbilityType) return AbilityType switch
{ {
case 00: // 0 - 0 00 or 01 or 02 => AbilityType, // Fixed 0/1/2
case 01: // 1 - 1 03 or 04 => criteria.GetAbilityFromType(AbilityType, pi),// 0/1 or 0/1/H
case 02: // 2 - H _ => throw new ArgumentException(nameof(AbilityType)),
return AbilityType; };
case 03: // 0/1
case 04: // 0/1/H
return criteria.GetAbilityFromType(AbilityType, pi); // 3 or 2
default:
throw new ArgumentException(nameof(AbilityType));
}
} }
private void SetPID(PKM pk, int av) private void SetPID(PKM pk, int av)

16
PKHeX.Core/MysteryGifts/WB7.cs
View file

@ -399,18 +399,12 @@ namespace PKHeX.Core
private int GetAbilityIndex(EncounterCriteria criteria, PersonalInfo pi) private int GetAbilityIndex(EncounterCriteria criteria, PersonalInfo pi)
{ {
switch (AbilityType) return AbilityType switch
{ {
case 00: // 0 - 0 00 or 01 or 02 => AbilityType, // Fixed 0/1/2
case 01: // 1 - 1 03 or 04 => criteria.GetAbilityFromType(AbilityType, pi),// 0/1 or 0/1/H
case 02: // 2 - H _ => throw new ArgumentException(nameof(AbilityType)),
return AbilityType; };
case 03: // 0/1
case 04: // 0/1/H
return criteria.GetAbilityFromType(AbilityType, pi); // 3 or 2
default:
throw new ArgumentException(nameof(AbilityType));
}
} }
private void SetPID(PKM pk) private void SetPID(PKM pk)

16
PKHeX.Core/MysteryGifts/WC6.cs
View file

@ -410,18 +410,12 @@ namespace PKHeX.Core
private int GetAbilityIndex(EncounterCriteria criteria, PersonalInfo pi) private int GetAbilityIndex(EncounterCriteria criteria, PersonalInfo pi)
{ {
switch (AbilityType) return AbilityType switch
{ {
case 00: // 0 - 0 00 or 01 or 02 => AbilityType, // Fixed 0/1/2
case 01: // 1 - 1 03 or 04 => criteria.GetAbilityFromType(AbilityType, pi),// 0/1 or 0/1/H
case 02: // 2 - H _ => throw new ArgumentException(nameof(AbilityType)),
return AbilityType; };
case 03: // 0/1
case 04: // 0/1/H
return criteria.GetAbilityFromType(AbilityType, pi); // 3 or 2
default:
throw new ArgumentException(nameof(AbilityType));
}
} }
private void SetPID(PKM pk) private void SetPID(PKM pk)

16
PKHeX.Core/MysteryGifts/WC7.cs
View file

@ -441,18 +441,12 @@ namespace PKHeX.Core
private int GetAbilityIndex(EncounterCriteria criteria, PersonalInfo pi) private int GetAbilityIndex(EncounterCriteria criteria, PersonalInfo pi)
{ {
switch (AbilityType) return AbilityType switch
{ {
case 00: // 0 - 0 00 or 01 or 02 => AbilityType, // Fixed 0/1/2
case 01: // 1 - 1 03 or 04 => criteria.GetAbilityFromType(AbilityType, pi),// 0/1 or 0/1/H
case 02: // 2 - H _ => throw new ArgumentException(nameof(AbilityType)),
return AbilityType; };
case 03: // 0/1
case 04: // 0/1/H
return criteria.GetAbilityFromType(AbilityType, pi); // 3 or 2
default:
throw new ArgumentException(nameof(AbilityType));
}
} }
private void SetPID(PKM pk) private void SetPID(PKM pk)

47
PKHeX.Core/MysteryGifts/WC8.cs
View file

@ -455,39 +455,32 @@ namespace PKHeX.Core
private int GetAbilityIndex(EncounterCriteria criteria, PersonalInfo pi) private int GetAbilityIndex(EncounterCriteria criteria, PersonalInfo pi)
{ {
switch (AbilityType) return AbilityType switch
{ {
case 00: // 0 - 0 00 or 01 or 02 => AbilityType, // Fixed 0/1/2
case 01: // 1 - 1 03 or 04 => criteria.GetAbilityFromType(AbilityType, pi),// 0/1 or 0/1/H
case 02: // 2 - H _ => throw new ArgumentException(nameof(AbilityType)),
return AbilityType; };
case 03: // 0/1
case 04: // 0/1/H
return criteria.GetAbilityFromType(AbilityType, pi); // 3 or 2
default:
throw new ArgumentException(nameof(AbilityType));
}
} }
private uint GetPID(ITrainerID tr, byte type) private uint GetPID(ITrainerID tr, byte type)
{ {
switch (type) return type switch
{ {
case 0: // Random, Never Shiny 0 => GetAntishiny(tr), // Random, Never Shiny
var pid = Util.Rand32(); 1 => Util.Rand32(), // Random, Any
if (tr.IsShiny(pid, 8)) 2 => (uint) (((tr.TID ^ tr.SID ^ (PID & 0xFFFF) ^ 1) << 16) | (PID & 0xFFFF)), // Fixed, Force Star
return pid ^ 0x1000_0000; 3 => (uint) (((tr.TID ^ tr.SID ^ (PID & 0xFFFF) ^ 0) << 16) | (PID & 0xFFFF)), // Fixed, Force Square
return pid; 4 => PID, // Fixed, Force Value
case 1: // Random, Any _ => throw new ArgumentException()
return Util.Rand32(); };
case 2: // Fixed, Force Star
return (uint) (((tr.TID ^ tr.SID ^ (PID & 0xFFFF) ^ 1) << 16) | (PID & 0xFFFF)); static uint GetAntishiny(ITrainerID tr)
case 3: // Fixed, Force Square {
return (uint) (((tr.TID ^ tr.SID ^ (PID & 0xFFFF) ^ 0) << 16) | (PID & 0xFFFF)); var pid = Util.Rand32();
case 4: // Fixed, Force Value if (tr.IsShiny(pid, 8))
return PID; return pid ^ 0x1000_0000;
default: return pid;
throw new ArgumentException();
} }
} }

34
PKHeX.Core/PKM/Strings/StringConverter.cs
View file

@ -24,16 +24,15 @@ namespace PKHeX.Core
if (isBigEndian) if (isBigEndian)
return generation == 3 ? StringConverter3.GetBEString3(data, offset, count) : StringConverter4.GetBEString4(data, offset, count); return generation == 3 ? StringConverter3.GetBEString3(data, offset, count) : StringConverter4.GetBEString4(data, offset, count);
switch (generation) return generation switch
{ {
case 1: 1 or 2 => StringConverter12.GetString1(data, offset, count, jp),
case 2: return StringConverter12.GetString1(data, offset, count, jp); 3 => StringConverter3.GetString3(data, offset, count, jp),
case 3: return StringConverter3.GetString3(data, offset, count, jp); 4 => StringConverter4.GetString4(data, offset, count),
case 4: return StringConverter4.GetString4(data, offset, count); 5 => GetString5(data, offset, count),
case 5: return GetString5(data, offset, count); 6 => GetString6(data, offset, count),
case 6: return GetString6(data, offset, count); _ => GetString7(data, offset, count),
default: return GetString7(data, offset, count); };
}
} }
/// <summary> /// <summary>
@ -53,16 +52,15 @@ namespace PKHeX.Core
if (isBigEndian) if (isBigEndian)
return generation == 3 ? StringConverter3.SetBEString3(value, maxLength, padTo, padWith) : StringConverter4.SetBEString4(value, maxLength, padTo, padWith); return generation == 3 ? StringConverter3.SetBEString3(value, maxLength, padTo, padWith) : StringConverter4.SetBEString4(value, maxLength, padTo, padWith);
switch (generation) return generation switch
{ {
case 1: 1 or 2 => StringConverter12.SetString1(value, maxLength, jp, padTo, padWith),
case 2: return StringConverter12.SetString1(value, maxLength, jp, padTo, padWith); 3 => StringConverter3.SetString3(value, maxLength, jp, padTo, padWith),
case 3: return StringConverter3.SetString3(value, maxLength, jp, padTo, padWith); 4 => StringConverter4.SetString4(value, maxLength, padTo, padWith),
case 4: return StringConverter4.SetString4(value, maxLength, padTo, padWith); 5 => SetString5(value, maxLength, padTo, padWith),
case 5: return SetString5(value, maxLength, padTo, padWith); 6 => SetString6(value, maxLength, padTo, padWith),
case 6: return SetString6(value, maxLength, padTo, padWith); _ => SetString7(value, maxLength, language, padTo, padWith),
default: return SetString7(value, maxLength, language, padTo, padWith); };
}
} }
/// <summary>Converts Generation 5 encoded data to decoded string.</summary> /// <summary>Converts Generation 5 encoded data to decoded string.</summary>

33
PKHeX.Core/PKM/Util/ItemConverter.cs
View file

@ -136,29 +136,18 @@ namespace PKHeX.Core
/// </summary> /// </summary>
/// <param name="value">Gen1 Item ID</param> /// <param name="value">Gen1 Item ID</param>
/// <returns>Gen2 Item ID</returns> /// <returns>Gen2 Item ID</returns>
/// <remarks>https://github.com/pret/pokecrystal/blob/edb624c20ceb50eef9d73a5df0ac041cc156dd32/engine/link/link.asm#L1093-L1115</remarks> /// <remarks>
private static int GetTeruSamaItem(int value) /// <br>https://github.com/pret/pokecrystal/blob/edb624c20ceb50eef9d73a5df0ac041cc156dd32/engine/link/link.asm#L1093-L1115</br>
/// <br>https://github.com/pret/pokecrystal/blob/edb624c20ceb50eef9d73a5df0ac041cc156dd32/data/items/catch_rate_items.asm#L5-L17</br>
/// </remarks>
private static int GetTeruSamaItem(int value) => value switch
{ {
switch (value) 0x19 => 0x92, // Leftovers
{ 0x2D => 0x53, // Bitter Berry
case 0x19: return 0x92; // Leftovers 0x32 => 0xAE, // Leftovers
case 0x2D: return 0x53; // Bitter Berry 0x5A or 0x64 or 0x78 or 0x87 or 0xBE or 0xC3 or 0xDC or 0xFA or 0xFF => 0xAD, // Berry
case 0x32: return 0xAE; // Leftovers _ => value,
};
case 0x5A:
case 0x64:
case 0x78:
case 0x87:
case 0xBE:
case 0xC3:
case 0xDC:
case 0xFA:
case 0xFF:
return 0xAD; // Berry
default: return value;
}
}
/// <summary> /// <summary>
/// Converts a Gen1 Item to Gen2 Item. /// Converts a Gen1 Item to Gen2 Item.

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

@ -1,5 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using static PKHeX.Core.LanguageID;
namespace PKHeX.Core namespace PKHeX.Core
{ {
@ -10,71 +11,49 @@ namespace PKHeX.Core
{ {
private static readonly int[] Languages_3 = private static readonly int[] Languages_3 =
{ {
(int)LanguageID.Japanese, (int)Japanese,
(int)LanguageID.English, (int)English,
(int)LanguageID.French, (int)French,
(int)LanguageID.German, (int)German,
(int)LanguageID.Spanish, (int)Spanish,
(int)LanguageID.Italian, (int)Italian,
}; };
// check Korean for the VC case, never possible to match string outside of this case // check Korean for the VC case, never possible to match string outside of this case
private static readonly int[] Languages_GB = Languages_3.Concat(new[] {(int)LanguageID.Korean}).ToArray(); private static readonly int[] Languages_GB = Languages_3.Concat(new[] {(int)Korean}).ToArray();
private static readonly int[] Languages_46 = Languages_GB; private static readonly int[] Languages_46 = Languages_GB;
private static readonly int[] Languages_7 = Languages_46.Concat(new[] {(int)LanguageID.ChineseS, (int)LanguageID.ChineseT}).ToArray(); private static readonly int[] Languages_7 = Languages_46.Concat(new[] {(int)ChineseS, (int)ChineseT}).ToArray();
private const LanguageID SafeLanguage = English;
public static IReadOnlyList<int> GetAvailableGameLanguages(int generation = PKX.Generation) public static IReadOnlyList<int> GetAvailableGameLanguages(int generation = PKX.Generation) => generation switch
{ {
if (generation < 3) < 3 => Languages_GB,
return Languages_GB; < 4 => Languages_3,
if (generation < 4) < 7 => Languages_46,
return Languages_3; _ => Languages_7,
if (generation < 7) };
return Languages_46;
return Languages_7;
}
public static LanguageID GetSafeLanguage(int generation, LanguageID prefer, GameVersion game = GameVersion.Any) public static LanguageID GetSafeLanguage(int generation, LanguageID prefer, GameVersion game = GameVersion.Any) => generation switch
{ {
switch (generation) 1 or 2 => Languages_GB.Contains((int)prefer) && (prefer != Korean || game == GameVersion.C) ? prefer : SafeLanguage,
{ 3 => Languages_3 .Contains((int)prefer) ? prefer : SafeLanguage,
case 1: 4 or 5 or 6 => Languages_46.Contains((int)prefer) ? prefer : SafeLanguage,
case 2: _ => Languages_7 .Contains((int)prefer) ? prefer : SafeLanguage,
if (Languages_GB.Contains((int)prefer) && (prefer != LanguageID.Korean || game == GameVersion.C)) };
return prefer;
return LanguageID.English;
case 3:
if (Languages_3.Contains((int)prefer))
return prefer;
return LanguageID.English;
case 4:
case 5:
case 6:
if (Languages_46.Contains((int)prefer))
return prefer;
return LanguageID.English;
default:
if (Languages_7.Contains((int)prefer))
return prefer;
return LanguageID.English;
}
}
public static string GetLanguage2CharName(this LanguageID lang) public static string GetLanguage2CharName(this LanguageID lang)
{ {
switch (lang) return lang switch
{ {
default: return GameLanguage.DefaultLanguage; Japanese => "ja",
French => "fr",
case LanguageID.Japanese: return "ja"; Italian => "it",
case LanguageID.French: return "fr"; German => "de",
case LanguageID.Italian: return "it"; Spanish => "es",
case LanguageID.German: return "de"; Korean => "ko",
case LanguageID.Spanish: return "es"; ChineseS or ChineseT => "zh",
case LanguageID.Korean: return "ko"; _ => GameLanguage.DefaultLanguage,
case LanguageID.ChineseS: };
case LanguageID.ChineseT: return "zh";
}
} }
/// <summary> /// <summary>
@ -103,20 +82,20 @@ namespace PKHeX.Core
private static readonly Dictionary<LanguageID, LanguageGC> MainSeriesToGC = new() private static readonly Dictionary<LanguageID, LanguageGC> MainSeriesToGC = new()
{ {
{LanguageID.German, LanguageGC.German}, {German, LanguageGC.German},
{LanguageID.French, LanguageGC.French}, {French, LanguageGC.French},
{LanguageID.Italian, LanguageGC.Italian}, {Italian, LanguageGC.Italian},
{LanguageID.Spanish, LanguageGC.Spanish}, {Spanish, LanguageGC.Spanish},
{LanguageID.UNUSED_6, LanguageGC.UNUSED_6}, {UNUSED_6, LanguageGC.UNUSED_6},
}; };
private static readonly Dictionary<LanguageGC, LanguageID> GCtoMainSeries = new() private static readonly Dictionary<LanguageGC, LanguageID> GCtoMainSeries = new()
{ {
{LanguageGC.German, LanguageID.German}, {LanguageGC.German, German},
{LanguageGC.French, LanguageID.French}, {LanguageGC.French, French},
{LanguageGC.Italian, LanguageID.Italian}, {LanguageGC.Italian, Italian},
{LanguageGC.Spanish, LanguageID.Spanish}, {LanguageGC.Spanish, Spanish},
{LanguageGC.UNUSED_6, LanguageID.UNUSED_6}, {LanguageGC.UNUSED_6, UNUSED_6},
}; };
} }
} }

10
PKHeX.Core/PKM/Util/PKX.cs
View file

@ -69,12 +69,12 @@ namespace PKHeX.Core
{ {
if (s.Length != 1) if (s.Length != 1)
return 2; return 2;
switch (s[0]) return (s[0]) switch
{ {
case '♂': case 'M': return 0; '♂' or 'M' => 0,
case '♀': case 'F': return 1; '♀' or 'F' => 1,
default: return 2; _ => 2,
} };
} }
/// <summary> /// <summary>