Skip to content

fix: PKM convert issues from G7b games #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chnapy merged 1 commit into from
Aug 25, 2026
+29 −11
Merged

fix: PKM convert issues from G7b games #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions PKVault.Backend/storage/services/PkmConvertService/PK7Converter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,24 @@ public PK7 ConvertToPK7(PB7 pb7, PKMRndValues? rndValues)
{
byte convertAVToEV(float value) => (byte)(value * EffortValues.Max252 / 200);

byte[] evs = [
convertAVToEV(pb7.AV_HP),
convertAVToEV(pb7.AV_ATK),
convertAVToEV(pb7.AV_DEF),
convertAVToEV(pb7.AV_SPA),
convertAVToEV(pb7.AV_SPD),
convertAVToEV(pb7.AV_SPE),
];

var ratio = (float)EffortValues.Max510 / evs.Sum(q => q);
if (ratio < 1)
{
for(var i = 0; i < evs.Length; i++)
{
evs[i] = (byte)(evs[i] * ratio);
}
}

var pk7 = new PK7()
{
Version = GameVersion.SN,
Expand All @@ -207,12 +225,12 @@ public PK7 ConvertToPK7(PB7 pb7, PKMRndValues? rndValues)
// EggLocation = Locations.LinkTrade6,
// EggMetDate = pk7.MetDate ?? EncounterDate.GetDateSwitch(),

EV_HP = convertAVToEV(pb7.AV_HP),
EV_ATK = convertAVToEV(pb7.AV_ATK),
EV_DEF = convertAVToEV(pb7.AV_DEF),
EV_SPA = convertAVToEV(pb7.AV_SPA),
EV_SPD = convertAVToEV(pb7.AV_SPD),
EV_SPE = convertAVToEV(pb7.AV_SPE),
EV_HP = evs[0],
EV_ATK = evs[1],
EV_DEF = evs[2],
EV_SPA = evs[3],
EV_SPD = evs[4],
EV_SPE = evs[5],

PokerusState = pb7.PokerusState,
};
Expand Down
5 changes: 0 additions & 5 deletions PKVault.Backend/storage/services/PkmConvertService/PKMConverterUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,6 @@ public void CopyMovesFrom(PKM pkm, PKM pkmSrc)

public void CopyCommonPropertiesFrom(PKM pkm, PKM pkmSrc, byte generation, PKMRndValues? rndValues)
{
if (pkmSrc.Species > pkm.MaxSpeciesID)
{
throw new InvalidOperationException($"Species incompatible: {pkmSrc.Species} > {pkm.MaxSpeciesID}");
}

pkm.Species = pkmSrc.Species;
pkm.Gender = pkmSrc.Gender;
pkm.Form = pkmSrc.Form;
Expand Down
5 changes: 5 additions & 0 deletions PKVault.Backend/storage/services/PkmConvertService/PkmConvertService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ public ImmutablePKM ConvertTo(ImmutablePKM sourcePkm, Type targetPkmType, PKMRnd
throw new Exception($"Convert failed, Species=0");
}

if (sourcePkm.Species > result.MaxSpeciesID)
{
throw new InvalidOperationException($"Species incompatible: {sourcePkm.Species} > {result.MaxSpeciesID}");
}

return new(result);
}

Expand Down
Loading