Improving Consistency

ROCKIFY and ROCKIFY_P now conform to the standard for multi-hit effects in how they generate the list of affected tiles.
Loreinator · Dec 19, 2017 · f49081b · f49081b
1 parent 530ab2a
commit f49081b
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/src/shuffle/fwk/data/Effect.java b/src/shuffle/fwk/data/Effect.java
@@ -3245,14 +3245,18 @@ protected void doSpecial(ActivateComboEffect comboEffect, SimulationTask task) {
             List<Integer> matches = task.findMatches(36, false, (r, c, s) -> nonSupports.contains(s));
             if (!matches.isEmpty()) {
                double odds = getOdds(task, comboEffect);
-               if (matches.size() / 2 > 2 || odds < 1.0) {
+               int numSwapped = 2;
+               if (matches.size() / 2 > numSwapped || odds < 1.0) {
                   task.setIsRandom();
                }
                if (odds >= Math.random()) {
-                  int blockIndex = getRandomInt(matches.size() / 2);
-                  int row = matches.get(blockIndex * 2);
-                  int col = matches.get(blockIndex * 2 + 1);
-                  List<Integer> toReplace = new ArrayList<Integer>(Arrays.asList(row, col));
+                  List<Integer> randoms = getUniqueRandoms(0, matches.size() / 2, numSwapped);
+                  List<Integer> toReplace = new ArrayList<Integer>();
+                  for (Integer i : randoms) {
+                     int row = matches.get(i * 2);
+                     int col = matches.get(i * 2 + 1);
+                     toReplace.addAll(Arrays.asList(row, col));
+                  }
                   handleReplaceOf(comboEffect, task, toReplace, Species.WOOD);
                }
             }
@@ -3271,14 +3275,18 @@ protected void doSpecial(ActivateComboEffect comboEffect, SimulationTask task) {
             List<Integer> matches = task.findMatches(36, false, (r, c, s) -> nonSupports.contains(s));
             if (!matches.isEmpty()) {
                double odds = getOdds(task, comboEffect);
-               if (matches.size() / 2 > 10 || odds < 1.0) {
+               int numSwapped = 10;
+               if (matches.size() / 2 > numSwapped || odds < 1.0) {
                   task.setIsRandom();
                }
                if (odds >= Math.random()) {
-                  int blockIndex = getRandomInt(matches.size() / 2);
-                  int row = matches.get(blockIndex * 2);
-                  int col = matches.get(blockIndex * 2 + 1);
-                  List<Integer> toReplace = new ArrayList<Integer>(Arrays.asList(row, col));
+                  List<Integer> randoms = getUniqueRandoms(0, matches.size() / 2, numSwapped);
+                  List<Integer> toReplace = new ArrayList<Integer>();
+                  for (Integer i : randoms) {
+                     int row = matches.get(i * 2);
+                     int col = matches.get(i * 2 + 1);
+                     toReplace.addAll(Arrays.asList(row, col));
+                  }
                   handleReplaceOf(comboEffect, task, toReplace, Species.WOOD);
                }
             }