itsusername · Mar 29, 2021 · Mar 24, 2021 · Mar 24, 2021 · Mar 24, 2021 · Mar 25, 2021
diff --git a/Lesson2/Calculator.java b/Lesson2/Calculator.java
@@ -1,34 +1,46 @@
+import java.util.Scanner;
+
 public class Calculator {
 
-    int num1;
-    char operation;
-    int num2;
-    int result;
+    private int result;
+    Scanner in = new Scanner(System.in);
+
+    public int getNum() {
+        System.out.print("Введите число: ");
+        int num = in.nextInt();
+        return num;
+    }
+
+    public char getOperand() {
+        System.out.print("Введите знак математической операции: ");
+        char operation = in.next(".").charAt(0);
+        return operation;
+    }
 
-    public int calculateData(int num1, int num2, char operation) {
+    public int calculate(int num1, int num2, char operation) {
         switch(operation) {
-        case '+': 
-            result = num1 + num2;
-            break;
-         case'-':
-            result = num1 - num2;
-            break;
-         case '*':
-            result = num1 * num2;
-            break;
-         case '/':
-            result = num1 / num2;
-            break;
-         case '^':
-            int powResult = 1;
-            for(int i = 1; i <= num2; i++) {
-                powResult *= num1;
-            }
-            result = powResult;
-            break;
-         case '%':
-            result = num1 % num2;
-            break;
+            case '+': 
+                result = num1 + num2;
+                break;
+             case'-':
+                result = num1 - num2;
+                break;
+             case '*':
+                result = num1 * num2;
+                break;
+             case '/':
+                result = num1 / num2;
+                break;
+             case '^':
+                int powResult = 1;
+                for(int i = 1; i <= num2; i++) {
+                    powResult *= num1;
+                }
+                result = powResult;
+                break;
+             case '%':
+                result = num1 % num2;
+                break;
         } 
         return result;
     }

diff --git a/Lesson2/CalculatorTest.java b/Lesson2/CalculatorTest.java
@@ -3,36 +3,31 @@
 public class CalculatorTest {
 
     public static void main(String[] args) {
+        Calculator act = new Calculator();
+        String getAnswer;
+
+        do {
+            int num1 = act.getNum();
+            char operation = act.getOperand();
+            int num2 = act.getNum();
+
+            int res = act.calculate(num1, num2, operation);
+            System.out.println("Результат равен: " + res);
+
+            getAnswer = caclContinue();
+        } while (getAnswer.equals("yes"));
+    }
+
+    public static String caclContinue() {
         Scanner in = new Scanner(System.in);
-        int res = calculateData();
-        System.out.println("Результат равен: " + res);
 
         System.out.print("Хотите продолжить вычисления? [yes/no]:");
         String userAnswer = in.nextLine();
-        System.out.println("0 " + userAnswer);
-        if (userAnswer == "yes") {
-            System.out.println("1" + userAnswer);
-            res = calculateData();
-            System.out.println("Результат равен: " + res);
-        } else if (userAnswer == "no") {
-        } else {
-            while(userAnswer != "yes" || userAnswer != "no") {
-            System.out.print("Хотите продолжить вычисления? [yes/no]:");
-            userAnswer = in.nextLine();
-            System.out.println("2" + userAnswer);
-            }
+        System.out.println("Результат userAnswer: " + userAnswer);
+
+        if (!userAnswer.equals("yes") | !userAnswer.equals("no")) {
+            userAnswer = caclContinue();
         }
+        return userAnswer;
     }
-    public static int calculateData() {
-        Scanner in = new Scanner(System.in);
-        Calculator clclt = new Calculator();
-            System.out.print("Введите первое число: ");
-            int num1 = in.nextInt();
-            System.out.print("Введите знак математической операции: ");
-            char operation = in.next(".").charAt(0);
-            System.out.print("Введите второе число: ");
-            int num2 = in.nextInt();
-            int res = clclt.calculateData(num1, num2, operation);
-            return  res;
-        }
 }
diff --git a/Lesson2/GuessNumber.java b/Lesson2/GuessNumber.java
@@ -0,0 +1,43 @@
+import java.util.Scanner;
+
+public class GuessNumber {
+    Scanner in = new Scanner(System.in);
+
+    public void calculateData() {
+        int a = 0;
+        int b = 100;
+        int random_number1 = a + (int) (Math.random() * b);
+
+        System.out.println("Введите Ваше имя: ");
+        String name = in.nextLine();
+        System.out.println("Введите число: ");
+        int number = in.next().charAt(0);
+        Player p1 = new Player(name, number);
+        p1.guessNum(random_number1);
+
+        System.out.println("Введите Ваше имя: ");
+        name = in.nextLine();
+        System.out.println("Введите число: ");
+        number = in.next().charAt(0);
+        Player p2 = new Player(name, number);
+        p2.guessNum(random_number1);
+
+        newGame();
+    }
+
+    public void newGame() {
+        System.out.print("Хотите продолжить вычисления? [yes/no]:");
+        String userAnswer = in.nextLine();
+
+        if (userAnswer.equals("yes")) {
+            calculateData();
+            //calculateData();
+        } else if (userAnswer.equals("no")) {
+        } else {
+            while(userAnswer.equals("yes") || !userAnswer.equals("no")) {
+            System.out.print("Хотите продолжить вычисления? [yes/no]:");
+            userAnswer = in.nextLine();
+            }
+        }
+    }
+}
diff --git a/Lesson2/GuessNumberTest.java b/Lesson2/GuessNumberTest.java
@@ -0,0 +1,10 @@
+public class GuessNumberTest {
+
+    public static void main(String[] args) {
+        GuessNumber p1 = new GuessNumber();
+        GuessNumber p2 = new GuessNumber();
+
+        p1.calculateData();
+        p2.calculateData();
+    }
+}
diff --git a/Lesson2/Jaeger.java b/Lesson2/Jaeger.java
@@ -9,78 +9,29 @@ public class Jaeger {
     private int strength;
     private int armor;
     private int killKaiju;
-    //private String weapon;
 
-    public void setModelName(String modelName) {
+    Jaeger(String modelName, String mark, String origin, float height, float weight, int speed, int strength, int armor, int killKaiju) {
         this.modelName = modelName;
-    }
-
-    public String getModelName() {
-        return modelName;
-    }
-
-    public void setMark(String mark) {
         this.mark = mark;
-    }
-
-    public String getMark() {
-        return mark;
-    }
-
-    public void setOrigin(String origin) {
         this.origin = origin;
-    }
-
-    public String getOrigin() {
-        return origin;
-    }
-
-    public void setHeight(float height) {
         this.height = height;
-    }
-
-    public float getHeight() {
-        return height;
-    }
-
-    public void setWeight(float weight) {
         this.weight = weight;
-    }
-
-    public float getWeight() {
-        return weight;
-    }
-
-    public void setSpeed(int speed) {
         this.speed = speed;
-    }
-
-    public int getSpeed() {
-        return speed;
-    }
-
-    public void setStrength(int strength) {
         this.strength = strength;
-    }
-
-    public int getStrength() {
-        return strength;
-    }
-
-    public void setArmor(int armor) {
         this.armor = armor;
-    }
-
-    public int getArmor() {
-        return armor;
-    }
-
-    public void setKillKaiju(int killKaiju) {
         this.killKaiju = killKaiju;
     }
 
-    public int getKillKaiju() {
-        return killKaiju;
+    public String toString() {
+        return "Модель робота: " + modelName + "\n"
+        + "Марка: " + mark + "\n"
+        + "Источник: " + origin + "\n"
+        + "Высота: " + height + "\n"
+        + "Масса: " + weight + "\n"
+        + "Скорость: " + speed + "\n"
+        + "Сила: " + weight + "\n"
+        + "Броня: " + armor + "\n"
+        + "Убито Kaiju: " + killKaiju;
     }
 
     public boolean oldModel(int launch) {

diff --git a/Lesson2/JaegerTest.java b/Lesson2/JaegerTest.java
@@ -1,55 +1,19 @@
 public class JaegerTest {
 
     public static void main(String[] args) {
-        Jaeger rob1 = new Jaeger();
-        Jaeger rob2 = new Jaeger();
+        Jaeger rob1 = new Jaeger("Cherno Alpha (Jaeger)", "Mark-1", "Russia", 85.34f, 2.412f, 3, 10, 10, 4);
 
-        rob1.setModelName("Cherno Alpha (Jaeger)");
-        rob1.setMark("Mark-1");
-        rob1.setOrigin("Russia");
-        rob1.setHeight(85.34f);
-        rob1.setWeight(2.412f);
-        rob1.setSpeed(3);
-        rob1.setStrength(10);
-        rob1.setArmor(10);
-        rob1.setKillKaiju(4);
-
-        rob2.setModelName("Striker Eureka");
-        rob2.setMark("Mark-5");
-        rob2.setOrigin("Australia");
-        rob2.setHeight(76.2f);
-        rob2.setWeight(1.850f);
-        rob2.setSpeed(10);
-        rob2.setStrength(10);
-        rob2.setArmor(9);
-        rob2.setKillKaiju(2);
-
-        System.out.println("Модель робота: " + rob1.getModelName() + "\n"
-        + "Марка:" + rob1.getMark() + "\n"
-        + "Источник:" + rob1.getOrigin() + "\n"
-        + "Высота:" + rob1.getHeight() + "\n"
-        + "Масса:" + rob1.getWeight() + "\n"
-        + "Скорость:" + rob1.getOrigin() + "\n"
-        + "Сила:" + rob1.getSpeed() + "\n"
-        + "Броня:" + rob1.getStrength() + "\n"
-        + "Убито Kaiju:" + rob1.getArmor() + "\n"
-        + "Оружие:" + rob1.getKillKaiju() + "\n"
-        + "Old Model:" + rob1.oldModel(2015) + "\n");
+        System.out.println(rob1);
+        rob1.oldModel(2019);
+        System.out.println("Old Model: " + rob1.oldModel(2010));
         rob1.powerMoves("Sluggernaut/Headshock");
-        rob1.useWeapon("Incinerator turbines and Tesla fists");
+        rob1.useWeapon("Incinerator turbines and Tesla fists" + "\n");
+
+        Jaeger rob2 = new Jaeger("Striker Eureka", "Mark-5", "Australia", 76.2f, 1.850f, 10, 10, 9, 2);
 
-        System.out.println("Модель робота: " + rob2.getModelName() + "\n"
-        + "Марка:" + rob2.getMark() + "\n"
-        + "Источник:" + rob2.getOrigin() + "\n"
-        + "Высота:" + rob2.getHeight() + "\n"
-        + "Масса:" + rob2.getWeight() + "\n"
-        + "Скорость:" + rob2.getOrigin() + "\n"
-        + "Сила:" + rob2.getSpeed() + "\n"
-        + "Броня:" + rob2.getStrength() + "\n"
-        + "Убито Kaiju:" + rob2.getArmor() + "\n"
-        + "Оружие:" + rob2.getKillKaiju() + "\n"
-        + "Old Model:" + rob2.oldModel(2019) + "\n");
+        System.out.println(rob2);
+        System.out.println("Old Model: " + rob2.oldModel(2010));
         rob2.powerMoves("Six Shooter");
         rob2.useWeapon("Assault Mount 3.25 \"Sting-Blades\" and WMB2x90 AKM Chest launcher");
     }
-}
+}
diff --git a/Lesson2/Player.java b/Lesson2/Player.java
@@ -0,0 +1,21 @@
+public class Player {
+    String name;
+    int number;
+
+    Player() {
+    }
+
+    Player(String name, int number) {
+        this.name = name;
+        this.number = number;
+    }
+
+    public void guessNum(int random_number1) {
+
+        if (number == random_number1) {
+            System.out.println("Игрок: " + name + " выиграл! Загадонное число: " + number);
+        } else {
+            System.out.println("Игрок: " + name + " Вы не угадали! Загадонное число: " + number + "\n");
+        }
+    }
+}