summaryrefslogtreecommitdiff
path: root/src/com/dabomstew/pkrandom/newgui
diff options
context:
space:
mode:
authorAjarmar <axel.jarmar@gmail.com>2021-03-03 19:37:21 +0100
committerAjarmar <axel.jarmar@gmail.com>2021-03-03 19:37:21 +0100
commit2d5a752b49a7d4895dd1c278b81c595ba90e74f0 (patch)
tree65d8ff0d0863042e3abac1c0328d9a120491feec /src/com/dabomstew/pkrandom/newgui
parent596bb6de30b36f8474d2d9e504f94ce6f838cf8e (diff)
changed "limit musketeers" to "limit main-game legendaries"
Diffstat (limited to 'src/com/dabomstew/pkrandom/newgui')
-rw-r--r--src/com/dabomstew/pkrandom/newgui/Bundle.properties4
-rw-r--r--src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.form6
-rw-r--r--src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java32
3 files changed, 21 insertions, 21 deletions
diff --git a/src/com/dabomstew/pkrandom/newgui/Bundle.properties b/src/com/dabomstew/pkrandom/newgui/Bundle.properties
index 56fc225..0812177 100644
--- a/src/com/dabomstew/pkrandom/newgui/Bundle.properties
+++ b/src/com/dabomstew/pkrandom/newgui/Bundle.properties
@@ -105,8 +105,8 @@ GUI.stpRandomCompletelyRadioButton.toolTipText=<html>Selecting this will replace
GUI.stpRandomCompletelyRadioButton.text=Random (completely)
GUI.stpRandomSimilarStrengthRadioButton.toolTipText=<html>Selecting this will replace every static Pokemon encounter with a Pokemon of similar strength
GUI.stpRandomSimilarStrengthRadioButton.text=Random (similar strength)
-GUI.stpLimitMusketeersCheckBox.toolTipText=<html>Check this to limit the upper BST on newly randomized pokemon at Musketeers' location to their original BST (580)
-GUI.stpLimitMusketeersCheckBox.text=Limit Musketeers
+GUI.stpLimitMainGameLegendariesCheckBox.toolTipText=<html>Selecting this will set an upper BST limit on what main-game Legendary Pokemon can be randomized into, and also expand the window for what counts <br />as "Similar Strength" for those Pokemon.<br /><br />This only applies to main-game Legendary Pokemon that are catchable and that are directly in your way during the main game, so some Pokemon<br />like Kyurem-B/Kyurem-W in BW2 (not catchable) and Rayquaza in Emerald (have to go out of your way to catch) are not included.
+GUI.stpLimitMainGameLegendariesCheckBox.text=Limit Main-Game Legendaries
GUI.stpRandomize600BSTCheckBox.toolTipText=<html>Check this to enforce pure random on all static Pokemon with 600+ BST
GUI.stpRandomize600BSTCheckBox.text=Randomize 600+ BST
GUI.igtPanel.title=In-Game Trades
diff --git a/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.form b/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.form
index 3be2fd5..22a5693 100644
--- a/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.form
+++ b/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.form
@@ -1018,15 +1018,15 @@
<toolTipText resource-bundle="com/dabomstew/pkrandom/newgui/Bundle" key="GUI.stpAllowAltFormesCheckBox.toolTipText"/>
</properties>
</component>
- <component id="cde9e" class="javax.swing.JCheckBox" binding="stpLimitMusketeersCheckBox">
+ <component id="cde9e" class="javax.swing.JCheckBox" binding="stpLimitMainGameLegendariesCheckBox">
<constraints>
<grid row="3" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<gridbag weightx="1.0" weighty="0.0"/>
</constraints>
<properties>
<enabled value="false"/>
- <text resource-bundle="com/dabomstew/pkrandom/newgui/Bundle" key="GUI.stpLimitMusketeersCheckBox.text"/>
- <toolTipText resource-bundle="com/dabomstew/pkrandom/newgui/Bundle" key="GUI.stpLimitMusketeersCheckBox.toolTipText"/>
+ <text resource-bundle="com/dabomstew/pkrandom/newgui/Bundle" key="GUI.stpLimitMainGameLegendariesCheckBox.text"/>
+ <toolTipText resource-bundle="com/dabomstew/pkrandom/newgui/Bundle" key="GUI.stpLimitMainGameLegendariesCheckBox.toolTipText"/>
</properties>
</component>
</children>
diff --git a/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java b/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java
index 92d0793..c5ff2fb 100644
--- a/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java
+++ b/src/com/dabomstew/pkrandom/newgui/NewRandomizerGUI.java
@@ -41,8 +41,6 @@ import java.awt.*;
import java.awt.event.*;
import java.awt.image.BufferedImage;
import java.io.*;
-import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryPoolMXBean;
import java.net.HttpURLConnection;
import java.net.URI;
import java.net.URL;
@@ -53,9 +51,6 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
-import static com.dabomstew.pkrandom.pokemon.ExpCurve.MEDIUM_FAST;
-import static com.dabomstew.pkrandom.pokemon.ExpCurve.MEDIUM_SLOW;
-
public class NewRandomizerGUI {
private JTabbedPane tabbedPane1;
private JCheckBox raceModeCheckBox;
@@ -106,7 +101,7 @@ public class NewRandomizerGUI {
private JRadioButton stpSwapLegendariesSwapStandardsRadioButton;
private JRadioButton stpRandomCompletelyRadioButton;
private JRadioButton stpRandomSimilarStrengthRadioButton;
- private JCheckBox stpLimitMusketeersCheckBox;
+ private JCheckBox stpLimitMainGameLegendariesCheckBox;
private JCheckBox stpRandomize600BSTCheckBox;
private JRadioButton igtUnchangedRadioButton;
private JRadioButton igtRandomizeGivenPokemonOnlyRadioButton;
@@ -1397,7 +1392,7 @@ public class NewRandomizerGUI {
.setSelected(settings.getStaticPokemonMod() == Settings.StaticPokemonMod.COMPLETELY_RANDOM);
stpRandomSimilarStrengthRadioButton
.setSelected(settings.getStaticPokemonMod() == Settings.StaticPokemonMod.SIMILAR_STRENGTH);
- stpLimitMusketeersCheckBox.setSelected(settings.isLimitMusketeers());
+ stpLimitMainGameLegendariesCheckBox.setSelected(settings.isLimitMainGameLegendaries());
stpRandomize600BSTCheckBox.setSelected(settings.isLimit600());
stpAllowAltFormesCheckBox.setSelected(settings.isAllowStaticAltFormes());
stpSwapMegaEvosCheckBox.setSelected(settings.isSwapStaticMegaEvos());
@@ -1596,7 +1591,7 @@ public class NewRandomizerGUI {
settings.setStaticPokemonMod(stpUnchangedRadioButton.isSelected(), stpSwapLegendariesSwapStandardsRadioButton.isSelected(),
stpRandomCompletelyRadioButton.isSelected(), stpRandomSimilarStrengthRadioButton.isSelected());
- settings.setLimitMusketeers(stpLimitMusketeersCheckBox.isSelected() && stpLimitMusketeersCheckBox.isVisible());
+ settings.setLimitMainGameLegendaries(stpLimitMainGameLegendariesCheckBox.isSelected() && stpLimitMainGameLegendariesCheckBox.isVisible());
settings.setLimit600(stpRandomize600BSTCheckBox.isSelected());
settings.setAllowStaticAltFormes(stpAllowAltFormesCheckBox.isSelected() && stpAllowAltFormesCheckBox.isVisible());
settings.setSwapStaticMegaEvos(stpSwapMegaEvosCheckBox.isSelected() && stpSwapMegaEvosCheckBox.isVisible());
@@ -1940,9 +1935,9 @@ public class NewRandomizerGUI {
stpPercentageLevelModifierSlider.setVisible(true);
stpPercentageLevelModifierSlider.setEnabled(false);
stpPercentageLevelModifierSlider.setValue(0);
- stpLimitMusketeersCheckBox.setVisible(true);
- stpLimitMusketeersCheckBox.setEnabled(false);
- stpLimitMusketeersCheckBox.setSelected(false);
+ stpLimitMainGameLegendariesCheckBox.setVisible(true);
+ stpLimitMainGameLegendariesCheckBox.setEnabled(false);
+ stpLimitMainGameLegendariesCheckBox.setSelected(false);
stpRandomize600BSTCheckBox.setVisible(true);
stpRandomize600BSTCheckBox.setEnabled(false);
stpRandomize600BSTCheckBox.setSelected(false);
@@ -2482,7 +2477,8 @@ public class NewRandomizerGUI {
stpSwapLegendariesSwapStandardsRadioButton.setEnabled(true);
stpRandomCompletelyRadioButton.setEnabled(true);
stpRandomSimilarStrengthRadioButton.setEnabled(true);
- stpLimitMusketeersCheckBox.setVisible(pokemonGeneration == 5);
+ stpLimitMainGameLegendariesCheckBox.setVisible(pokemonGeneration >= 3);
+ stpLimitMainGameLegendariesCheckBox.setEnabled(false);
stpAllowAltFormesCheckBox.setVisible(romHandler.hasStaticAltFormes());
stpSwapMegaEvosCheckBox.setVisible(pokemonGeneration == 6 && !romHandler.forceSwapStaticMegaEvos());
stpPercentageLevelModifierCheckBox.setVisible(pokemonGeneration >= 3);
@@ -2494,7 +2490,7 @@ public class NewRandomizerGUI {
stpRandomCompletelyRadioButton.setVisible(false);
stpRandomSimilarStrengthRadioButton.setVisible(false);
stpRandomize600BSTCheckBox.setVisible(false);
- stpLimitMusketeersCheckBox.setVisible(false);
+ stpLimitMainGameLegendariesCheckBox.setVisible(false);
stpPercentageLevelModifierCheckBox.setVisible(false);
stpPercentageLevelModifierSlider.setVisible(false);
}
@@ -2833,8 +2829,6 @@ public class NewRandomizerGUI {
}
if (stpUnchangedRadioButton.isSelected()) {
- stpLimitMusketeersCheckBox.setEnabled(false);
- stpLimitMusketeersCheckBox.setSelected(false);
stpRandomize600BSTCheckBox.setEnabled(false);
stpRandomize600BSTCheckBox.setSelected(false);
stpAllowAltFormesCheckBox.setEnabled(false);
@@ -2842,12 +2836,18 @@ public class NewRandomizerGUI {
stpSwapMegaEvosCheckBox.setEnabled(false);
stpSwapMegaEvosCheckBox.setSelected(false);
} else {
- stpLimitMusketeersCheckBox.setEnabled(true);
stpRandomize600BSTCheckBox.setEnabled(true);
stpAllowAltFormesCheckBox.setEnabled(true);
stpSwapMegaEvosCheckBox.setEnabled(true);
}
+ if (stpRandomSimilarStrengthRadioButton.isSelected()) {
+ stpLimitMainGameLegendariesCheckBox.setEnabled(true);
+ } else {
+ stpLimitMainGameLegendariesCheckBox.setEnabled(false);
+ stpLimitMainGameLegendariesCheckBox.setSelected(false);
+ }
+
if (stpPercentageLevelModifierCheckBox.isSelected()) {
stpPercentageLevelModifierSlider.setEnabled(true);
} else {
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-17 03:01:59 +0000