diff options
| author | tom-overton <tom.overton@outlook.com> | 2020-11-03 01:12:02 -0800 |
|---|---|---|
| committer | tom-overton <tom.overton@outlook.com> | 2020-11-03 01:12:02 -0800 |
| commit | 79c74c3ab959a90b05c9220bf38ac3d92b937634 (patch) | |
| tree | f6f1273f3df06fab2dde37ed710901914769dc6f /src/com/dabomstew/pkrandom/newgui | |
| parent | b76c41118dec6419e8a4c2e363f976653b38f9fb (diff) | |
Gen 7: Fully support Limit Pokemon + general cleanup
Diffstat (limited to 'src/com/dabomstew/pkrandom/newgui')
| -rw-r--r-- | src/com/dabomstew/pkrandom/newgui/Bundle.properties | 2 | ||||
| -rw-r--r-- | src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/com/dabomstew/pkrandom/newgui/Bundle.properties b/src/com/dabomstew/pkrandom/newgui/Bundle.properties index 7cc7f51..027bd23 100644 --- a/src/com/dabomstew/pkrandom/newgui/Bundle.properties +++ b/src/com/dabomstew/pkrandom/newgui/Bundle.properties @@ -505,7 +505,7 @@ GUI.stpAllowAltFormesCheckBox.toolTipText=<html>Allow alternate formes of Pokemo GUI.stpSwapMegaEvosCheckBox.text=Swap Mega Evolvables GUI.stpSwapMegaEvosCheckBox.toolTipText=<html>Swap Statics capable of Mega Evolution with another Pokemon capable of Mega Evolution.<br />This affects Lucario in X/Y and Latios/Latias in OR/AS. GUI.tpSwapMegaEvosCheckBox.text=Swap Mega Evolvables -GUI.tpSwapMegaEvosCheckBox.toolTipText=<html>Swap Trainer Pokemon capable of Mega Evolution with another Pokemon capable of Mega Evolution.<br />This only affects Trainer Pokemon that actually hold a Mega Stone (so, for example, it will affect Diantha's Gardevoir but not every Gardevoir). +GUI.tpSwapMegaEvosCheckBox.toolTipText=<html>Swap Trainer Pokemon capable of Mega Evolution with another Pokemon capable of Mega Evolution.<br />This only affects Trainer Pokemon that actually hold a Mega Stone (so, for example, it will affect Diantha's Gardevoir but not every Gardevoir)<br />If the "Limit Pokemon" general option is used to remove all Mega Evolutions from the game, this setting will be disabled. GUI.wpAllowAltFormesCheckBox.text=Allow Alternate Formes GUI.wpAllowAltFormesCheckBox.toolTipText=<html>Allow alternate formes of Pokemon, such as the various formes of Rotom or Deoxys, to appear as Wild Pokemon.<br />Note that their traits are randomized/shuffled separately from their base formes. GUI.tpDoubleBattleModeCheckBox.text=Double Battle Mode diff --git a/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java b/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java index 0a31a86..f68cd9c 100644 --- a/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java +++ b/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java @@ -466,6 +466,10 @@ public class NewRandomizerGUI { romHandler.generationOfPokemon(), romHandler.forceSwapStaticMegaEvos()); if (gld.pressedOK()) { currentRestrictions = gld.getChoice(); + if (currentRestrictions != null && !currentRestrictions.megaEvolutionsAreInPool(romHandler.forceSwapStaticMegaEvos())) { + tpSwapMegaEvosCheckBox.setEnabled(false); + tpSwapMegaEvosCheckBox.setSelected(false); + } } }); limitPokemonCheckBox.addActionListener(e -> enableOrDisableSubControls()); @@ -2832,8 +2836,14 @@ public class NewRandomizerGUI { tpDontUseLegendariesCheckBox.setEnabled(true); tpNoEarlyWonderGuardCheckBox.setEnabled(true); tpAllowAlternateFormesCheckBox.setEnabled(true); - tpSwapMegaEvosCheckBox.setEnabled(true); + tpRandomShinyTrainerPokemonCheckBox.setEnabled(true); + if (currentRestrictions == null || currentRestrictions.megaEvolutionsAreInPool(romHandler.forceSwapStaticMegaEvos())) { + tpSwapMegaEvosCheckBox.setEnabled(true); + } else { + tpSwapMegaEvosCheckBox.setEnabled(false); + tpSwapMegaEvosCheckBox.setSelected(false); + } } if (tpForceFullyEvolvedAtCheckBox.isSelected()) { |