Leahnaya/pkNX
1
0
Fork 0
mirror of https://github.com/kwsch/pkNX.git synced 2026-04-25 15:26:55 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update gg trainers

Browse Source
This commit is contained in:
sora10pls 2018-12-13 15:19:03 -05:00
parent 9e075dccbc
commit 7ee812cd50
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkNX.Randomization/Randomizers/TrainerRandomizer.cs
View File

@ -241,8 +241,8 @@ private static int[] GetRandomMega(Dictionary<int, int[]> megas, out int species
// 3 poke max
private static readonly int[] doubleTrainer =
{
007, 008, 020, 021, 024, 025, 028, 029, 032, 033, 050, 051, // jesse&james
30, 31, // rival vs archer
007, 008, 020, 021, 024, 025, 032, 033, 050, 051, // Jessie & James
028, 029, 030, 031, // Rival vs Archer & Grunt
};
private static Dictionary<int, int> GetFixedCountIndexes(GameVersion game)
@ -252,15 +252,15 @@ private static int[] GetRandomMega(Dictionary<int, int[]> megas, out int species
if (GameVersion.ORAS.Contains(game))
return Legal.ImportantTrainers_ORAS.ToDictionary(z => z, _ => 6);
if (GameVersion.SM.Contains(game))
return Legal.ImportantTrainers_SM.Concat(royal).ToDictionary(z => z, index => royal.Contains(index) ? 1 : 6);
return Legal.ImportantTrainers_SM.ToDictionary(z => z, index => royal.Contains(index) ? 1 : 6);
if (GameVersion.USUM.Contains(game))
return Legal.ImportantTrainers_USUM.Concat(royal).ToDictionary(z => z, index => royal.Contains(index) ? 1 : 6);
return Legal.ImportantTrainers_USUM.ToDictionary(z => z, index => royal.Contains(index) ? 1 : 6);
if (GameVersion.GG.Contains(game))
return Legal.ImportantTrainers_GG.ToDictionary(z => z, index => doubleTrainer.Contains(index) ? 3 : 6);
return new Dictionary<int, int>();
}
private static readonly int[] MasterTrainerGG = Enumerable.Range(72, 381 - 72 + 1).ToArray();
private static readonly int[] MasterTrainerGG = Enumerable.Range(72, 382 - 72 + 1).ToArray();
private static int[] GetSpecialClasses(GameVersion game)
{

4
pkNX.Structures/Legality/Trainers.cs
View File

@ -331,12 +331,8 @@ public static partial class Legal
028, // Gym Leader
032, // Pokémon Trainer
033, // Pokémon Trainer
053, // Coach Trainer
054, // Coach Trainer
057, // Gym Leader
058, // Pokémon Trainer
059, // Coach Trainer
060, // Coach Trainer
061, // Champion
383, // Pokémon Trainer
#endregion