Java baseball game 김태근

java_baseball_game/src/main/java/com/taegeun/Computer.java

@@ -5,18 +5,18 @@
 import java.util.Random;
 
 public class Computer {
-    List<Integer> comNum = new ArrayList<>();
-    public List<Integer> randNum() {
+    List<Integer> computerNumber = new ArrayList<>();
+
+    public List<Integer> randomNumber() {
         int num;
         Random random = new Random();
 
-        while (true) {
-            if (comNum.size() == 3) break;
-            num = random.nextInt(9)+1;
-            if (!comNum.contains(num)){
-                comNum.add(num);
+        while (computerNumber.size() != 3) {
+            num = random.nextInt(9) + 1;
+            if (!computerNumber.contains(num)) {
+                computerNumber.add(num);
             }
         }
-        return comNum;
+        return computerNumber;
     }
 }

java_baseball_game/src/main/java/com/taegeun/GameEngine.java

@@ -4,52 +4,51 @@
 import java.util.List;
 
 public class GameEngine {
+    private List<Integer> playerNumber = new ArrayList<>();
+    private List<Integer> computerNumber = new ArrayList<>();
 
-    private List<Integer> playerNum = new ArrayList<>();
-    private List<Integer> comNum = new ArrayList<>();
-    public void setComNum(List<Integer> comNum) {
-        this.comNum = comNum;
+    public void setComNum(List<Integer> n) {
+        this.computerNumber = n;
     }
-    public void setPlayerNum(List<Integer> playerNum){
-        this.playerNum = playerNum;
+
+    public void setPlayerNum(List<Integer> n) {
+        this.playerNumber = n;
     }
 
     public int checkStrike() {
-        int total=0;
-        for (int i=0; i<playerNum.size(); i++){
-            if (playerNum.get(i) == comNum.get(i)){
+        int total = 0;
+        for (int i = 0; i < playerNumber.size(); i++) {
+            if (playerNumber.get(i) == computerNumber.get(i)) {
                 total++;
             }
         }
         return total;
     }
+
     public int checkBall() {
-        int total=0;
-        for (int i=0; i<playerNum.size(); i++){
-            if (playerNum.get(i) != comNum.get(i) && comNum.contains(playerNum.get(i))){
+        int total = 0;
+        for (int i = 0; i < playerNumber.size(); i++) {
+            if (playerNumber.get(i) != computerNumber.get(i) && computerNumber.contains(playerNumber.get(i))) {
                 total++;
             }
         }
         return total;
     }
-    public boolean continueGame(){
-        if (checkStrike()!=3){
-            return true;
-        }
-        else{
-            return false;
-        }
+
+    public boolean continueGame() {
+        return checkStrike() != 3;
     }
+
     public void printScore() {
         int ball = checkBall();
         int strike = checkStrike();
-        if (ball !=0){
+        if (ball != 0) {
             System.out.print(ball + "볼 ");
         }
-        if (strike !=0){
+        if (strike != 0) {
             System.out.print(strike + "스트라이크");
         }
-        if (ball==0 && strike==0){
+        if (ball == 0 && strike == 0) {
             System.out.print("낫싱");
         }
         System.out.println();

java_baseball_game/src/main/java/com/taegeun/GameManager.java

@@ -5,52 +5,56 @@
 import java.util.Scanner;
 
 public class GameManager {
-    private List<Integer> playerNum = new ArrayList<>();
-    private List<Integer> comNum = new ArrayList<>();
-    public void generateGame(){
+    private List<Integer> playerNumber = new ArrayList<>();
+    private List<Integer> computerNumber = new ArrayList<>();
+
+    public void generateGame() {
         Computer com = new Computer();
         // 컴퓨터 숫자 생성.
-        comNum = com.randNum();
+        computerNumber = com.randomNumber();
     }
-    public void gameStart(){
+
+    public void gameStart() {
         GameEngine gameEngine = new GameEngine();
-        gameEngine.setComNum(comNum);
+        gameEngine.setComNum(computerNumber);
 
-        while(true){
+        while (true) {
             //플레이어 숫자 입력
             Player player = new Player();
-            try{
-                playerNum = player.inputNum();
-            }catch (Exception e){
+            try {
+                playerNumber = player.inputNumber();
+            } catch (Exception e) {
                 System.out.println("잘못된 입력입니다.");
                 System.exit(0);
             }
 
-            gameEngine.setPlayerNum(playerNum);
+            gameEngine.setPlayerNum(playerNumber);
             gameEngine.printScore();
             if (!gameEngine.continueGame()) {
                 System.out.println("3개의 숫자를 모두 맞히셨습니다! 게임 종료");
                 break;
             }
         }
     }
-    public boolean resumeGame(){
+
+    public boolean isResumeGame() {
         System.out.println("게임을 새로 시작하려면 1, 종료하려면 2를 입력하세요.");
         Scanner sc = new Scanner(System.in);
         int choice = sc.nextInt();
 
         switch (choice) {
             case 1:
                 return true;
-           default:
+            default:
                 return false;
         }
-
     }
-    public List<Integer> getPlayerNum(){
-        return playerNum;
+
+    public List<Integer> getPlayerNum() {
+        return playerNumber;
     }
-    public List<Integer> getComNum(){
-        return comNum;
+
+    public List<Integer> getComNum() {
+        return computerNumber;
     }
 }

java_baseball_game/src/main/java/com/taegeun/Main.java

@@ -1,25 +1,13 @@
 package com.taegeun;
 
 public class Main {
-    public static void main(String[] args){
-        while (true){
-            GameManager gameManager = new GameManager();
-
+    public static void main(String[] args) {
+        GameManager gameManager = new GameManager();
+        do {
             gameManager.generateGame();
-            System.out.println(gameManager.getComNum());
             gameManager.gameStart();
-
-            if (!gameManager.resumeGame()){
-                break;
-            }
-
-        }
-
-
-
-
-
-
-
+        } while (gameManager.isResumeGame());
     }
-}
+}
+//computer 숫자를 알고 싶을 때...
+//System.out.println(gameManager.getComNum());

java_baseball_game/src/main/java/com/taegeun/Player.java

@@ -5,22 +5,21 @@
 import java.util.Scanner;
 
 public class Player {
-    List<Integer> myNum = new ArrayList<>();
-    public List<Integer> inputNum(){
+    List<Integer> playerNumber = new ArrayList<>();
+
+    public List<Integer> inputNumber() {
         int num;
         Scanner sc = new Scanner(System.in);
         System.out.print("숫자를 입력해주세요 : ");
         num = sc.nextInt();
 
-        myNum.add((num/100)%10);
-        myNum.add((num/10)%10);
-        myNum.add(num%10);
-
-        if (myNum.get(0) == 0) {
+        playerNumber.add((num / 100) % 10);
+        playerNumber.add((num / 10) % 10);
+        playerNumber.add(num % 10);
 
+        if (playerNumber.get(0) == 0) {
             throw new IllegalArgumentException("3자리 수를 입력하세요!");
         }
-
-        return myNum;
+        return playerNumber;
     }
 }