exterminate magic numbers

Author: walpurr

app/src/main/java/hexlet/code/games/Calc.java

@@ -6,12 +6,15 @@ public class Calc {
     public static void play(Scanner scanner) {
         Engine.greet(scanner);
 
+        var randomNumberBound = 50;
+        var randomOperatorBound = 3;
+
         while (Engine.isContinuing()) {
-            var number1 = Engine.getRandomNumber(50);
-            var number2 = Engine.getRandomNumber(50);
+            var number1 = Engine.getRandomNumber(randomNumberBound);
+            var number2 = Engine.getRandomNumber(randomNumberBound);
             char operator;
 
-            int correctAnswer = switch (Engine.getRandomNumber(3)) {
+            int correctAnswer = switch (Engine.getRandomNumber(randomOperatorBound)) {
                 case 0 -> {
                     operator = '+';
                     yield number1 + number2;

app/src/main/java/hexlet/code/games/Engine.java

@@ -6,8 +6,9 @@
 public class Engine {
     private static String userName;
     private static boolean defeated = false;
-    private static int round = 1;
-    private static Random randomizer = new Random();
+    private static int currentRound = 1;
+    private static final int finalRound = 3;
+    private static final Random randomizer = new Random();
 
     public static void greet(Scanner scanner) {
         System.out.println("Welcome to the Brain Games!");
@@ -17,7 +18,7 @@ public static void greet(Scanner scanner) {
     }
 
     public static boolean isContinuing() {
-        return round <= 3 && !defeated;
+        return currentRound <= finalRound && !defeated;
     }
 
     public static int getRandomNumber(int bound) {
@@ -27,7 +28,7 @@ public static int getRandomNumber(int bound) {
     public static void compareAnswers(String userAnswer, String correctAnswer) {
         if (userAnswer.equals(correctAnswer)) {
             System.out.println("Correct!");
-            round++;
+            currentRound++;
         } else {
             System.out.println("'" + userAnswer + "' is wrong answer ;(. Correct answer was '" + correctAnswer + "'.");
             defeated = true;

app/src/main/java/hexlet/code/games/Even.java

@@ -5,11 +5,12 @@
 public class Even {
     public static void play(Scanner scanner) {
         Engine.greet(scanner);
-
         System.out.println("Answer 'yes' if the number is even, otherwise answer 'no'.");
 
+        var randomNumberBound = 100;
+
         while (Engine.isContinuing()) {
-            var randomNumber = Engine.getRandomNumber(100) + 1; // added 1 to avoid 0
+            var randomNumber = Engine.getRandomNumber(randomNumberBound) + 1; // added 1 to avoid 0
             var correctAnswer = randomNumber % 2 == 0 ? "yes" : "no";
 
             System.out.println("Question: " + randomNumber);

app/src/main/java/hexlet/code/games/GCD.java

@@ -10,9 +10,11 @@ public static int getGCD(int a, int b) {
     public static void play(Scanner scanner) {
         Engine.greet(scanner);
 
+        var randomNumberBound = 100;
+
         while (Engine.isContinuing()) {
-            var number1 = Engine.getRandomNumber(100) + 1; // added 1 to avoid 0
-            var number2 = Engine.getRandomNumber(100) + 1;
+            var number1 = Engine.getRandomNumber(randomNumberBound) + 1; // added 1 to avoid 0
+            var number2 = Engine.getRandomNumber(randomNumberBound) + 1;
             int correctAnswer = getGCD(number1, number2);
 
             System.out.println("Find the greatest common divisor of given numbers.");

app/src/main/java/hexlet/code/games/Prime.java

@@ -19,11 +19,12 @@ public static boolean isPrime(int number) {
 
     public static void play(Scanner scanner) {
         Engine.greet(scanner);
-
         System.out.println("Answer 'yes' if given number is prime. Otherwise answer 'no'.");
 
+        var randomNumberBound = 82; // multiplication table range
+
         while (Engine.isContinuing()) {
-            var randomNumber = Engine.getRandomNumber(82); // multiplication table range
+            var randomNumber = Engine.getRandomNumber(randomNumberBound);
             var correctAnswer = isPrime(randomNumber) ? "yes" : "no";
 
             System.out.println("Question: " + randomNumber);

app/src/main/java/hexlet/code/games/Progression.java

@@ -5,11 +5,15 @@
 
 public class Progression {
     public static int[] getRandomProgression() {
-        int[] progression = new int[10];
-        progression[0] = Engine.getRandomNumber(20);
-        var step = Engine.getRandomNumber(10) + 1;
+        var progressionSize = 10;
+        var randomElementOfProgressionBound = 20;
+        var randomStepBound = 10;
 
-        for (var i = 1; i < 10; i++) {
+        int[] progression = new int[progressionSize];
+        progression[0] = Engine.getRandomNumber(randomElementOfProgressionBound);
+        var step = Engine.getRandomNumber(randomStepBound) + 1;
+
+        for (var i = 1; i < progressionSize; i++) {
             progression[i] = progression[i - 1] + step;
         }
 
@@ -19,9 +23,11 @@ public static int[] getRandomProgression() {
     public static void play(Scanner scanner) {
         Engine.greet(scanner);
 
+        var randomHiddenValueBound = 10;
+
         while (Engine.isContinuing()) {
             int[] progression = getRandomProgression();
-            var hiddenValue = progression[Engine.getRandomNumber(10)];
+            var hiddenValue = progression[Engine.getRandomNumber(randomHiddenValueBound)];
 
             var correctAnswer = Integer.toString(hiddenValue);
             var progressionForQuestion = Arrays.toString(progression);