summaryrefslogtreecommitdiff
path: root/src/com/sneed/pkrandom/newgui
diff options
context:
space:
mode:
authorAjarmar <axel.jarmar@gmail.com>2022-05-08 23:52:01 +0200
committerrafa_99 <raroma09@gmail.com>2022-06-12 19:28:15 +0100
commit363b24f9153f32627802089eee7900d5749e410e (patch)
treebf170e51c43828f8030e0c15e56c30de496e3495 /src/com/sneed/pkrandom/newgui
parent76431f3f79463ecdf3e46031d596e12996d6e471 (diff)
add "better trainer movesets" setting
Diffstat (limited to 'src/com/sneed/pkrandom/newgui')
-rw-r--r--src/com/sneed/pkrandom/newgui/Bundle.properties2
-rw-r--r--src/com/sneed/pkrandom/newgui/NewRandomizerGUI.form11
-rw-r--r--src/com/sneed/pkrandom/newgui/NewRandomizerGUI.java10
3 files changed, 23 insertions, 0 deletions
diff --git a/src/com/sneed/pkrandom/newgui/Bundle.properties b/src/com/sneed/pkrandom/newgui/Bundle.properties
index 80bae63..a594026 100644
--- a/src/com/sneed/pkrandom/newgui/Bundle.properties
+++ b/src/com/sneed/pkrandom/newgui/Bundle.properties
@@ -627,4 +627,6 @@ GUI.pbsAssignEvoStatsRandomlyCheckBox.text=Randomize Added Stats on Evolution
GUI.pbsAssignEvoStatsRandomlyCheckBox.tooltipText=<html>When a Pokemon evolves, the additional BST it gains will be assigned randomly on top of the pre-evo's stats <br />instead of the evolved Pokemon having the exact same ratio between its stats as the pre-evo.<br /><br />Applies to both regular Evolutions and Mega Evolutions (only if "Follow Evolutions"/"Follow Mega Evolutions" is selected).
GUI.tpEliteFourUniquePokemonCheckBox.text=Elite Four Have Unique Pokemon:
GUI.tpEliteFourUniquePokemonCheckBox.toolTipText=<html>Enabling this setting will ensure that Elite Four Trainers (including Champions and BW1 N/Ghetsis) <br />are given the specified number of unique Pokemon that will not appear on any other Trainer.<br />The Elite Four Trainers' highest level Pokemon are the ones that will be unique;<br/>in the case of a level tie, it will be the Pokemon further back in the party.<br />Does not apply to postgame Elite Four battles.
+GUI.tpBetterMovesetsCheckBox.text=Better Movesets
+GUI.tpBetterMovesetsCheckBox.toolTipText=<html>Attempts to give Trainer Pokemon better movesets by including TM moves/tutor moves/egg moves/pre-evolution moves,<br />and picking moves that synergize with the Pokemon's ability/stats/other moves.
diff --git a/src/com/sneed/pkrandom/newgui/NewRandomizerGUI.form b/src/com/sneed/pkrandom/newgui/NewRandomizerGUI.form
index 5f2abda..3aeba23 100644
--- a/src/com/sneed/pkrandom/newgui/NewRandomizerGUI.form
+++ b/src/com/sneed/pkrandom/newgui/NewRandomizerGUI.form
@@ -1913,6 +1913,17 @@
<toolTipText resource-bundle="com/sneed/pkrandom/newgui/Bundle" key="GUI.tpHighestLevelGetsItemCheckBox.tooltip"/>
</properties>
</component>
+ <component id="21090" class="javax.swing.JCheckBox" binding="tpBetterMovesetsCheckBox">
+ <constraints>
+ <grid row="3" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ <gridbag weightx="0.0" weighty="0.0"/>
+ </constraints>
+ <properties>
+ <enabled value="false"/>
+ <text resource-bundle="com/dabomstew/pkrandom/newgui/Bundle" key="GUI.tpBetterMovesetsCheckBox.text"/>
+ <toolTipText resource-bundle="com/dabomstew/pkrandom/newgui/Bundle" key="GUI.tpBetterMovesetsCheckBox.toolTipText"/>
+ </properties>
+ </component>
</children>
</grid>
<hspacer id="66d2">
diff --git a/src/com/sneed/pkrandom/newgui/NewRandomizerGUI.java b/src/com/sneed/pkrandom/newgui/NewRandomizerGUI.java
index fdb05ad..7521dd9 100644
--- a/src/com/sneed/pkrandom/newgui/NewRandomizerGUI.java
+++ b/src/com/sneed/pkrandom/newgui/NewRandomizerGUI.java
@@ -293,6 +293,7 @@ public class NewRandomizerGUI {
private JRadioButton peRandomEveryLevelRadioButton;
private JCheckBox miscFastDistortionWorldCheckBox;
private JComboBox tpComboBox;
+ private JCheckBox tpBetterMovesetsCheckBox;
private static JFrame frame;
@@ -1372,6 +1373,7 @@ public class NewRandomizerGUI {
tpHighestLevelGetsItemCheckBox.setSelected(settings.isHighestLevelGetsItemsForTrainers());
tpRandomShinyTrainerPokemonCheckBox.setSelected(settings.isShinyChance());
+ tpBetterMovesetsCheckBox.setSelected(settings.isBetterTrainerMovesets());
totpUnchangedRadioButton.setSelected(settings.getTotemPokemonMod() == Settings.TotemPokemonMod.UNCHANGED);
totpRandomRadioButton.setSelected(settings.getTotemPokemonMod() == Settings.TotemPokemonMod.RANDOM);
@@ -1600,6 +1602,7 @@ public class NewRandomizerGUI {
settings.setAdditionalImportantTrainerPokemon(tpImportantTrainersCheckBox.isVisible() && tpImportantTrainersCheckBox.isSelected() ? (int)tpImportantTrainersSpinner.getValue() : 0);
settings.setAdditionalRegularTrainerPokemon(tpRegularTrainersCheckBox.isVisible() && tpRegularTrainersCheckBox.isSelected() ? (int)tpRegularTrainersSpinner.getValue() : 0);
settings.setShinyChance(tpRandomShinyTrainerPokemonCheckBox.isVisible() && tpRandomShinyTrainerPokemonCheckBox.isSelected());
+ settings.setBetterTrainerMovesets(tpBetterMovesetsCheckBox.isVisible() && tpBetterMovesetsCheckBox.isSelected());
settings.setRandomizeHeldItemsForBossTrainerPokemon(tpBossTrainersItemsCheckBox.isVisible() && tpBossTrainersItemsCheckBox.isSelected());
settings.setRandomizeHeldItemsForImportantTrainerPokemon(tpImportantTrainersItemsCheckBox.isVisible() && tpImportantTrainersItemsCheckBox.isSelected());
settings.setRandomizeHeldItemsForRegularTrainerPokemon(tpRegularTrainersItemsCheckBox.isVisible() && tpRegularTrainersItemsCheckBox.isSelected());
@@ -2180,6 +2183,9 @@ public class NewRandomizerGUI {
tpHighestLevelGetsItemCheckBox.setSelected(false);
tpRandomShinyTrainerPokemonCheckBox.setVisible(true);
tpRandomShinyTrainerPokemonCheckBox.setEnabled(false);
+ tpBetterMovesetsCheckBox.setVisible(true);
+ tpBetterMovesetsCheckBox.setEnabled(false);
+ tpBetterMovesetsCheckBox.setSelected(false);
totpPanel.setVisible(true);
totpAllyPanel.setVisible(true);
totpAuraPanel.setVisible(true);
@@ -2669,6 +2675,7 @@ public class NewRandomizerGUI {
tpRandomizeTrainerClassNamesCheckBox.setEnabled(true);
tpNoEarlyWonderGuardCheckBox.setVisible(pokemonGeneration >= 3);
tpRandomShinyTrainerPokemonCheckBox.setVisible(pokemonGeneration >= 7);
+ tpBetterMovesetsCheckBox.setVisible(pokemonGeneration >= 3);
totpPanel.setVisible(pokemonGeneration == 7);
if (totpPanel.isVisible()) {
@@ -3112,6 +3119,8 @@ 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);
@@ -3147,6 +3156,7 @@ public class NewRandomizerGUI {
tpSwapMegaEvosCheckBox.setSelected(false);
}
tpRandomShinyTrainerPokemonCheckBox.setEnabled(true);
+ tpBetterMovesetsCheckBox.setEnabled(true);
tpDoubleBattleModeCheckBox.setEnabled(tpDoubleBattleModeCheckBox.isVisible());
tpBossTrainersCheckBox.setEnabled(tpBossTrainersCheckBox.isVisible());
tpImportantTrainersCheckBox.setEnabled(tpImportantTrainersCheckBox.isVisible());
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 17:43:18 +0000