Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-23 12:33:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add bdsp approximations for min sheen calcs

Browse source 
Closes #3351
This commit is contained in:
Kurt 2021-12-25 18:51:02 -08:00
parent fbb9e0bf0e
commit 9ce0da6c46
3 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
PKHeX.Core/Legality/Core.cs
View file

@ -149,6 +149,18 @@ namespace PKHeX.Core
internal static bool HasVisitedORAS(this PKM pkm, int species) => pkm.InhabitedGeneration(6, species) && (pkm.AO || !pkm.IsUntraded);
internal static bool HasVisitedUSUM(this PKM pkm, int species) => pkm.InhabitedGeneration(7, species) && (pkm.USUM || !pkm.IsUntraded);
internal static bool HasVisitedBDSP(this PKM pkm, int species)
{
if (!pkm.InhabitedGeneration(8, species))
return false;
if (pkm.BDSP)
return true;
if (pkm.IsUntraded)
return false;
var pi = (PersonalInfoBDSP)PersonalTable.BDSP[species];
return pi.IsPresentInGame;
}
/// <summary>
/// Indicates if the moveset is restricted to only the original version.
/// </summary>

6
PKHeX.Core/Legality/Verifiers/ContestStatVerifier.cs
View file

@ -44,7 +44,11 @@ public sealed class ContestStatVerifier : Verifier
// Check for stat values that exceed a valid sheen value.
var initial = GetReferenceTemplate(data.Info.EncounterMatch);
var minSheen = CalculateMinimumSheen(s, pkm.Nature, initial, gen3);
bool bdsp = pkm.HasVisitedBDSP(data.Info.EncounterOriginal.Species);
var minSheen = bdsp
? CalculateMinimumSheen8b(s, pkm.Nature, initial)
: CalculateMinimumSheen(s, pkm.Nature, initial, gen3);
if (s.CNT_Sheen < minSheen)
data.AddLine(GetInvalid(string.Format(LContestSheenTooLow_0, minSheen)));

28
PKHeX.Core/Legality/Verifiers/Misc/ContestStatInfo.cs
View file

@ -5,9 +5,11 @@ namespace PKHeX.Core;
public static class ContestStatInfo
{
private const int WorstFeelBlock = 3;
private const int WorstFeelPoffin = 17;
private const int LowestFeelBlock3 = 3;
private const int LowestFeelPoffin4 = 17;
private const int LowestFeelPoffin8b = 8;
private const int MaxContestStat = 255;
private const int BestSheenStat8b = 160; // using optimal poffins in BD/SP, roughly 160-170; be generous.
public static void SetSuggestedContestStats(this PKM pk, IEncounterTemplate enc)
{
@ -60,7 +62,23 @@ public static class ContestStatInfo
return initial.CNT_Sheen;
// Can get trash poffins by burning and spilling on purpose.
return Math.Min(MaxContestStat, avg * WorstFeelPoffin);
return Math.Min(MaxContestStat, avg * LowestFeelPoffin4);
}
// Slightly better stat:sheen ratio than Gen4; prefer if has visited.
public static int CalculateMinimumSheen8b(IContestStats s, int nature, IContestStats initial)
{
if (s.IsContestEqual(initial))
return initial.CNT_Sheen;
var rawAvg = GetAverageFeel(s, 0, initial);
if (rawAvg == MaxContestStat)
return BestSheenStat8b;
var avg = Math.Max(1, nature % 6 == 0 ? rawAvg : GetAverageFeel(s, nature, initial));
avg = Math.Min(rawAvg, avg); // be generous
return Math.Min(BestSheenStat8b, Math.Max(LowestFeelPoffin8b, avg));
}
public static int CalculateMinimumSheen(IContestStats s, int nature, IContestStats initial, bool pokeBlock3)
@ -75,7 +93,7 @@ public static class ContestStatInfo
var avg = Math.Max(1, nature % 6 == 0 ? rawAvg : GetAverageFeel(s, nature, initial));
avg = Math.Min(rawAvg, avg); // be generous
var worst = pokeBlock3 ? WorstFeelBlock : WorstFeelPoffin;
var worst = pokeBlock3 ? LowestFeelBlock3 : LowestFeelPoffin4;
return Math.Min(MaxContestStat, Math.Max(worst, avg));
}
@ -97,7 +115,7 @@ public static class ContestStatInfo
// Prefer the bad-black-block correlation if more than 3 stats have gains >= 2.
var permit = has3 ? (sum * 21 / 6) : (sum * 19 / 9);
return Math.Min(MaxContestStat, Math.Max(WorstFeelBlock, permit));
return Math.Min(MaxContestStat, Math.Max(LowestFeelBlock3, permit));
}
private static int GetAverageFeel(IContestStats s, int nature, IContestStats initial)