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

Reconfigure RSTE species randomization

Browse Source 
Fixes the hang bug that was reported, and includes new improvements:

Assigning a new species is done within the same line as assigning the
pkm info for visual ease.

Enabled BST (smart) randomization for type themed trainers, and
implemented an expanding window if the initial search stat range is
insufficient.

Could probably speed up things by just defining a full personal array
instead of fetching every time, but whatever.
This commit is contained in:
Kurt
2015-10-16 19:07:11 -07:00
parent da74d15523
commit 2b7a09042c
2 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pk3DS/Subforms/RSTE.cs
View File

@@ -405,7 +405,7 @@ private void showTeams(int i)
{
if (tr == null) return;
if (i >= tr.Team.Length) { pba[i].Image = null; return; }
Bitmap rawImg = (Bitmap)Util.getSprite(tr.Team[i].Species, tr.Team[i].Form, tr.Team[i].Gender, tr.Team[i].Item);
Bitmap rawImg = Util.getSprite(tr.Team[i].Species, tr.Team[i].Form, tr.Team[i].Gender, tr.Team[i].Item);
pba[i].Image = Util.scaleImage(rawImg, 2);
}
private void showText()
@@ -642,7 +642,6 @@ private void Randomize()
int type = GetRandomType(i);
bool mevo = rEnsureMEvo.Contains(i);
// Randomize Pokemon
for (int p = 0; p < CB_numPokemon.SelectedIndex; p++)
{
@@ -651,35 +650,34 @@ private void Randomize()
if (rPKM)
{
// randomize pokemon
int species = Randomizer.getRandomSpecies(ref sL, ref ctr);
pkm = new PersonalInfo(personal[species]);
int species;
pkm = new PersonalInfo(personal[species = Randomizer.getRandomSpecies(ref sL, ref ctr)]);
if (rTypeTheme)
{
while (pkm.Types[0] != type && pkm.Types[1] != type || (mevo && p == CB_numPokemon.SelectedIndex - 1 && !megaEvos.Contains(species)))
{
int tries = 0;
while ((pkm.Types[0] != type && pkm.Types[1] != type) || ((mevo && p == CB_numPokemon.SelectedIndex - 1 && !megaEvos.Contains(species))))
if (p == CB_numPokemon.SelectedIndex - 1 && mevo)
{
species = GetRandomMegaEvolvablePokemon(type);
}
pkm = new PersonalInfo(personal[species = GetRandomMegaEvolvablePokemon(type)]);
else if (rSmart) // Get a new Pokemon with a close BST
{
while (!(pkm.BST * 5 / 6 < oldpkm.BST && pkm.BST * 6 / 5 > oldpkm.BST))
{ species = sL[rand.Next(1, sL.Length)]; pkm = new PersonalInfo(personal[species]); }
pkm = new PersonalInfo(personal[species = Randomizer.getRandomSpecies(ref sL, ref ctr)]);
while (!((pkm.BST * (5 - ++tries / 722) / 6 < oldpkm.BST) && (pkm.BST * (6 + ++tries / 722) / 5) > oldpkm.BST))
{
pkm = new PersonalInfo(personal[species = Randomizer.getRandomSpecies(ref sL, ref ctr)]);
}
}
else
{
species = Randomizer.getRandomSpecies(ref sL, ref ctr);
}
}
pkm = new PersonalInfo(personal[species = Randomizer.getRandomSpecies(ref sL, ref ctr)]);
}
else if (p == CB_numPokemon.SelectedIndex - 1 && mevo)
{
species = megaEvos[rnd32() % megaEvos.Length];
}
pkm = new PersonalInfo(personal[species = megaEvos[rnd32() % megaEvos.Length]]);
else if (rSmart) // Get a new Pokemon with a close BST
{
while (!(pkm.BST * 5 / 6 < oldpkm.BST && pkm.BST * 6 / 5 > oldpkm.BST))
{ species = sL[rand.Next(1, sL.Length)]; pkm = new PersonalInfo(personal[species]); }
int tries = 0;
while (!((pkm.BST * (5 - ++tries / 722) / 6 < oldpkm.BST) && (pkm.BST * (6 + ++tries / 722) / 5) > oldpkm.BST))
{
pkm = new PersonalInfo(personal[species = Randomizer.getRandomSpecies(ref sL, ref ctr)]);
}
}
trpk_pkm[p].SelectedIndex = species;

3
pk3DS/Subforms/TrainerRand.cs
View File

@@ -114,10 +114,7 @@ private void changeGiftPercent(object sender, EventArgs e)
private void CHK_TypeTheme_CheckedChanged(object sender, EventArgs e)
{
CHK_BST.Enabled = !CHK_TypeTheme.Checked;
CHK_GymTrainers.Enabled = CHK_GymTrainers.Checked = CHK_TypeTheme.Checked;
if (CHK_TypeTheme.Checked)
CHK_BST.Checked = false;
}
private void CHK_RandomClass_CheckedChanged(object sender, EventArgs e)