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

Misc refactoring

Browse source 
use common edits to set pp
This commit is contained in:
Kurt 2018-04-07 11:40:01 -07:00
parent 9d3f7250a5
commit 420efb72bb
4 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -213,10 +213,7 @@ namespace PKHeX.Core
if (SAV.Generation > 5 && OriginGame == 0) // Gen6+, give random gen5 game
pk.Version = (int)GameVersion.W + Util.Rand.Next(4);
pk.Move1_PP = pk.GetMovePP(Move1, 0);
pk.Move2_PP = pk.GetMovePP(Move2, 0);
pk.Move3_PP = pk.GetMovePP(Move3, 0);
pk.Move4_PP = pk.GetMovePP(Move4, 0);
pk.SetMaximumPPCurrent();
if (IsEgg) // User's
{
pk.TID = SAV.TID;

9
PKHeX.Core/MysteryGifts/WC3.cs
View file

@ -94,8 +94,6 @@ namespace PKHeX.Core
pk.Version = GetRandomVersion(Version);
}
int lang = GetSafeLanguage(SAV.Language, Language);
if (lang > (int)LanguageID.Korean)
lang = (int)LanguageID.English;
bool hatchedEgg = IsEgg && SAV.Generation != 3;
if (hatchedEgg) // ugly workaround for character table interactions
{
@ -162,10 +160,7 @@ namespace PKHeX.Core
}
pk.Moves = Moves;
pk.Move1_PP = pk.GetMovePP(Moves[0], 0);
pk.Move2_PP = pk.GetMovePP(Moves[1], 0);
pk.Move3_PP = pk.GetMovePP(Moves[2], 0);
pk.Move4_PP = pk.GetMovePP(Moves[3], 0);
pk.SetMaximumPPCurrent(Moves);
pk.HeldItem = 0; // clear, only random for Jirachis(?), no loss
pk.RefreshChecksum();
return pk;
@ -175,7 +170,7 @@ namespace PKHeX.Core
{
if (supplied >= 1)
return supplied;
if (hatchLang < 0)
if (hatchLang < 0 || hatchLang > 8) // ko
return 2;
return hatchLang;
}

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

@ -350,10 +350,7 @@ namespace PKHeX.Core
EVs = EVs,
};
pk.Move1_PP = pk.GetMovePP(Move1, 0);
pk.Move2_PP = pk.GetMovePP(Move2, 0);
pk.Move3_PP = pk.GetMovePP(Move3, 0);
pk.Move4_PP = pk.GetMovePP(Move4, 0);
pk.SetMaximumPPCurrent();
pk.MetDate = Date ?? DateTime.Now;
@ -422,11 +419,11 @@ namespace PKHeX.Core
break;
case Shiny.Always: // Random Shiny
pk.PID = Util.Rand32();
pk.PID = (uint)(((TID ^ SID ^ (pk.PID & 0xFFFF)) << 16) + (pk.PID & 0xFFFF));
pk.PID = (uint)(((pk.TID ^ pk.SID ^ (pk.PID & 0xFFFF)) << 16) | (pk.PID & 0xFFFF));
break;
case Shiny.Never: // Random Nonshiny
pk.PID = Util.Rand32();
if ((uint)(((TID ^ SID ^ (pk.PID & 0xFFFF)) << 16) + (pk.PID & 0xFFFF)) < 16) pk.PID ^= 0x10000000;
if (pk.IsShiny) pk.PID ^= 0x10000000;
break;
}

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

@ -379,10 +379,7 @@ namespace PKHeX.Core
if (SAV.Generation > 7 && OriginGame == 0) // Gen8+, give random gen7 game
pk.Version = (int)GameVersion.SN + Util.Rand.Next(4);
pk.Move1_PP = pk.GetMovePP(Move1, 0);
pk.Move2_PP = pk.GetMovePP(Move2, 0);
pk.Move3_PP = pk.GetMovePP(Move3, 0);
pk.Move4_PP = pk.GetMovePP(Move4, 0);
pk.SetMaximumPPCurrent();
if (OTGender == 3)
{
@ -438,11 +435,11 @@ namespace PKHeX.Core
break;
case Shiny.Always: // Random Shiny
pk.PID = Util.Rand32();
pk.PID = (uint)(((TID ^ SID ^ (pk.PID & 0xFFFF)) << 16) + (pk.PID & 0xFFFF));
pk.PID = (uint)(((pk.TID ^ pk.SID ^ (pk.PID & 0xFFFF)) << 16) | (pk.PID & 0xFFFF));
break;
case Shiny.Never: // Random Nonshiny
pk.PID = Util.Rand32();
if ((uint)(((TID ^ SID ^ (pk.PID & 0xFFFF)) << 16) + (pk.PID & 0xFFFF)) < 16) pk.PID ^= 0x10000000;
if (pk.IsShiny) pk.PID ^= 0x10000000;
break;
}