diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs index 4065696e5..4e912d245 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs @@ -362,7 +362,7 @@ namespace PKHeX.WinForms string desc = $"({mg.Type}) {getDescription(mg)}"; - new QR(qr, PB_Preview.Image, desc, "", "", "PKHeX Wonder Card @ ProjectPokemon.org").ShowDialog(); + new QR(qr, PB_Preview.Image, desc + "PKHeX Wonder Card @ ProjectPokemon.org", "", "", "").ShowDialog(); } } @@ -507,11 +507,19 @@ namespace PKHeX.WinForms { var addItem = ((WC7) gift).AdditionalItem; if (addItem != 0) - s += $"+ {GameInfo.Strings.itemlist[addItem]}"; + s += $"+ {GameInfo.Strings.itemlist[addItem]}" + Environment.NewLine; } } catch { s += "Unable to create gift description." + Environment.NewLine; } } + else if (gift.IsBP) + { + s += "BP: " + gift.BP + Environment.NewLine; + } + else if (gift.IsBean) + { + s += "Bean ID: " + gift.Bean + Environment.NewLine + "Quantity: " + gift.Quantity + Environment.NewLine; + } else { s += "Unknown Wonder Card Type!" + Environment.NewLine; } if (gift is WC7) { diff --git a/PKHeX/MysteryGifts/MysteryGift.cs b/PKHeX/MysteryGifts/MysteryGift.cs index 5d73087d5..999013397 100644 --- a/PKHeX/MysteryGifts/MysteryGift.cs +++ b/PKHeX/MysteryGifts/MysteryGift.cs @@ -107,6 +107,12 @@ namespace PKHeX.Core public virtual int Quantity { get { return 1; } set { } } public bool Empty => Data.SequenceEqual(new byte[Data.Length]); + public virtual bool IsBP { get { return false; } set { } } + public virtual int BP { get { return 0; } set { } } + public virtual bool IsBean { get { return false; } set { } } + public virtual int Bean { get { return 0; } set { } } + public virtual int BeanCount { get { return 0; } set { } } + public string getCardHeader() => (CardID > 0 ? $"Card #: {CardID:0000}" : "N/A") + $" - {CardTitle.Replace('\u3000',' ').Trim()}"; // Search Properties diff --git a/PKHeX/MysteryGifts/WC7.cs b/PKHeX/MysteryGifts/WC7.cs index ac57faacc..14600177a 100644 --- a/PKHeX/MysteryGifts/WC7.cs +++ b/PKHeX/MysteryGifts/WC7.cs @@ -86,11 +86,22 @@ namespace PKHeX.Core public bool GiftOncePerDay { get { return (CardFlags & 4) == 4; } set { CardFlags = (byte)(CardFlags & ~4 | (value ? 4 : 0)); } } public bool MultiObtain { get { return Data[0x53] == 1; } set { Data[0x53] = (byte)(value ? 1 : 0); } } + + // BP Properties + public override bool IsBP { get { return CardType == 3; } set { if (value) CardType = 3; } } + public override int BP + { + get { return Item; } + set { Item = value; } + } // Bean (Mame) Properties - public bool IsBean { get { return CardType == 3; } set { if (value) CardType = 3; } } - // BP Properties - public bool IsBP { get { return CardType == 2; } set { if (value) CardType = 2; } } + public override bool IsBean { get { return CardType == 2; } set { if (value) CardType = 2; } } + public override int Bean + { + get { return Item; } + set { Item = value; } + } // Item Properties public override bool IsItem { get { return CardType == 1; } set { if (value) CardType = 1; } }