Fix issue where Force Fully Evolved could have different results even with the same seed/settings (fixes #476)

2 files changed, 9 insertions, 3 deletions

diff --git a/src/com/sneed/pkrandom/Version.java b/src/com/sneed/pkrandom/Version.java
index 49a1657..9a1d00a 100644
--- a/src/com/sneed/pkrandom/Version.java
+++ b/src/com/sneed/pkrandom/Version.java
@@ -28,8 +28,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class Version {
-    public static final int VERSION = 319; // Increment by 1 for new version. Updated for 4.5.0-dev
-    public static final String VERSION_STRING = "4.5.0-dev";
+    public static final int VERSION = 320; // Increment by 1 for new version. Updated for 4.5.1-dev.
+    public static final String VERSION_STRING = "4.5.1-dev";
 
     public static final Map<Integer,String> oldVersions = setupVersionsMap();
 
@@ -59,6 +59,7 @@ public class Version {
         map.put(316, "4.2.1");
         map.put(317, "4.3.0");
         map.put(318, "4.4.0");
+        map.put(319, "4.5.0");
 
         // Latest version - when version is updated, add the old version as an explicit put
         map.put(VERSION, VERSION_STRING);
diff --git a/src/com/sneed/pkrandom/romhandlers/AbstractRomHandler.java b/src/com/sneed/pkrandom/romhandlers/AbstractRomHandler.java
index 3c29e0c..f8f0f21 100755
--- a/src/com/sneed/pkrandom/romhandlers/AbstractRomHandler.java
+++ b/src/com/sneed/pkrandom/romhandlers/AbstractRomHandler.java
@@ -64,7 +64,7 @@ public abstract class AbstractRomHandler implements RomHandler {
     public AbstractRomHandler(Random random, PrintStream logStream) {
         this.random = random;
         this.cosmeticRandom = RandomSource.cosmeticInstance();
-        this.fullyEvolvedRandomSeed = random.nextInt(GlobalConstants.LARGEST_NUMBER_OF_SPLIT_EVOS);
+        this.fullyEvolvedRandomSeed = -1;
         this.logStream = logStream;
     }
 
@@ -6698,6 +6698,11 @@ public abstract class AbstractRomHandler implements RomHandler {
     }
 
     private Pokemon fullyEvolve(Pokemon pokemon, int trainerIndex) {
+        // If the fullyEvolvedRandomSeed hasn't been set yet, set it here.
+        if (this.fullyEvolvedRandomSeed == -1) {
+            this.fullyEvolvedRandomSeed = random.nextInt(GlobalConstants.LARGEST_NUMBER_OF_SPLIT_EVOS);
+        }
+
         Set<Pokemon> seenMons = new HashSet<>();
         seenMons.add(pokemon);