From 46b8e6427aee80e360b43a8df23a024ced495f8f Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 16 Apr 2020 15:14:36 -0700 Subject: [PATCH] Add big unknown held item sprite Co-Authored-By: Matt --- PKHeX.Drawing/Properties/Resources.Designer.cs | 10 ++++++++++ PKHeX.Drawing/Properties/Resources.resx | 3 +++ .../Resources/img/Big Items/bitem_unk.png | Bin 0 -> 256 bytes PKHeX.Drawing/Sprites/SpriteBuilder.cs | 5 ++++- 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 PKHeX.Drawing/Resources/img/Big Items/bitem_unk.png diff --git a/PKHeX.Drawing/Properties/Resources.Designer.cs b/PKHeX.Drawing/Properties/Resources.Designer.cs index 80a76b477..b7899eeab 100644 --- a/PKHeX.Drawing/Properties/Resources.Designer.cs +++ b/PKHeX.Drawing/Properties/Resources.Designer.cs @@ -50930,6 +50930,16 @@ public class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap bitem_unk { + get { + object obj = ResourceManager.GetObject("bitem_unk", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/PKHeX.Drawing/Properties/Resources.resx b/PKHeX.Drawing/Properties/Resources.resx index 078127537..b731c2afa 100644 --- a/PKHeX.Drawing/Properties/Resources.resx +++ b/PKHeX.Drawing/Properties/Resources.resx @@ -18088,6 +18088,9 @@ ..\Resources\img\Big Shiny Sprites\b_9-1s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\Big Items\bitem_unk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\img\box\swsh\box_wp01swsh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/PKHeX.Drawing/Resources/img/Big Items/bitem_unk.png b/PKHeX.Drawing/Resources/img/Big Items/bitem_unk.png new file mode 100644 index 0000000000000000000000000000000000000000..43e785904b903ec98f0293256743723f1a428c6e GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;8af+$B+p3WQmUrAOHXVAE5S^L0MUO%FzP{ zSeCN$@a$mj=w!+|BB*qxk-?IyqljS>TM*-wnp3hL>h-6%GbNO$y=hoDk?nwDf!HZ! zMguAS public abstract Bitmap Delete { get; } public abstract Bitmap Transparent { get; } public abstract Bitmap Drag { get; } + public abstract Bitmap UnknownItem { get; } private const double UnknownFormTransparency = 0.5; private const double ShinyTransparency = 0.7; @@ -121,7 +122,7 @@ private Image GetBaseImageFallback(int species, int form, int gender, uint forma private Image LayerOverImageItem(Image baseImage, int item, int generation) { - Image itemimg = (Image?)Resources.ResourceManager.GetObject(GetItemResourceName(item)) ?? Resources.helditem; + Image itemimg = (Image?)Resources.ResourceManager.GetObject(GetItemResourceName(item)) ?? UnknownItem; if (2 <= generation && generation <= 4 && 328 <= item && item <= 419) // gen2/3/4 TM itemimg = Resources.item_tm; else if (generation >= 8 && (1130 <= item && item <= 1229)) // Gen8 TR @@ -187,6 +188,7 @@ public class SpriteBuilder3040 : SpriteBuilder public override Bitmap Delete => Resources.slotDel; public override Bitmap Transparent => Resources.slotTrans; public override Bitmap Drag => Resources.slotDrag; + public override Bitmap UnknownItem => Resources.helditem; } /// @@ -215,5 +217,6 @@ protected override Image GetEggSprite(int species) => Resources.egg; // no manap public override Bitmap Delete => Resources.slotDel68; public override Bitmap Transparent => Resources.slotTrans68; public override Bitmap Drag => Resources.slotDrag68; + public override Bitmap UnknownItem => Resources.bitem_unk; } }