Update cosplay sprite handling
Cosplay are stuck on gen6, cap pikachu can interact with bank; make Cosplay the oddball resource.
|
@ -595,9 +595,10 @@ namespace PKHeX.Core
|
|||
// Data Requests
|
||||
public static string GetResourceStringBall(int ball) => $"_ball{ball}";
|
||||
private const string ResourceSeparator = "_";
|
||||
private const string ResourcePikachuCap = "c";
|
||||
private const string ResourcePikachuCosplay = "c";
|
||||
private const string ResourceShiny = "s";
|
||||
public static bool AllowShinySprite = false;
|
||||
public static bool AllowShinySprite { get; set; }
|
||||
|
||||
public static string GetResourceStringSprite(int species, int form, int gender, int generation = Generation, bool shiny = false)
|
||||
{
|
||||
if (Legal.SpeciesDefaultFormSprite.Contains(species)) // Species who show their default sprite regardless of Form
|
||||
|
@ -610,8 +611,8 @@ namespace PKHeX.Core
|
|||
else if (gender == 1 && Legal.SpeciesGenderedSprite.Contains(species)) // Frillish & Jellicent, Unfezant & Pyroar
|
||||
{ sb.Append(ResourceSeparator); sb.Append(gender); }
|
||||
|
||||
if (species == 25 && form > 0 && generation >= 7) // Pikachu
|
||||
sb.Append(ResourcePikachuCap);
|
||||
if (species == 25 && form > 0 && generation == 6) // Cosplay Pikachu
|
||||
sb.Append(ResourcePikachuCosplay);
|
||||
if (shiny && AllowShinySprite)
|
||||
sb.Append(ResourceShiny);
|
||||
return sb.ToString();
|
||||
|
|
|
@ -5956,8 +5956,8 @@
|
|||
<data name="_490_e" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Pokemon Sprites\490-e.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="_25_7c" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Pokemon Sprites\25-7c.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="_25_7" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Pokemon Sprites\25-7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="_744_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Pokemon Sprites\744-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
@ -6742,8 +6742,8 @@
|
|||
<data name="_25_6s" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Shiny Pokemon Sprites\25-6s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="_25_7cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Shiny Pokemon Sprites\25-7cs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="_25_7s" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Shiny Pokemon Sprites\25-7s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="_260s" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Shiny Pokemon Sprites\260s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
|
|
Before Width: | Height: | Size: 419 B After Width: | Height: | Size: 396 B |
Before Width: | Height: | Size: 396 B After Width: | Height: | Size: 419 B |
Before Width: | Height: | Size: 487 B After Width: | Height: | Size: 389 B |
Before Width: | Height: | Size: 389 B After Width: | Height: | Size: 487 B |
Before Width: | Height: | Size: 456 B After Width: | Height: | Size: 393 B |
Before Width: | Height: | Size: 393 B After Width: | Height: | Size: 456 B |
Before Width: | Height: | Size: 427 B After Width: | Height: | Size: 391 B |
Before Width: | Height: | Size: 391 B After Width: | Height: | Size: 427 B |
Before Width: | Height: | Size: 403 B After Width: | Height: | Size: 390 B |
Before Width: | Height: | Size: 390 B After Width: | Height: | Size: 403 B |
Before Width: | Height: | Size: 369 B After Width: | Height: | Size: 385 B |
Before Width: | Height: | Size: 385 B After Width: | Height: | Size: 369 B |
Before Width: | Height: | Size: 391 B After Width: | Height: | Size: 391 B |
Before Width: | Height: | Size: 390 B After Width: | Height: | Size: 402 B |
Before Width: | Height: | Size: 402 B After Width: | Height: | Size: 390 B |
Before Width: | Height: | Size: 384 B After Width: | Height: | Size: 463 B |
Before Width: | Height: | Size: 463 B After Width: | Height: | Size: 384 B |
Before Width: | Height: | Size: 391 B After Width: | Height: | Size: 426 B |
Before Width: | Height: | Size: 426 B After Width: | Height: | Size: 391 B |
Before Width: | Height: | Size: 386 B After Width: | Height: | Size: 408 B |
Before Width: | Height: | Size: 408 B After Width: | Height: | Size: 386 B |
Before Width: | Height: | Size: 384 B After Width: | Height: | Size: 392 B |
Before Width: | Height: | Size: 392 B After Width: | Height: | Size: 384 B |
Before Width: | Height: | Size: 381 B After Width: | Height: | Size: 352 B |
Before Width: | Height: | Size: 352 B After Width: | Height: | Size: 381 B |
Before Width: | Height: | Size: 403 B After Width: | Height: | Size: 403 B |