From d2bed713e421860b5fbbfc421c086591d9a81fbd Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 12 May 2023 14:57:32 -0700 Subject: [PATCH] Change Totem sprite indication to orange aura Closes #3880 Co-Authored-By: Jonathan Herbert <3344332+foohyfooh@users.noreply.github.com> --- PKHeX.Drawing.PokeSprite/Builder/SpriteBuilder.cs | 7 +++++-- PKHeX.Drawing/ImageUtil.cs | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/PKHeX.Drawing.PokeSprite/Builder/SpriteBuilder.cs b/PKHeX.Drawing.PokeSprite/Builder/SpriteBuilder.cs index 479e66672..95b5db060 100644 --- a/PKHeX.Drawing.PokeSprite/Builder/SpriteBuilder.cs +++ b/PKHeX.Drawing.PokeSprite/Builder/SpriteBuilder.cs @@ -145,9 +145,12 @@ private Image GetBaseImage(ushort species, byte form, int gender, uint formarg, { var baseform = FormInfo.GetTotemBaseForm(species, form); var baseImage = GetBaseImageDefault(species, baseform, gender, formarg, shiny, context); - if (baseImage == null) + if (baseImage is not Bitmap b) return null; - return ImageUtil.ToGrayscale(baseImage); + + SpriteUtil.GetSpriteGlow(baseImage, 0, 165, 255, out var pixels, true); + var layer = ImageUtil.GetBitmap(pixels, b.Width, b.Height, b.PixelFormat); + return ImageUtil.LayerImage(baseImage, layer, 0, 0); } private Image? GetBaseImageDefault(ushort species, byte form, int gender, uint formarg, bool shiny, EntityContext context) diff --git a/PKHeX.Drawing/ImageUtil.cs b/PKHeX.Drawing/ImageUtil.cs index b755f37c2..30cb926cc 100644 --- a/PKHeX.Drawing/ImageUtil.cs +++ b/PKHeX.Drawing/ImageUtil.cs @@ -231,7 +231,7 @@ private static void SetAllColorToGrayScale(Span data) { if (data[i + 3] == 0) continue; - byte greyS = (byte)(((0.3 * data[i + 2]) + (0.59 * data[i + 1]) + (0.11 * data[i + 0])) / 3); + byte greyS = (byte)(((0.3 * data[i + 2]) + (0.59 * data[i + 1]) + (0.11 * data[i + 0]))); data[i + 0] = greyS; data[i + 1] = greyS; data[i + 2] = greyS;