Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-26 14:00:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move wallpaper red check to BoxWallpaper

Browse source 
Add gen3-5 wallpaper checks
Rearrange and simplify general sprite layering logic to reduce some
comparisons
This commit is contained in:
Kurt 2017-03-08 21:50:34 -08:00
parent 6da4b3d41c
commit e9ea53ef8c
2 changed files with 73 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
PKHeX.WinForms/Util/PKMUtil.cs
View file

@ -35,10 +35,8 @@ namespace PKHeX.WinForms
if (shiny)
{
// Add shiny star to top left of image.
if (isBoxBGRed)
baseImage = ImageUtil.LayerImage(baseImage, Resources.rare_icon_alt, 0, 0, 0.7);
else
baseImage = ImageUtil.LayerImage(baseImage, Resources.rare_icon, 0, 0, 0.7);
var rare = isBoxBGRed ? Resources.rare_icon_alt : Resources.rare_icon;
baseImage = ImageUtil.LayerImage(baseImage, rare, 0, 0, 0.7);
}
if (item > 0)
{
@ -47,7 +45,9 @@ namespace PKHeX.WinForms
itemimg = Resources.item_tm;
// Redraw
baseImage = ImageUtil.LayerImage(baseImage, itemimg, 22 + (15 - itemimg.Width) / 2, 15 + (15 - itemimg.Height), 1);
int x = 22 + (15 - itemimg.Width)/2;
int y = 15 + (15 - itemimg.Height);
baseImage = ImageUtil.LayerImage(baseImage, itemimg, x, y, 1);
}
return baseImage;
}
@ -77,11 +77,7 @@ namespace PKHeX.WinForms
img = ImageUtil.LayerImage(new Bitmap(img.Width, img.Height), img, 0, 0, 0.3);
return img;
}
private static Image getSprite(PKM pkm)
{
return getSprite(pkm.Species, pkm.AltForm, pkm.Gender, pkm.SpriteItem, pkm.IsEgg, pkm.IsShiny, pkm.Format);
}
private static Image getSprite(PKM pkm, bool isBoxBGRed)
private static Image getSprite(PKM pkm, bool isBoxBGRed = false)
{
return getSprite(pkm.Species, pkm.AltForm, pkm.Gender, pkm.SpriteItem, pkm.IsEgg, pkm.IsShiny, pkm.Format, isBoxBGRed);
}
@ -102,36 +98,26 @@ namespace PKHeX.WinForms
if (!pkm.Valid)
return null;
bool isBoxBGRed = false;
if (pkm.Species != 0 && slot >= 0 && slot < 30 && (SAV.Generation == 7 || SAV.Generation == 6))
{
switch (SAV.getBoxWallpaper(box))
{
case 5: // Volcano
case 12: // PokeCenter
case 20: // Special5 Flare/Magma
isBoxBGRed = true;
break;
}
}
var sprite = pkm.Species != 0 ? (isBoxBGRed ? pkm.Sprite(true) : pkm.Sprite()) : null;
if (flagIllegal && slot > -1)
bool inBox = slot > 0 && slot < 30;
var sprite = pkm.Species != 0 ? pkm.Sprite(isBoxBGRed: inBox && BoxWallpaper.getWallpaperRed(SAV, box)) : null;
if (slot <= -1) // from tabs
return sprite;
if (flagIllegal)
{
pkm.Box = box;
var la = new LegalityAnalysis(pkm);
if (la.Parsed && !la.Valid)
{
sprite = ImageUtil.LayerImage(sprite, Resources.warn, 0, 14, 1);
// sprite = ImageUtil.LayerImage(sprite, ImageUtil.ChangeAllColorTo(sprite, Color.Red), 0, 0, 0.5f);
}
}
bool locked = slot < 30 && SAV.getIsSlotLocked(box, slot);
bool team = slot < 30 && SAV.getIsTeamSet(box, slot);
if (locked)
sprite = ImageUtil.LayerImage(sprite, Resources.locked, 26, 0, 1);
else if (team)
sprite = ImageUtil.LayerImage(sprite, Resources.team, 21, 0, 1);
if (inBox) // in box
{
if (SAV.getIsSlotLocked(box, slot))
sprite = ImageUtil.LayerImage(sprite, Resources.locked, 26, 0, 1);
else if (SAV.getIsTeamSet(box, slot))
sprite = ImageUtil.LayerImage(sprite, Resources.team, 21, 0, 1);
}
return sprite;
}
@ -140,8 +126,7 @@ namespace PKHeX.WinForms
public static Image WallpaperImage(this SaveFile SAV, int box) => getWallpaper(SAV, box);
public static Image Sprite(this MysteryGift gift) => getSprite(gift);
public static Image Sprite(this SaveFile SAV) => getSprite(SAV);
public static Image Sprite(this PKM pkm) => getSprite(pkm);
public static Image Sprite(this PKM pkm, bool isBoxBGRed) => getSprite(pkm, isBoxBGRed);
public static Image Sprite(this PKM pkm, bool isBoxBGRed = false) => getSprite(pkm, isBoxBGRed);
public static Image Sprite(this PKM pkm, SaveFile SAV, int box, int slot, bool flagIllegal = false)
=> getSprite(pkm, SAV, box, slot, flagIllegal);
}

52
PKHeX/Saves/Substructures/BoxWallpaper.cs
View file

@ -33,5 +33,57 @@
}
return s;
}
public static bool getWallpaperRed(SaveFile SAV, int box)
{
switch (SAV.Generation)
{
case 3:
if (SAV.GameCube)
return box == 7 && SAV is SAV3XD; // flame pattern in XD
switch (SAV.getBoxWallpaper(box))
{
case 5: // Volcano
return true;
case 13: // PokéCenter
return SAV.E;
}
break;
case 4:
switch (SAV.getBoxWallpaper(box))
{
case 5: // Volcano
case 12: // Checks
case 13: // PokéCenter
case 22: // Special
return true;
}
break;
case 5:
switch (SAV.getBoxWallpaper(box))
{
case 5: // Volcano
case 12: // Checks
return true;
case 19: // PWT
case 22: // Reshiram
return SAV.B2W2;
case 21: // Zoroark
case 23: // Musical
return SAV.BW;
}
break;
case 6:
case 7:
switch (SAV.getBoxWallpaper(box))
{
case 5: // Volcano
case 12: // PokéCenter
case 20: // Special5 Flare/Magma
return true;
}
break;
}
return false;
}
}
}