Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-05-06 13:40:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix pb7 trade logic

Browse Source 
Update handler after friendship update (CurrentHandler needs to update
afterwards)
Fix argument order (gender & nonpresent region data)
#2235 side effect
This commit is contained in:
Kurt 2019-01-08 18:32:42 -08:00
parent bc8b48eb88
commit fef80d5a05
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PKHeX.Core/PKM/PB7.cs
View File

@ -335,12 +335,12 @@ protected override bool TradeOT(string SAV_Trainer, int SAV_TID, int SAV_SID, in
protected override void TradeHT(string SAV_Trainer, int SAV_COUNTRY, int SAV_REGION, int SAV_GENDER, bool Bank)
{
CurrentHandler = 1;
if (HT_Name != SAV_Trainer)
{
HT_Friendship = CurrentFriendship; // PersonalInfo.BaseFriendship;
HT_Affection = 0;
}
CurrentHandler = 1;
HT_Name = SAV_Trainer;
HT_Gender = SAV_GENDER;
}

2
PKHeX.Core/Saves/SAV7b.cs
View File

@ -151,7 +151,7 @@ protected override void SetPKM(PKM pkm)
// Apply to this Save File
int CT = pk.CurrentHandler;
var Date = DateTime.Now;
pk.Trade(OT, TID, SID, Gender, Date.Day, Date.Month, false, Date.Year);
pk.Trade(OT, TID, SID, 0, 0, Gender, false, Date.Day, Date.Month, Date.Year);
if (CT != pk.CurrentHandler) // Logic updated Friendship
{
// Copy over the Friendship Value only under certain circumstances