summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortom-overton <tom.overton@outlook.com>2022-07-11 01:58:05 -0700
committerrafa_99 <raroma09@gmail.com>2022-07-11 22:57:22 +0100
commitd4ced0f47d928fcf6565f6649cd17b52aaec9e3e (patch)
tree7e89478bbcd7344a98fbbcffe56139f5045b149a
parentb8f4accb0da92aa786c0da1d22fcf307aa11d618 (diff)
Gen 1: Display Special when randomizing movesets (fixes #486)
-rw-r--r--src/com/sneed/pkrandom/Randomizer.java27
1 files changed, 19 insertions, 8 deletions
diff --git a/src/com/sneed/pkrandom/Randomizer.java b/src/com/sneed/pkrandom/Randomizer.java
index 47b0c1e..c518eda 100644
--- a/src/com/sneed/pkrandom/Randomizer.java
+++ b/src/com/sneed/pkrandom/Randomizer.java
@@ -760,14 +760,25 @@ public class Randomizer {
StringBuilder sb = new StringBuilder();
- sb.append(String.format("%03d %s", i, pkmn.fullName()))
- .append(evoStr).append(System.getProperty("line.separator"))
- .append(String.format("HP %-3d", pkmn.hp)).append(System.getProperty("line.separator"))
- .append(String.format("ATK %-3d", pkmn.attack)).append(System.getProperty("line.separator"))
- .append(String.format("DEF %-3d", pkmn.defense)).append(System.getProperty("line.separator"))
- .append(String.format("SPA %-3d", pkmn.spatk)).append(System.getProperty("line.separator"))
- .append(String.format("SPD %-3d", pkmn.spdef)).append(System.getProperty("line.separator"))
- .append(String.format("SPE %-3d", pkmn.speed)).append(System.getProperty("line.separator"));
+ if (romHandler instanceof Gen1RomHandler) {
+ sb.append(String.format("%03d %s", i, pkmn.fullName()))
+ .append(evoStr).append(System.getProperty("line.separator"))
+ .append(String.format("HP %-3d", pkmn.hp)).append(System.getProperty("line.separator"))
+ .append(String.format("ATK %-3d", pkmn.attack)).append(System.getProperty("line.separator"))
+ .append(String.format("DEF %-3d", pkmn.defense)).append(System.getProperty("line.separator"))
+ .append(String.format("SPEC %-3d", pkmn.special)).append(System.getProperty("line.separator"))
+ .append(String.format("SPE %-3d", pkmn.speed)).append(System.getProperty("line.separator"));
+ } else {
+ sb.append(String.format("%03d %s", i, pkmn.fullName()))
+ .append(evoStr).append(System.getProperty("line.separator"))
+ .append(String.format("HP %-3d", pkmn.hp)).append(System.getProperty("line.separator"))
+ .append(String.format("ATK %-3d", pkmn.attack)).append(System.getProperty("line.separator"))
+ .append(String.format("DEF %-3d", pkmn.defense)).append(System.getProperty("line.separator"))
+ .append(String.format("SPA %-3d", pkmn.spatk)).append(System.getProperty("line.separator"))
+ .append(String.format("SPD %-3d", pkmn.spdef)).append(System.getProperty("line.separator"))
+ .append(String.format("SPE %-3d", pkmn.speed)).append(System.getProperty("line.separator"));
+ }
+
i++;
List<MoveLearnt> data = moveData.get(pkmn.number);