Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-10-01 09:16:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle link gifts without ribbons

Browse Source 
Link gifts had the possibility of having all those ribbons (even
Event3), but none were used.
This commit is contained in:
Kurt
2017-07-14 20:42:51 -07:00
parent dce42195e5
commit dc0a43ae8f
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PKHeX.Core/Legality/Checks.cs
View File

@@ -1034,8 +1034,6 @@ private static IEnumerable<RibbonResult> VerifyRibbonSet2(PKM pkm, object encoun
var sb = set2.RibbonBits();
var eb = (encounterContent as IRibbonSetEvent4).RibbonBits();
if (encounterContent is EncounterLink)
eb[0] = true; // require Classic Ribbon
if (encounterContent is EncounterStatic s && s.RibbonWishing)
eb[1] = true; // require Wishing Ribbon

15
PKHeX.Core/Legality/Structures/EncounterLink.cs
View File

@@ -1,6 +1,6 @@
namespace PKHeX.Core
{
public class EncounterLink : IEncounterable
public class EncounterLink : IEncounterable, IRibbonSetEvent4
{
public int Species { get; set; }
public int Level { get; set; }
@@ -9,7 +9,6 @@ public class EncounterLink : IEncounterable
public int Location { get; set; } = 30011;
public int Ability { get; set; } = 1;
public int Ball { get; set; } = 4; // Pokéball
public bool Classic { get; set; } = true;
public bool Fateful { get; set; } = false;
public int[] RelearnMoves = new int[4];
public bool? Shiny { get; set; } = false;
@@ -20,5 +19,17 @@ public class EncounterLink : IEncounterable
public bool ORAS { get; set; }
public string Name => "Pokémon Link Gift";
public bool RibbonClassic { get; set; } = true;
// Unused
public bool RibbonWishing { get; set; }
public bool RibbonPremier { get; set; }
public bool RibbonEvent { get; set; }
public bool RibbonBirthday { get; set; }
public bool RibbonSpecial { get; set; }
public bool RibbonWorld { get; set; }
public bool RibbonChampionWorld { get; set; }
public bool RibbonSouvenir { get; set; }
}
}

4
PKHeX.Core/Legality/Tables6.cs
View File

@@ -564,8 +564,8 @@ public static partial class Legal
new EncounterLink { Species = 378, Level = 50, Ability = 4, RelearnMoves = new[] {85, 133, 58, 258}, XY = true, ORAS = true }, // Regice
new EncounterLink { Species = 379, Level = 50, Ability = 4, RelearnMoves = new[] {442, 157, 356, 334}, XY = true, ORAS = true }, // Registeel
new EncounterLink { Species = 208, Level = 40, Ability = 1, Classic = false, ORAS = true, OT = false }, // Steelix
new EncounterLink { Species = 362, Level = 40, Ability = 1, Classic = false, ORAS = true, OT = false }, // Glalie
new EncounterLink { Species = 208, Level = 40, Ability = 1, RibbonClassic = false, ORAS = true, OT = false }, // Steelix
new EncounterLink { Species = 362, Level = 40, Ability = 1, RibbonClassic = false, ORAS = true, OT = false }, // Glalie
};
#endregion