Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-10 22:54:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update gift egg ribbon checking

Browse source 
Closes #1074
Check ribbons for the gift, then check for all ribbons except the ones
already checked.
Refactored out the ribbonset checking methods
This commit is contained in:
Kurt 2017-04-17 19:11:01 -07:00
parent 50753a0d5b
commit bdd5e26adb
2 changed files with 49 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
PKHeX/Legality/Checks.cs
View file

@ -1131,9 +1131,24 @@ namespace PKHeX.Core
List<string> missingRibbons = new List<string>();
List<string> invalidRibbons = new List<string>();
// Check Event Ribbons
var encounterContent = (EncounterMatch as MysteryGift)?.Content ?? EncounterMatch;
var set1 = pkm as IRibbonSet1;
var set2 = pkm as IRibbonSet2;
if (set1 != null)
verifyRibbonSet1(set1, encounterContent, missingRibbons, invalidRibbons);
if (set2 != null)
verifyRibbonSet2(set2, encounterContent, missingRibbons, invalidRibbons);
// Check Unobtainable Ribbons
if (pkm.IsEgg)
{
var RibbonNames = ReflectUtil.getPropertiesStartWithPrefix(pkm.GetType(), "Ribbon");
if (set1 != null)
RibbonNames = RibbonNames.Except(RibbonSetHelper.getRibbonNames(set1));
if (set2 != null)
RibbonNames = RibbonNames.Except(RibbonSetHelper.getRibbonNames(set2));
foreach (object RibbonValue in RibbonNames.Select(RibbonName => ReflectUtil.GetValue(pkm, RibbonName)))
{
if (RibbonValue as bool? == true) // Boolean
@ -1144,50 +1159,6 @@ namespace PKHeX.Core
return;
}
// Check Event Ribbons
var encounterContent = (EncounterMatch as MysteryGift)?.Content ?? EncounterMatch;
var set1 = pkm as IRibbonSet1;
if (set1 != null)
{
var sb = RibbonSetHelper.getRibbonBits(set1);
var enc1 = encounterContent as IRibbonSet1;
var eb = RibbonSetHelper.getRibbonBits(enc1);
if (pkm.Gen3)
eb[0] = sb[0]; // permit Earth Ribbon
if (pkm.Version == 15)
eb[1] = true; // require National Ribbon TODO: shadow pkm only
for (int i = 0; i < sb.Length; i++)
{
if (sb[i] == eb[i]) // valid
continue;
var list = eb[i] ? missingRibbons : invalidRibbons;
list.Add(RibbonSetHelper.getRibbonNames(set1, i));
}
}
var set2 = pkm as IRibbonSet2;
if (set2 != null)
{
var sb = RibbonSetHelper.getRibbonBits(set2);
var enc2 = encounterContent as IRibbonSet2;
var eb = RibbonSetHelper.getRibbonBits(enc2);
if (EncounterMatch is EncounterLink)
eb[0] = true; // require Classic Ribbon
if ((EncounterMatch as EncounterStatic)?.RibbonWishing ?? false)
eb[1] = true; // require Wishing Ribbon
for (int i = 0; i < sb.Length; i++)
{
if (sb[i] == eb[i]) // valid
continue;
var list = eb[i] ? missingRibbons : invalidRibbons;
list.Add(RibbonSetHelper.getRibbonNames(set2, i));
}
}
// Unobtainable ribbons for Gen Origin
if (pkm.GenNumber > 3)
{
@ -1196,7 +1167,7 @@ namespace PKHeX.Core
if (ReflectUtil.getBooleanState(pkm, nameof(PK3.RibbonArtist)) == true)
invalidRibbons.Add(V97); // RSE Master Rank Portrait
}
if (pkm.GenNumber > 4)
if (pkm.Format >= 4 && pkm.GenNumber > 4)
{
if (ReflectUtil.getBooleanState(pkm, nameof(PK4.RibbonChampionSinnoh)) == true)
invalidRibbons.Add(V99); // DPPt HoF
@ -1226,6 +1197,37 @@ namespace PKHeX.Core
result[1] = string.Format(V102, string.Join(", ", invalidRibbons.Select(z => z.Replace("Ribbon", ""))));
AddLine(Severity.Invalid, string.Join(Environment.NewLine, result.Where(s => !string.IsNullOrEmpty(s))), CheckIdentifier.Ribbon);
}
private void verifyRibbonSet1(IRibbonSet1 set1, object encounterContent, List<string> missingRibbons, List<string> invalidRibbons)
{
var names = RibbonSetHelper.getRibbonNames(set1);
var sb = RibbonSetHelper.getRibbonBits(set1);
var eb = RibbonSetHelper.getRibbonBits(encounterContent as IRibbonSet1);
if (pkm.Gen3)
eb[0] = sb[0]; // permit Earth Ribbon
if (pkm.Version == 15)
eb[1] = true; // require National Ribbon TODO: shadow pkm only
for (int i = 0; i < sb.Length; i++)
if (sb[i] != eb[i])
(eb[i] ? missingRibbons : invalidRibbons).Add(names[i]);
}
private void verifyRibbonSet2(IRibbonSet2 set2, object encounterContent, List<string> missingRibbons, List<string> invalidRibbons)
{
var names = RibbonSetHelper.getRibbonNames(set2);
var sb = RibbonSetHelper.getRibbonBits(set2);
var eb = RibbonSetHelper.getRibbonBits(encounterContent as IRibbonSet2);
if (EncounterMatch is EncounterLink)
eb[0] = true; // require Classic Ribbon
if ((EncounterMatch as EncounterStatic)?.RibbonWishing ?? false)
eb[1] = true; // require Wishing Ribbon
for (int i = 0; i < sb.Length; i++)
if (sb[i] != eb[i])
(eb[i] ? missingRibbons : invalidRibbons).Add(names[i]);
}
private void verifyAbility()
{
int[] abilities = pkm.PersonalInfo.Abilities;

2
PKHeX/Legality/Structures/IRibbonSet.cs
View file

@ -69,5 +69,7 @@
public static string getRibbonNames(IRibbonSet1 set, int index) => RibbonNames1[index];
public static string getRibbonNames(IRibbonSet2 set, int index) => RibbonNames2[index];
public static string[] getRibbonNames(IRibbonSet1 set) => RibbonNames1;
public static string[] getRibbonNames(IRibbonSet2 set) => RibbonNames2;
}
}