Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-26 17:56:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update EncounterSlot8.cs

Browse Source 
Closes #3232
This commit is contained in:
Kurt
2021-07-09 10:09:57 -07:00
parent 85c500529e
commit aeb83c8269
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8.cs
View File

@@ -19,16 +19,20 @@ public EncounterSlot8(EncounterArea8 area, int species, int form, int min, int m
protected override void ApplyDetails(ITrainerInfo sav, EncounterCriteria criteria, PKM pk)
{
base.ApplyDetails(sav, criteria, pk);
if (Location is 30 or 54 && !((EncounterArea8)Area).PermitCrossover && (Weather & AreaWeather8.Fishing) == 0)
bool symbol = ((EncounterArea8)Area).PermitCrossover;
var c = symbol ? EncounterCriteria.Unrestricted : criteria;
if (!symbol && Location is 30 or 54 && (Weather & AreaWeather8.Fishing) == 0)
((PK8)pk).RibbonMarkCurry = true;
base.ApplyDetails(sav, c, pk);
var req = GetRequirement(pk);
if (req != MustHave)
{
pk.SetRandomEC();
return;
}
Overworld8RNG.ApplyDetails(pk, criteria);
if (symbol)
Overworld8RNG.ApplyDetails(pk, c, c.Shiny);
}
public OverworldCorrelation8Requirement GetRequirement(PKM pk)