Merge pull request #892 from ReignOfComputer/gen-7-item-checks

Gen 7 Item Legality Checks
This commit is contained in:
Kaphotics
2017-02-26 09:35:37 -08:00
committed by GitHub
3 changed files with 105 additions and 0 deletions

View File

@@ -2823,6 +2823,8 @@ private void validateComboBox2(object sender, EventArgs e)
pkm.Nature = CB_Nature.SelectedIndex;
updateRandomPID(sender, e);
}
if (sender == CB_HeldItem && SAV.Generation == 7)
updateLegality();
}
updateNatureModification(sender, null);
updateIVs(null, null); // updating Nature will trigger stats to update as well

View File

@@ -175,6 +175,9 @@ private void updateChecks()
verifyMisc();
verifyGender();
if (pkm.Format == 7)
verifyItem();
verifyVersionEvolution();
// SecondaryChecked = true;
}

View File

@@ -69,6 +69,106 @@ private void verifyGender()
// return;
}
}
private void verifyItem()
{
int[] unreleasedItems =
{
16, // Cherish Ball
64, // Fluffy Tail
65, // Blue Flute
66, // Yellow Flute
67, // Red Flute
68, // Black Flute
69, // White Flute
70, // Shoal Salt
71, // Shoal Shell
99, // Root Fossil
100, // Claw Fossil
101, // Helix Fossil
102, // Dome Fossil
103, // Old Amber
111, // Odd Keystone
164, // Razz Berry
166, // Nanab Berry
167, // Wepear Berry
175, // Cornn Berry
176, // Magost Berry
177, // Rabuta Berry
178, // Nomel Berry
179, // Spelon Berry
180, // Pamtre Berry
181, // Watmel Berry
182, // Durin Berry
183, // Belue Berry
208, // Enigma Berry
209, // Micle Berry
210, // Custap Berry
211, // Jaboca Berry
212, // Rowap Berry
215, // Macho Brace
260, // Red Scarf
261, // Blue Scarf
262, // Pink Scarf
263, // Green Scarf
264, // Yellow Scarf
548, // Fire Gem
549, // Water Gem
550, // Electric Gem
551, // Grass Gem
552, // Ice Gem
553, // Fighting Gem
554, // Poison Gem
555, // Ground Gem
556, // Flying Gem
557, // Psychic Gem
558, // Bug Gem
559, // Rock Gem
560, // Ghost Gem
561, // Dragon Gem
562, // Dark Gem
563, // Steel Gem
657, // Gardevoirite
658, // Ampharosite
662, // Mewtwonite X
663, // Mewtwonite Y
664, // Blazikenite
665, // Medichamite
666, // Houndoominite
667, // Aggronite
668, // Banettite
669, // Tyranitarite
674, // Abomasite
680, // Heracronite
681, // Mawilite
682, // Manectite
684, // Latiasite
685, // Latiosite
710, // Jaw Fossil
711, // Sail Fossil
715, // Fairy Gem
752, // Swamperite
753, // Sceptilite
755, // Altarianite
756, // Galladite
757, // Audinite
761, // Steelixite
762, // Pidgeotite
764, // Diancite
767, // Cameruptite
768, // Lopunnite
770, // Beeddrillite
802, // Marshadium Z
836, // Pikashunium Z
};
if (unreleasedItems.Contains(pkm.HeldItem))
{
AddLine(Severity.Invalid, "Held item is unreleased for Gen 7.", CheckIdentifier.Form);
return;
}
}
private void verifyECPID()
{
if (pkm.EncryptionConstant == 0)