diff options
| author | tom-overton <tom.overton@outlook.com> | 2022-12-30 03:22:20 -0800 |
|---|---|---|
| committer | Rafael Marçalo <raroma09@gmail.com> | 2023-01-03 14:51:44 +0000 |
| commit | 607a03188f864185c10ed74a7bdb8fe366aa809e (patch) | |
| tree | e18d70c01f465a290a806c00886388e8d8bc99ae /src | |
| parent | 8591e9c9fff7e499c824315b4d55277558fecf97 (diff) | |
Add support for enabling Better Movesets without trainer randomization
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/sneed/pkrandom/Randomizer.java | 1 | ||||
| -rw-r--r-- | src/com/sneed/pkrandom/newgui/NewRandomizerGUI.java | 4 | ||||
| -rwxr-xr-x | src/com/sneed/pkrandom/romhandlers/AbstractRomHandler.java | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/com/sneed/pkrandom/Randomizer.java b/src/com/sneed/pkrandom/Randomizer.java index 86462c1..a5622a3 100644 --- a/src/com/sneed/pkrandom/Randomizer.java +++ b/src/com/sneed/pkrandom/Randomizer.java @@ -479,6 +479,7 @@ public class Randomizer { if (settings.isBetterTrainerMovesets()) {
romHandler.pickTrainerMovesets(settings);
+ trainersChanged = true;
trainerMovesetsChanged = true;
}
diff --git a/src/com/sneed/pkrandom/newgui/NewRandomizerGUI.java b/src/com/sneed/pkrandom/newgui/NewRandomizerGUI.java index 7e8a1d6..0ab9245 100644 --- a/src/com/sneed/pkrandom/newgui/NewRandomizerGUI.java +++ b/src/com/sneed/pkrandom/newgui/NewRandomizerGUI.java @@ -2683,6 +2683,7 @@ public class NewRandomizerGUI { tpNoEarlyWonderGuardCheckBox.setVisible(pokemonGeneration >= 3); tpRandomShinyTrainerPokemonCheckBox.setVisible(pokemonGeneration >= 7); tpBetterMovesetsCheckBox.setVisible(pokemonGeneration >= 3); + tpBetterMovesetsCheckBox.setEnabled(pokemonGeneration >= 3); totpPanel.setVisible(pokemonGeneration == 7); if (totpPanel.isVisible()) { @@ -3129,8 +3130,6 @@ public class NewRandomizerGUI { tpSwapMegaEvosCheckBox.setSelected(false); tpRandomShinyTrainerPokemonCheckBox.setEnabled(false); tpRandomShinyTrainerPokemonCheckBox.setSelected(false); - tpBetterMovesetsCheckBox.setEnabled(false); - tpBetterMovesetsCheckBox.setSelected(false); tpDoubleBattleModeCheckBox.setEnabled(false); tpDoubleBattleModeCheckBox.setSelected(false); tpBossTrainersCheckBox.setEnabled(false); @@ -3166,7 +3165,6 @@ public class NewRandomizerGUI { tpSwapMegaEvosCheckBox.setSelected(false); } tpRandomShinyTrainerPokemonCheckBox.setEnabled(true); - tpBetterMovesetsCheckBox.setEnabled(true); tpDoubleBattleModeCheckBox.setEnabled(tpDoubleBattleModeCheckBox.isVisible()); tpBossTrainersCheckBox.setEnabled(tpBossTrainersCheckBox.isVisible()); tpImportantTrainersCheckBox.setEnabled(tpImportantTrainersCheckBox.isVisible()); diff --git a/src/com/sneed/pkrandom/romhandlers/AbstractRomHandler.java b/src/com/sneed/pkrandom/romhandlers/AbstractRomHandler.java index 77223e9..d139998 100755 --- a/src/com/sneed/pkrandom/romhandlers/AbstractRomHandler.java +++ b/src/com/sneed/pkrandom/romhandlers/AbstractRomHandler.java @@ -1939,7 +1939,6 @@ public abstract class AbstractRomHandler implements RomHandler { boolean giveToImportantPokemon = settings.isRandomizeHeldItemsForImportantTrainerPokemon(); boolean giveToRegularPokemon = settings.isRandomizeHeldItemsForRegularTrainerPokemon(); boolean highestLevelOnly = settings.isHighestLevelGetsItemsForTrainers(); - boolean betterMovesets = settings.isBetterTrainerMovesets(); List<Move> moves = this.getMoves(); Map<Integer, List<MoveLearnt>> movesets = this.getMovesLearnt(); |