Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-17 05:48:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only boost templates to 60 in wild area

Browse source 
No functional change for legality checks, so should be fine unless you're trying to get tiny edge case stuff.
This commit is contained in:
Kurt 2021-08-06 09:42:27 -07:00
parent 5ec2b12ae5
commit c126cd968a
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8.cs
View file

@ -27,7 +27,7 @@ namespace PKHeX.Core
((PK8)pk).RibbonMarkCurry = true;
base.ApplyDetails(sav, c, pk);
if (Weather is AreaWeather8.Heavy_Fog)
if (Weather is AreaWeather8.Heavy_Fog && EncounterArea8.IsBoostedArea60(Location))
pk.CurrentLevel = pk.Met_Level = EncounterArea8.BoostLevel;
var req = GetRequirement(pk);

4
PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8.cs
View file

@ -35,7 +35,7 @@ namespace PKHeX.Core
{
if (pkm is IDynamaxLevel d && d.DynamaxLevel < DynamaxLevel)
return false;
if (pkm.Met_Level < EncounterArea8.BoostLevel && Weather is AreaWeather8.Heavy_Fog && EncounterArea8.IsWildArea8(Location))
if (pkm.Met_Level < EncounterArea8.BoostLevel && Weather is AreaWeather8.Heavy_Fog && EncounterArea8.IsBoostedArea60(Location))
return false;
return base.IsMatchExact(pkm, evo);
}
@ -43,7 +43,7 @@ namespace PKHeX.Core
protected override void ApplyDetails(ITrainerInfo sav, EncounterCriteria criteria, PKM pk)
{
base.ApplyDetails(sav, criteria, pk);
if (Weather is AreaWeather8.Heavy_Fog)
if (Weather is AreaWeather8.Heavy_Fog && EncounterArea8.IsBoostedArea60(Location))
pk.CurrentLevel = pk.Met_Level = EncounterArea8.BoostLevel;
var req = GetRequirement(pk);

2
PKHeX.Core/Legality/Verifiers/MarkVerifier.cs
View file

@ -68,7 +68,7 @@ namespace PKHeX.Core
{
RibbonIndex.MarkCurry when !IsMarkAllowedCurry(pk, x) => false,
RibbonIndex.MarkFishing when !IsMarkAllowedFishing(x) => false,
RibbonIndex.MarkMisty when pk.Met_Level < EncounterArea8.BoostLevel && EncounterArea8.IsWildArea8(pk.Met_Location) => false,
RibbonIndex.MarkMisty when pk.Met_Level < EncounterArea8.BoostLevel && EncounterArea8.IsBoostedArea60(pk.Met_Location) => false,
RibbonIndex.MarkDestiny => false,
>= RibbonIndex.MarkCloudy and <= RibbonIndex.MarkMisty => IsWeatherPermitted(mark, x),
_ => true