Skip to content

Commit a49754c

Browse files
santacrab2santacrab2
authored
handle latest pkhex.core api (#95)
1 parent 6ecec14 commit a49754c

8 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎TeraFinder.Core/TeraFinder.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
<ItemGroup>
4242
<PackageReference Include="FlatSharp.Runtime" Version="7.6.0" />
43-
<PackageReference Include="PKHeX.Core" Version="26.1.7" />
43+
<PackageReference Include="PKHeX.Core" Version="26.3.20" />
4444
</ItemGroup>
4545

4646
<ItemGroup>

‎TeraFinder.Launcher/TeraFinder.Launcher.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
<ItemGroup>
4040
<PackageReference Include="FlatSharp.Runtime" Version="7.6.0" />
41-
<PackageReference Include="PKHeX.Core" Version="26.1.7" />
41+
<PackageReference Include="PKHeX.Core" Version="26.3.20" />
4242
</ItemGroup>
4343

4444
<ItemGroup>

‎TeraFinder.Plugins/Resources/deps/PKHeX.Drawing.PokeSprite.dll‎

598 KB
Binary file not shown.

‎TeraFinder.Plugins/Resources/deps/PKHeX.Drawing.dll‎

3 KB
Binary file not shown.

‎TeraFinder.Plugins/TeraFinder.Plugins.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<PackageReference Include="LibUsbDotNet" Version="2.2.75" />
4040
<PackageReference Include="NLog" Version="5.4.0" />
4141
<PackageReference Include="Octokit" Version="14.0.0" />
42-
<PackageReference Include="PKHeX.Core" Version="26.1.7" />
42+
<PackageReference Include="PKHeX.Core" Version="26.3.20" />
4343
</ItemGroup>
4444

4545
<ItemGroup>

‎TeraFinder.Plugins/Utils/ImagesUtil.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ public static class ImagesUtil
1414
'b' + SpriteName.GetResourceStringSprite(pkm.Species, pkm.Form, (byte)pkm.Gender, (uint)(pkm.Species == (ushort)Species.Gholdengo ? 999 : 0), EntityContext.Gen9, true) :
1515
'a' + SpriteName.GetResourceStringSprite(pkm.Species, pkm.Form, (byte)pkm.Gender, (uint)(pkm.Species == (ushort)Species.Gholdengo ? 999 : 0), EntityContext.Gen9, false);
1616

17-
var sprite = (Image?)PKHeX.Drawing.PokeSprite.Properties.Resources.ResourceManager.GetObject(file);
17+
var sprite = (Bitmap?)PKHeX.Drawing.PokeSprite.Properties.Resources.ResourceManager.GetObject(file);
1818

1919
if (sprite is null)
2020
{
2121
file = 'a' + SpriteName.GetResourceStringSprite(pkm.Species, pkm.Form, (byte)pkm.Gender, (uint)(pkm.Species == (ushort)Species.Gholdengo ? 999 : 0), EntityContext.Gen9, false);
22-
sprite = (Image?)PKHeX.Drawing.PokeSprite.Properties.Resources.ResourceManager.GetObject(file);
22+
sprite = (Bitmap?)PKHeX.Drawing.PokeSprite.Properties.Resources.ResourceManager.GetObject(file);
2323
}
2424

2525
if (item > 0 && sprite is not null)
@@ -28,24 +28,24 @@ public static class ImagesUtil
2828
if (pkm.Shiny > TeraShiny.No && sprite is not null)
2929
sprite = LayerOverImageShiny(sprite, pkm.Shiny is TeraShiny.Square ? Shiny.AlwaysSquare : Shiny.AlwaysStar);
3030

31-
if (!active && sprite is not null) sprite = ImageUtil.ToGrayscale(sprite);
31+
if (!active && sprite is not null) ImageUtil.ToGrayscale(sprite,0.7f);
3232

3333
if(sprite is not null)
3434
ImageUtil.BlendTransparentTo(sprite, TypeColor.GetTypeSpriteColor(pkm.TeraType), 0xAF, 0x3740);
3535

3636
return sprite;
3737
}
3838

39-
public static Image? GetSimpleSprite(ushort species, byte form, bool active)
39+
public static Bitmap? GetSimpleSprite(ushort species, byte form, bool active)
4040
{
4141
SpriteName.AllowShinySprite = false;
4242
var file = 'a' + SpriteName.GetResourceStringSprite(species, form, 0, 0, EntityContext.Gen9, false);
43-
var sprite = (Image?)PKHeX.Drawing.PokeSprite.Properties.Resources.ResourceManager.GetObject(file);
44-
if (!active && sprite is not null) sprite = ImageUtil.ToGrayscale(sprite);
43+
var sprite = (Bitmap?)PKHeX.Drawing.PokeSprite.Properties.Resources.ResourceManager.GetObject(file);
44+
if (!active && sprite is not null) ImageUtil.ToGrayscale(sprite,0.7f);
4545
return sprite;
4646
}
4747

48-
private static Image LayerOverImageItem(Image image, int item)
48+
private static Bitmap LayerOverImageItem(Bitmap image, int item)
4949
{
5050
var str = item > 0 ? $"bitem_{item}" : "";
5151
var icon = (Image?)PKHeX.Drawing.PokeSprite.Properties.Resources.ResourceManager.GetObject(str);
@@ -59,7 +59,7 @@ private static Image LayerOverImageItem(Image image, int item)
5959
return image;
6060
}
6161

62-
private static Bitmap LayerOverImageShiny(Image image, Shiny shiny)
62+
private static Bitmap LayerOverImageShiny(Bitmap image, Shiny shiny)
6363
{
6464
var icon = shiny is Shiny.AlwaysSquare ? PKHeX.Drawing.PokeSprite.Properties.Resources.rare_icon_2 : PKHeX.Drawing.PokeSprite.Properties.Resources.rare_icon;
6565
return ImageUtil.LayerImage(image, icon, 0, 0, 0.7);

‎TeraFinder.RemoteExecutor/TeraFinder.RemoteExecutor.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<ItemGroup>
1818
<PackageReference Include="FlatSharp.Runtime" Version="7.6.0" />
19-
<PackageReference Include="PKHeX.Core" Version="26.1.7" />
19+
<PackageReference Include="PKHeX.Core" Version="26.3.20" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎TeraFinder.Tests/TeraFinder.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageReference Include="FlatSharp.Runtime" Version="7.6.0" />
1414
<PackageReference Include="FluentAssertions" Version="8.2.0" />
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
16-
<PackageReference Include="PKHeX.Core" Version="26.1.7" />
16+
<PackageReference Include="PKHeX.Core" Version="26.3.20" />
1717
<PackageReference Include="xunit" Version="2.9.3" />
1818
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

0 commit comments

Comments
 (0)