Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-04-25 16:35:02 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Show less-detailed scale eval in Z-A

Browse Source
This commit is contained in:
Kurt 2025-11-01 16:59:54 -05:00
parent 108bcf38d5
commit b407d8f0a0
13 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PKHeX.Core/PKM/Enums/PokeSize.cs
View File

@ -10,7 +10,7 @@ public enum PokeSize
{
XS,
S,
AV,
M,
L,
XL,
}
@ -26,7 +26,7 @@ public static class PokeSizeUtil
{
< 0x10 => XS, // 1/16 = XS
< 0x30 => S, // 2/16 = S
< 0xD0 => AV, // average (10/16)
< 0xD0 => M, // average (10/16)
< 0xF0 => L, // 2/16 = L
_ => XL, // 1/16 = XL
};
@ -37,7 +37,7 @@ public static class PokeSizeUtil
{
XS => (byte)(rnd.Next(0x10)),
S => (byte)(rnd.Next(0x20) + 0x10),
AV => (byte)(rnd.Next(0xA0) + 0x30),
M => (byte)(rnd.Next(0xA0) + 0x30),
L => (byte)(rnd.Next(0x20) + 0xD0),
XL => (byte)(rnd.Next(0x10) + 0xF0),
_ => GetRandomScalar(rnd),

4
PKHeX.Core/PKM/Enums/PokeSizeDetailed.cs
View File

@ -11,7 +11,7 @@ public enum PokeSizeDetailed
XXS,
XS,
S,
AV,
M,
L,
XL,
XXL,
@ -31,7 +31,7 @@ public static class PokeSizeDetailedUtil
< 25 => XXS, // 23:256
< 60 => XS, // 35:256
< 100 => S, // 40:256
<= 155 => AV, // 56:256
<= 155 => M, // 56:256
<= 195 => L, // 40:256
<= 230 => XL, // 35:256
< 255 => XXL, // 23:256

8
PKHeX.WinForms/Controls/PKM Editor/SizeCP.cs
View File

@ -13,6 +13,7 @@ public partial class SizeCP : UserControl
private IScaledSizeValue? sv;
private ICombatPower? pk;
private bool Loading;
private bool IsScaleDetailed;
public SizeCP()
{
@ -36,6 +37,7 @@ public void LoadPKM(PKM entity)
ss = entity as IScaledSize;
sv = entity as IScaledSizeValue;
scale = entity as IScaledSize3;
IsScaleDetailed = entity is PK9; // not PA9
if (ss is null)
return;
TryResetStats();
@ -156,7 +158,11 @@ private void NUD_Scale_ValueChanged(object sender, EventArgs e)
var label = L_SizeS;
var value = scale.Scale;
label.Text = SizeClassDetailed[(int)PokeSizeDetailedUtil.GetSizeRating(value)];
if (IsScaleDetailed)
label.Text = SizeClassDetailed[(int)PokeSizeDetailedUtil.GetSizeRating(value)];
else
label.Text = SizeClass[(int)PokeSizeUtil.GetSizeRating(value)];
if (value is 0 or 255) // Tiny or Jumbo Mark possible.
label.ForeColor = Color.Red;
else

4
PKHeX.WinForms/Resources/text/lang_de.txt
View File

@ -834,12 +834,12 @@ PlayerSkinColor8.PaleF=Pale (Female)
PlayerSkinColor8.PaleM=Pale (Male)
PlayerSkinColor8.TanF=Tan (Female)
PlayerSkinColor8.TanM=Tan (Male)
PokeSize.AV=AV
PokeSize.M=M
PokeSize.L=L
PokeSize.S=S
PokeSize.XL=XL
PokeSize.XS=XS
PokeSizeDetailed.AV=AV
PokeSizeDetailed.M=M
PokeSizeDetailed.L=L
PokeSizeDetailed.S=S
PokeSizeDetailed.XL=XL

4
PKHeX.WinForms/Resources/text/lang_en.txt
View File

@ -834,12 +834,12 @@ PlayerSkinColor8.PaleF=Pale (Female)
PlayerSkinColor8.PaleM=Pale (Male)
PlayerSkinColor8.TanF=Tan (Female)
PlayerSkinColor8.TanM=Tan (Male)
PokeSize.AV=AV
PokeSize.M=M
PokeSize.L=L
PokeSize.S=S
PokeSize.XL=XL
PokeSize.XS=XS
PokeSizeDetailed.AV=AV
PokeSizeDetailed.M=M
PokeSizeDetailed.L=L
PokeSizeDetailed.S=S
PokeSizeDetailed.XL=XL

4
PKHeX.WinForms/Resources/text/lang_es-419.txt
View File

@ -834,12 +834,12 @@ PlayerSkinColor8.PaleF=Pale (Female)
PlayerSkinColor8.PaleM=Pale (Male)
PlayerSkinColor8.TanF=Tan (Female)
PlayerSkinColor8.TanM=Tan (Male)
PokeSize.AV=AV
PokeSize.M=M
PokeSize.L=L
PokeSize.S=S
PokeSize.XL=XL
PokeSize.XS=XS
PokeSizeDetailed.AV=AV
PokeSizeDetailed.M=M
PokeSizeDetailed.L=L
PokeSizeDetailed.S=S
PokeSizeDetailed.XL=XL

4
PKHeX.WinForms/Resources/text/lang_es.txt
View File

@ -834,12 +834,12 @@ PlayerSkinColor8.PaleF=Pálida (Femenino)
PlayerSkinColor8.PaleM=Pálido (Masculino)
PlayerSkinColor8.TanF=Bronceada (Femenino)
PlayerSkinColor8.TanM=Bronceado (Masculino)
PokeSize.AV=AV
PokeSize.M=M
PokeSize.L=L
PokeSize.S=S
PokeSize.XL=XL
PokeSize.XS=XS
PokeSizeDetailed.AV=AV
PokeSizeDetailed.M=M
PokeSizeDetailed.L=L
PokeSizeDetailed.S=S
PokeSizeDetailed.XL=XL

4
PKHeX.WinForms/Resources/text/lang_fr.txt
View File

@ -834,12 +834,12 @@ PlayerSkinColor8.PaleF=Pale (Female)
PlayerSkinColor8.PaleM=Pale (Male)
PlayerSkinColor8.TanF=Tan (Female)
PlayerSkinColor8.TanM=Tan (Male)
PokeSize.AV=AV
PokeSize.M=M
PokeSize.L=L
PokeSize.S=S
PokeSize.XL=XL
PokeSize.XS=XS
PokeSizeDetailed.AV=AV
PokeSizeDetailed.M=M
PokeSizeDetailed.L=L
PokeSizeDetailed.S=S
PokeSizeDetailed.XL=XL

4
PKHeX.WinForms/Resources/text/lang_it.txt
View File

@ -834,12 +834,12 @@ PlayerSkinColor8.PaleF=Pale (Female)
PlayerSkinColor8.PaleM=Pale (Male)
PlayerSkinColor8.TanF=Tan (Female)
PlayerSkinColor8.TanM=Tan (Male)
PokeSize.AV=AV
PokeSize.M=M
PokeSize.L=L
PokeSize.S=S
PokeSize.XL=XL
PokeSize.XS=XS
PokeSizeDetailed.AV=AV
PokeSizeDetailed.M=M
PokeSizeDetailed.L=L
PokeSizeDetailed.S=S
PokeSizeDetailed.XL=XL

4
PKHeX.WinForms/Resources/text/lang_ja.txt
View File

@ -834,12 +834,12 @@ PlayerSkinColor8.PaleF=Pale (Female)
PlayerSkinColor8.PaleM=Pale (Male)
PlayerSkinColor8.TanF=Tan (Female)
PlayerSkinColor8.TanM=Tan (Male)
PokeSize.AV=AV
PokeSize.M=M
PokeSize.L=L
PokeSize.S=S
PokeSize.XL=XL
PokeSize.XS=XS
PokeSizeDetailed.AV=AV
PokeSizeDetailed.M=M
PokeSizeDetailed.L=L
PokeSizeDetailed.S=S
PokeSizeDetailed.XL=XL

4
PKHeX.WinForms/Resources/text/lang_ko.txt
View File

@ -834,12 +834,12 @@ PlayerSkinColor8.PaleF=Pale (Female)
PlayerSkinColor8.PaleM=Pale (Male)
PlayerSkinColor8.TanF=Tan (Female)
PlayerSkinColor8.TanM=Tan (Male)
PokeSize.AV=AV
PokeSize.M=M
PokeSize.L=L
PokeSize.S=S
PokeSize.XL=XL
PokeSize.XS=XS
PokeSizeDetailed.AV=AV
PokeSizeDetailed.M=M
PokeSizeDetailed.L=L
PokeSizeDetailed.S=S
PokeSizeDetailed.XL=XL

4
PKHeX.WinForms/Resources/text/lang_zh-Hans.txt
View File

@ -834,12 +834,12 @@ PlayerSkinColor8.PaleF=浅色肤色（女）
PlayerSkinColor8.PaleM=浅色肤色（男）
PlayerSkinColor8.TanF=棕色肤色（女）
PlayerSkinColor8.TanM=棕色肤色（男）
PokeSize.AV=AV
PokeSize.M=M
PokeSize.L=L
PokeSize.S=S
PokeSize.XL=XL
PokeSize.XS=XS
PokeSizeDetailed.AV=AV
PokeSizeDetailed.M=M
PokeSizeDetailed.L=L
PokeSizeDetailed.S=S
PokeSizeDetailed.XL=XL

4
PKHeX.WinForms/Resources/text/lang_zh-Hant.txt
View File

@ -834,12 +834,12 @@ PlayerSkinColor8.PaleF=Pale (Female)
PlayerSkinColor8.PaleM=Pale (Male)
PlayerSkinColor8.TanF=Tan (Female)
PlayerSkinColor8.TanM=Tan (Male)
PokeSize.AV=AV
PokeSize.M=M
PokeSize.L=L
PokeSize.S=S
PokeSize.XL=XL
PokeSize.XS=XS
PokeSizeDetailed.AV=AV
PokeSizeDetailed.M=M
PokeSizeDetailed.L=L
PokeSizeDetailed.S=S
PokeSizeDetailed.XL=XL