Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-23 20:43:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update mystery gift db/checking

Browse source
This commit is contained in:
Kurt 2016-11-17 09:12:17 -08:00
parent 88c03f63c9
commit 79af49f8df
10 changed files with 16 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX/Legality/Checks.cs
View file

@ -1058,7 +1058,7 @@ namespace PKHeX
if (pkm.CurrentHandler != 1)
return new CheckResult(Severity.Invalid, "Current handler should not be Event OT.", CheckIdentifier.History);
}
if (EncounterType == typeof (EncounterTrade) && pkm.Format == 7)
if (pkm.Format == 7)
{
// TODO
return new CheckResult(Severity.Valid, "S/M History Block check skipped.", CheckIdentifier.History);

4
PKHeX/Legality/Core.cs
View file

@ -420,8 +420,8 @@ namespace PKHeX
{
if (wc.SID != pkm.SID) continue;
if (wc.TID != pkm.TID) continue;
if (wc.OT != pkm.OT_Name) continue;
if (wc.OTGender != pkm.OT_Gender) continue;
if (!string.IsNullOrEmpty(wc.OT) && wc.OT != pkm.OT_Name) continue;
if (wc.OTGender != 3 && wc.OTGender != pkm.OT_Gender) continue;
if (wc.PIDType == 0 && pkm.PID != wc.PID) continue;
if (wc.PIDType == 2 && !pkm.IsShiny) continue;
if (wc.PIDType == 3 && pkm.IsShiny) continue;

12
PKHeX/MysteryGifts/WC6.cs
View file

@ -313,15 +313,11 @@ namespace PKHeX
pk.Move3_PP = pk.getMovePP(Move3, 0);
pk.Move4_PP = pk.getMovePP(Move4, 0);
if (Date.HasValue)
pk.MetDate = Date ?? DateTime.Now;
if (SAV.Generation > 6) // Gen7
{
pk.MetDate = Date.Value;
}
else
{
// No datetime set, typical for wc6full
// Set it to now, instead of zeroing it out.
pk.MetDate = DateTime.Now;
pk.Version = (int)GameVersion.OR;
}
if (pk.CurrentHandler == 0) // OT

32
PKHeX/MysteryGifts/WC7.cs
View file

@ -38,10 +38,10 @@ namespace PKHeX
set { RawDate = (value-2000)*10000 + RawDate%10000; } }
private uint Month {
get { return RawDate%10000/100; }
set { RawDate = Year*10000 + value*100 + RawDate%100; } }
set { RawDate = (Year-2000)*10000 + value*100 + RawDate%100; } }
private uint Day {
get { return RawDate%100; }
set { RawDate = Year*10000 + Month*100 + value; } }
set { RawDate = (Year-2000)*10000 + Month*100 + value; } }
/// <summary>
/// Gets or sets the date of the card.
@ -310,32 +310,14 @@ namespace PKHeX
pk.Move3_PP = pk.getMovePP(Move3, 0);
pk.Move4_PP = pk.getMovePP(Move4, 0);
if (Date.HasValue)
if (OTGender == 3)
{
pk.MetDate = Date.Value;
}
else
{
// No datetime set, typical for wc6full
// Set it to now, instead of zeroing it out.
pk.MetDate = DateTime.Now;
pk.TID = SAV.TID;
pk.SID = SAV.SID;
}
if (pk.CurrentHandler == 0) // OT
{
pk.OT_Memory = 3;
pk.OT_TextVar = 9;
pk.OT_Intensity = 1;
pk.OT_Feeling = Util.rand.Next(0, 9);
}
else
{
pk.HT_Memory = 3;
pk.HT_TextVar = 9;
pk.HT_Intensity = 1;
pk.HT_Feeling = Util.rand.Next(0, 9);
pk.HT_Friendship = pk.OT_Friendship;
}
pk.MetDate = Date ?? DateTime.Now;
pk.IsNicknamed = IsNicknamed;
pk.Nickname = IsNicknamed ? Nickname : PKX.getSpeciesName(Species, pk.Language);

BIN
PKHeX/Resources/byte/wc6.pkl
View file

Binary file not shown.

BIN
PKHeX/Resources/byte/wc6full.pkl
View file

Binary file not shown.

BIN
PKHeX/Resources/byte/wc7.pkl
View file

Binary file not shown.

BIN
PKHeX/Resources/byte/wc7full.pkl
View file

Binary file not shown.

1
PKHeX/Subforms/SAV_MysteryGiftDB.Designer.cs generated
View file

@ -1415,6 +1415,7 @@
this.CB_Format.FormattingEnabled = true;
this.CB_Format.Items.AddRange(new object[] {
"Any",
".wc7",
".wc6",
".pgf",
".pcd/pgt"});

2
PKHeX/Subforms/SAV_MysteryGiftDB.cs
View file

@ -112,7 +112,7 @@ namespace PKHeX
private const int RES_MIN = 6;
private readonly string Counter;
private readonly string Viewed;
private const int MAXFORMAT = 6;
private const int MAXFORMAT = 7;
// Important Events
private void clickView(object sender, EventArgs e)