Update default box display, alpha sprites

Co-Authored-By: Matt <17801814+sora10pls@users.noreply.github.com>
This commit is contained in:
Kurt 2022-02-04 17:35:54 -08:00
parent 0b32cbf132
commit cb6e2020a4
2 changed files with 12 additions and 1 deletions

View file

@ -35,7 +35,8 @@ public static class WallpaperUtil
5 => B2W2.Contains(version) && index > 16 ? "b2w2" : "bw", 5 => B2W2.Contains(version) && index > 16 ? "b2w2" : "bw",
6 => ORAS.Contains(version) && index > 16 ? "ao" : "xy", 6 => ORAS.Contains(version) && index > 16 ? "ao" : "xy",
7 when !GG.Contains(version) => "xy", 7 when !GG.Contains(version) => "xy",
8 => BDSP.Contains(version) ? "bdsp" : "swsh", 8 when !SWSH.Contains(version) => "bdsp",
8 => "swsh",
_ => string.Empty, _ => string.Empty,
}; };
} }

View file

@ -54,6 +54,11 @@ public static class SpriteUtil
var gm = Resources.dyna; var gm = Resources.dyna;
return ImageUtil.LayerImage(img, gm, (img.Width - gm.Width) / 2, 0); return ImageUtil.LayerImage(img, gm, (img.Width - gm.Width) / 2, 0);
} }
if (pk is IAlpha {IsAlpha: true})
{
var alpha = Resources.alpha;
return ImageUtil.LayerImage(img, alpha, SlotTeamShiftX, 0);
}
return img; return img;
} }
@ -185,6 +190,11 @@ public static class SpriteUtil
var gm = Resources.dyna; var gm = Resources.dyna;
img = ImageUtil.LayerImage(img, gm, (img.Width - gm.Width) / 2, 0); img = ImageUtil.LayerImage(img, gm, (img.Width - gm.Width) / 2, 0);
} }
if (enc is IAlpha { IsAlpha: true })
{
var alpha = Resources.alpha;
img = ImageUtil.LayerImage(img, alpha, SlotTeamShiftX, 0);
}
if (SpriteBuilder.ShowEncounterColor != SpriteBackgroundType.None) if (SpriteBuilder.ShowEncounterColor != SpriteBackgroundType.None)
img = ApplyEncounterColor(enc, img, SpriteBuilder.ShowEncounterColor); img = ApplyEncounterColor(enc, img, SpriteBuilder.ShowEncounterColor);
return img; return img;