improve fixed difficulty distribution scaling

Gaming32 · Jun 7, 2024 · 8ce1f4d · 8ce1f4d
1 parent dab87d6
commit 8ce1f4d
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/common/src/main/java/io/github/gaming32/bingo/game/BingoBoard.java b/common/src/main/java/io/github/gaming32/bingo/game/BingoBoard.java
@@ -269,13 +269,22 @@ private static boolean isOnSameLine(int size, int a, int b) {
 
     private static int[] generateDifficulty(int size, BingoDifficulty difficulty, RandomSource rand) {
         final int[] layout = new int[size * size];
-
         if (difficulty.distribution() != null) {
-            List<Integer> scaledDistribution = difficulty.distribution().stream().map(f -> Math.round(f * size * size)).toList();
-            int p = 0;
-            for (int difficultyLevel = 0; difficultyLevel < scaledDistribution.size(); ++difficultyLevel) {
-                for (int i = 0; i < scaledDistribution.get(difficultyLevel) && p < layout.length; ++i)
-                    layout[p++] = difficultyLevel;
+            Arrays.fill(layout, difficulty.number());
+            float[] cumDistribution = new float[difficulty.distribution().size()];
+            for (int d = 0; d < cumDistribution.length; d++) {
+                cumDistribution[d] = difficulty.distribution().get(d) * layout.length;
+                if (d > 0) {
+                    cumDistribution[d] += cumDistribution[d - 1];
+                }
+            }
+            for (int i = 0; i < layout.length; ++i) {
+                for (int d = 0; d < cumDistribution.length; d++) {
+                    if ((i + 1) <= cumDistribution[d]) {
+                        layout[i] = d;
+                        break;
+                    }
+                }
             }
             BingoUtil.shuffle(layout, rand);
         } else {