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

Update Evolution enums

Browse Source 
Tyrogue => Hitmonlee and Tyrogue => Hitmontop were reversed. 5c4475a237
This commit is contained in:
sora10pls
2021-09-16 08:53:14 -04:00
parent 2874f6fc69
commit e166f86027
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PKHeX.Core/Legality/Evolutions/EvolutionMethod.cs
View File

@@ -75,7 +75,7 @@ public bool Valid(PKM pkm, int lvl, bool skipChecks)
switch ((EvolutionType)Method)
{
case UseItem or UseItemWormhole:
case Crit3 or HPDownBy49 or SpinType:
case CriticalHitsInBattle or HitPointsLostInBattle or Spin:
case TowerOfDarkness or TowerOfWaters:
return true;
case UseItemMale:
@@ -83,7 +83,7 @@ public bool Valid(PKM pkm, int lvl, bool skipChecks)
case UseItemFemale:
return pkm.Gender == 1;
case Trade or TradeHeldItem or TradeSpecies:
case Trade or TradeHeldItem or TradeShelmetKarrablast:
return !pkm.IsUntraded || skipChecks;
// Special Level Up Cases -- return false if invalid

22
PKHeX.Core/Legality/Evolutions/EvolutionType.cs
View File

@@ -11,11 +11,11 @@ public enum EvolutionType : byte
LevelUp = 4,
Trade = 5,
TradeHeldItem = 6,
TradeSpecies = 7,
TradeShelmetKarrablast = 7,
UseItem = 8,
LevelUpATK = 9,
LevelUpDEF = 10,
LevelUpAeqD = 11,
LevelUpAeqD = 10,
LevelUpDEF = 11,
LevelUpECl5 = 12,
LevelUpECgeq5 = 13,
LevelUpNinjask = 14,
@@ -47,18 +47,18 @@ public enum EvolutionType : byte
LevelUpDusk = 40,
LevelUpWormhole = 41,
UseItemWormhole = 42,
Crit3, // Sirfetch'd
HPDownBy49, // Runerigus
SpinType, // Alcremie
LevelUpNatureAmped, // Toxtricity
LevelUpNatureLowKey, // Toxtricity
TowerOfDarkness, // Urshifu
TowerOfWaters, // Urshifu
CriticalHitsInBattle = 43, // Sirfetch'd
HitPointsLostInBattle = 44, // Runerigus
Spin = 45, // Alcremie
LevelUpNatureAmped = 46, // Toxtricity
LevelUpNatureLowKey = 47, // Toxtricity
TowerOfDarkness = 48, // Urshifu
TowerOfWaters = 49, // Urshifu
}
public static class EvolutionTypeExtensions
{
public static bool IsTrade(this EvolutionType t) => t is Trade or TradeHeldItem or TradeSpecies;
public static bool IsTrade(this EvolutionType t) => t is Trade or TradeHeldItem or TradeShelmetKarrablast;
public static bool IsLevelUpRequired(this EvolutionType t) => t.ToString().StartsWith("LevelUp"); // don't use this
}
}