Leahnaya/pk3DS
1
0
Fork 0
mirror of https://github.com/kwsch/pk3DS.git synced 2026-08-22 17:56:02 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #270 from sora10pls/master

Browse Source 
Revise RSTE levelup move get
This commit is contained in:
Kurt
2017-12-28 16:58:51 -08:00
committed by GitHub
parent 66c18512af 1c4c2b358d
commit 2c41b44960
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pk3DS/Subforms/Gen6/RSTE.cs
View File

@@ -15,6 +15,7 @@ namespace pk3DS
{
public partial class RSTE : Form
{
private readonly LearnsetRandomizer learn = new LearnsetRandomizer(Main.Config, Main.Config.Learnsets);
public RSTE(byte[][] trc, byte[][] trd, byte[][] trp)
{
trclass = trc;
@@ -630,7 +631,7 @@ private void Randomize()
InitializeTrainerTeamInfo(t, rImportant[i] == null);
RandomizeTrainerAIClass(t, trClass);
RandomizeTrainerPrizeItem(t);
RandomizeTeam(t, move, itemvals, type, mevo, typerand);
RandomizeTeam(t, move, learn, itemvals, type, mevo, typerand);
trdata[i] = t.Write();
trpoke[i] = t.WriteTeam();
@@ -639,7 +640,7 @@ private void Randomize()
WinFormsUtil.Alert("Randomized all Trainers according to specification!", "Press the Dump to .TXT button to view the new Trainer information!");
}
private static void RandomizeTeam(trdata6 t, MoveRandomizer move, ushort[] itemvals, int type, bool mevo, bool typerand)
private static void RandomizeTeam(trdata6 t, MoveRandomizer move, LearnsetRandomizer learn, ushort[] itemvals, int type, bool mevo, bool typerand)
{
int last = t.Team.Length - 1;
for (int p = 0; p < t.Team.Length; p++)
@@ -682,12 +683,22 @@ private static void RandomizeTeam(trdata6 t, MoveRandomizer move, ushort[] itemv
else if (rItem)
pk.Item = itemvals[rnd32() % itemvals.Length];
// random
if (rMove)
{
var pkMoves = move.GetRandomMoveset(pk.Species, 4);
for (int m = 0; m < 4; m++)
pk.Moves[m] = (ushort)pkMoves[m];
}
// levelup
if (rNoMove)
{
t.Moves = true;
var pkMoves = learn.GetCurrentMoves(pk.Species, pk.Form, pk.Level, 4);
for (int m = 0; m < 4; m++)
pk.Moves[m] = (ushort)pkMoves[m];
}
}
}
private static void InitializeTrainerTeamInfo(trdata6 t, bool important)