mirror of
https://github.com/kwsch/pk3DS.git
synced 2026-09-08 01:55:37 -05:00
Fix Gen 6 AI mod (#295)
This commit is contained in:
@@ -743,10 +743,8 @@ private static void RandomizeTrainerAIClass(trdata6 t, string[] trClass)
|
||||
{
|
||||
if (rDiffAI)
|
||||
t.AI |= 7; // Set first 3 bits, keep any other flag if present
|
||||
if (rOnlySingles)
|
||||
t.AI &= 7;
|
||||
|
||||
if (rClass && rModelRestricted.Contains(t.Class)) // shuffle classes with 3D models
|
||||
if (rClass && rModelRestricted.Contains(t.Class) && !rIgnoreClass.Contains(t.Class)) // shuffle classes with 3D models
|
||||
{
|
||||
int randClass() => (int) (rnd32() % rModelRestricted.Length);
|
||||
t.Class = rModelRestricted[randClass()];
|
||||
@@ -808,7 +806,7 @@ private string[] GetTagsORAS()
|
||||
|
||||
// Magma Admins
|
||||
TagTrainer(tags, "MAGMA1", 235, 236, 271); // Maxie
|
||||
TagTrainer(tags, "MAGMA2", 694, 695, 696, 697, 698); // Courney
|
||||
TagTrainer(tags, "MAGMA2", 694, 695, 696, 697, 698); // Courtney
|
||||
TagTrainer(tags, "MAGMA3", 691, 692, 693); // Tabitha
|
||||
|
||||
// Gym Leaders
|
||||
@@ -987,4 +985,4 @@ private void gotoParty(object sender, EventArgs e)
|
||||
tabControl1.SelectedIndex = 1 + Array.IndexOf(new[]{PB_Team1, PB_Team2, PB_Team3, PB_Team4, PB_Team5, PB_Team6,}, sender as PictureBox);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user