Leahnaya/pkNX
1
0
Fork 0
mirror of https://github.com/kwsch/pkNX.git synced 2026-10-02 14:16:55 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

check stab move count instead of ignoring setting

Browse Source 
thanks @sora10pls
This commit is contained in:
Kurt
2018-12-07 16:39:16 -08:00
parent 3eb375d0ce
commit 727b3cd711
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkNX.Randomization/Randomizers/MoveRandomizer.cs
View File

@@ -64,7 +64,7 @@ public int[] GetRandomMoveset(int[] Types, int movecount = 4)
int[] moves;
do { moves = GetRandomMoves(Types, movecount); }
while (!IsMovesetMeetingRequirements(moves, movecount) && loopctr++ <= maxLoop);
while (!IsMovesetMeetingRequirements(moves, Types, movecount) && loopctr++ <= maxLoop);
return moves;
}
@@ -92,11 +92,14 @@ private int GetRandomSTABMove(int[] types)
return move;
}
private bool IsMovesetMeetingRequirements(int[] moves, int count)
private bool IsMovesetMeetingRequirements(int[] moves, int[] types, int count)
{
if (Settings.DMG && Settings.DMGCount > moves.Count(move => MoveData[move].Category != 0))
return false;
if (Settings.STAB && Settings.STABCount > moves.Count(move => types.Contains(MoveData[move].Type)))
return false;
if (moves.Any(Settings.BannedMoves.Contains))
return false;