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

Add key item sprite for mysterygift display

Browse Source 
closes #2110
This commit is contained in:
Kurt 2018-09-03 14:23:27 -07:00
parent 47e61e9393
commit f5b09c2bea
7 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
PKHeX.WinForms/Properties/Resources.Designer.cs generated
View File

@ -4593,9 +4593,9 @@ internal class Resources {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _25_7c {
internal static System.Drawing.Bitmap _25_7 {
get {
object obj = ResourceManager.GetObject("_25_7c", resourceCulture);
object obj = ResourceManager.GetObject("_25_7", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -4603,9 +4603,9 @@ internal class Resources {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _25_7cs {
internal static System.Drawing.Bitmap _25_7s {
get {
object obj = ResourceManager.GetObject("_25_7cs", resourceCulture);
object obj = ResourceManager.GetObject("_25_7s", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -21430,6 +21430,16 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Bag_Key {
get {
object obj = ResourceManager.GetObject("Bag_Key", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -22924,15 +22934,12 @@ internal class Resources {
/// Looks up a localized string similar to PKHeX - By Kaphotics
///http://projectpokemon.org/pkhex/
///
///18/04/18 - New Update:
/// - Translations:
/// - - Resources are now more accessible for translation. Want to better localize PKHeX to your native language?
/// - - Locate the following files in the repo for the desired language (example: English)
/// - - LegalityCheckStrings_en.txt (Legality parsing messages)
/// - - MessageStrings_en.txt (Program message popup/alerts)
/// - - lang_en.txt (Program GUI display)
///18/08/03 - New Update:
/// - Legality:
/// - - Fixed: Accounted for OR/AS OT a [rest of string was truncated]&quot;;.
/// - - Changed: Another round of legality check updates. Thanks @iiippppk, @WEERSOQUEER, @PrometheusG, @NinFanBoyFTW, paf, Cloud AC!
/// - - Added: Unavailable bred hidden abilities are now flagged for Gen5 origin entities (now covers all gens).
/// - - Added: WC6/7 mystery gift version compatibility checks based on wc*full data. Note: some gifts might still allow impossible future versions.
/// - Added: Hovering over a [rest of string was truncated]&quot;;.
/// </summary>
internal static string changelog {
get {
@ -28121,7 +28128,7 @@ internal class Resources {
}
/// <summary>
/// Looks up a localized string similar to 20180417.
/// Looks up a localized string similar to 20180803.
/// </summary>
internal static string ProgramVersion {
get {

3
PKHeX.WinForms/Properties/Resources.resx
View File

@ -9202,4 +9202,7 @@
<data name="wand" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\img\Program\wand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Bag_Key" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\img\Bag\Bag_Key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

2
PKHeX.WinForms/Subforms/PKM Editors/Text.cs
View File

@ -148,7 +148,7 @@ private void B_ApplyTrash_Click(object sender, EventArgs e)
string species = PKX.GetSpeciesNameGeneration(WinFormsUtil.GetIndex(CB_Species),
WinFormsUtil.GetIndex(CB_Language), (int) NUD_Generation.Value);
if (species?.Length == 0) // no result
if (string.IsNullOrEmpty(species)) // no result
species = CB_Species.Text;
byte[] current = SetString(TB_Text.Text);

8
PKHeX.WinForms/Subforms/Save Editors/SAV_Inventory.Designer.cs generated
View File

@ -196,13 +196,13 @@ private void InitializeComponent()
this.giveNone,
this.giveModify});
this.giveMenu.Name = "modifyMenu";
this.giveMenu.Size = new System.Drawing.Size(153, 92);
this.giveMenu.Size = new System.Drawing.Size(113, 70);
//
// giveAll
//
this.giveAll.Image = global::PKHeX.WinForms.Properties.Resources.database;
this.giveAll.Name = "giveAll";
this.giveAll.Size = new System.Drawing.Size(152, 22);
this.giveAll.Size = new System.Drawing.Size(112, 22);
this.giveAll.Text = "All";
this.giveAll.Click += new System.EventHandler(this.GiveAllItems);
//
@ -210,7 +210,7 @@ private void InitializeComponent()
//
this.giveNone.Image = global::PKHeX.WinForms.Properties.Resources.open;
this.giveNone.Name = "giveNone";
this.giveNone.Size = new System.Drawing.Size(152, 22);
this.giveNone.Size = new System.Drawing.Size(112, 22);
this.giveNone.Text = "None";
this.giveNone.Click += new System.EventHandler(this.RemoveAllItems);
//
@ -218,7 +218,7 @@ private void InitializeComponent()
//
this.giveModify.Image = global::PKHeX.WinForms.Properties.Resources.settings;
this.giveModify.Name = "giveModify";
this.giveModify.Size = new System.Drawing.Size(152, 22);
this.giveModify.Size = new System.Drawing.Size(112, 22);
this.giveModify.Text = "Modify";
this.giveModify.Click += new System.EventHandler(this.ModifyAllItems);
//

2
PKHeX.WinForms/Subforms/Save Editors/SAV_Inventory.cs
View File

@ -21,7 +21,7 @@ public SAV_Inventory(SaveFile sav)
for (int i = 0; i < itemlist.Length; i++)
{
if (itemlist[i]?.Length == 0)
if (string.IsNullOrEmpty(itemlist[i]))
itemlist[i] = $"(Item #{i:000})";
}

2
PKHeX.WinForms/Subforms/Save Editors/SAV_Inventory.resx
View File

@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB0
EwAAAk1TRnQBSQFMAgEBCwEAAWABAAFgAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
EwAAAk1TRnQBSQFMAgEBCwEAAXABAAFwAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABYAMAAUgDAAEBAQABCAYAARsYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

2
PKHeX.WinForms/Util/SpriteUtil.cs
View File

@ -76,7 +76,7 @@ private static Image GetBaseImage(MysteryGift gift)
int item = gift.ItemID;
if (Legal.ZCrystalDictionary.TryGetValue(item, out int value))
item = value;
return (Image)(Resources.ResourceManager.GetObject("item_" + item) ?? Resources.unknown);
return (Image)(Resources.ResourceManager.GetObject("item_" + item) ?? Resources.Bag_Key);
}
return Resources.unknown;
}