From 2393c75fee2cd6c5aa121c4105eb70bcea2b10d9 Mon Sep 17 00:00:00 2001 From: Nikita Babaylov Date: Tue, 1 Jun 2021 21:12:05 +0400 Subject: [PATCH 1/2] finish1 --- .../java/com/epam/izh/rd/online/Computer.java | 6 +++--- .../java/com/epam/izh/rd/online/Display.java | 16 ++++++++-------- .../java/com/epam/izh/rd/online/GameLogic.java | 4 ++-- src/main/java/com/epam/izh/rd/online/Player.java | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/epam/izh/rd/online/Computer.java b/src/main/java/com/epam/izh/rd/online/Computer.java index 7c6e1e7..b276c33 100644 --- a/src/main/java/com/epam/izh/rd/online/Computer.java +++ b/src/main/java/com/epam/izh/rd/online/Computer.java @@ -18,9 +18,9 @@ public int move() { return firstMove; } else countMatchesNumberMoveComputer = 4 - Player.countMatchesNumberMovePlayer; - System.out.println("Количество выбранных компьютером спичек = " + countMatchesNumberMoveComputer); - countMatchesComputer += countMatchesNumberMoveComputer; - Display.setInitialNumberMatches(Display.getInitialNumberMatches() - countMatchesNumberMoveComputer); + System.out.println("Количество выбранных компьютером спичек = " + countMatchesNumberMoveComputer); + countMatchesComputer += countMatchesNumberMoveComputer; + Display.setInitialNumberMatches(Display.getInitialNumberMatches() - countMatchesNumberMoveComputer); return countMatchesNumberMoveComputer; } diff --git a/src/main/java/com/epam/izh/rd/online/Display.java b/src/main/java/com/epam/izh/rd/online/Display.java index 4ddfc1e..e4b03ca 100644 --- a/src/main/java/com/epam/izh/rd/online/Display.java +++ b/src/main/java/com/epam/izh/rd/online/Display.java @@ -2,7 +2,7 @@ public class Display { - private static int initialNumberMatches = 20; + private static int initialNumberMatches = 20; public static int getInitialNumberMatches() { @@ -14,21 +14,21 @@ public static void setInitialNumberMatches(int initialNumberMatches) { } - void beginningGame(){ + void beginningGame() { System.out.println("На столе осталось " + initialNumberMatches + " спичек"); } - void printNumberMatchesTable (){ - if (initialNumberMatches > 4){ + void printNumberMatchesTable() { + if (initialNumberMatches > 4) { System.out.println("На столе осталось " + initialNumberMatches + " спичек."); - } else if (initialNumberMatches > 1) { + } else if (initialNumberMatches > 1) { System.out.println("На столе осталось " + initialNumberMatches + " спички."); - }else if (initialNumberMatches == 1){ + } else if (initialNumberMatches == 1) { System.out.println("На столе осталась " + initialNumberMatches + " спичка."); } - } + } - void printGameOver (){ + void printGameOver() { System.out.println("Для игрока осталась последняя спичка. Игрок проиграл!"); } diff --git a/src/main/java/com/epam/izh/rd/online/GameLogic.java b/src/main/java/com/epam/izh/rd/online/GameLogic.java index 64b9dd6..26f4e7d 100644 --- a/src/main/java/com/epam/izh/rd/online/GameLogic.java +++ b/src/main/java/com/epam/izh/rd/online/GameLogic.java @@ -12,12 +12,12 @@ public static void main(String[] args) { display.beginningGame(); while (true) { computer.move(); - if (Display.getInitialNumberMatches() == 1){ + if (Display.getInitialNumberMatches() == 1) { break; } display.printNumberMatchesTable(); player.move(); - if (Display.getInitialNumberMatches() == 1){ + if (Display.getInitialNumberMatches() == 1) { break; } display.printNumberMatchesTable(); diff --git a/src/main/java/com/epam/izh/rd/online/Player.java b/src/main/java/com/epam/izh/rd/online/Player.java index 3eef7a9..a29a63e 100644 --- a/src/main/java/com/epam/izh/rd/online/Player.java +++ b/src/main/java/com/epam/izh/rd/online/Player.java @@ -10,7 +10,7 @@ public class Player { public int move() { int matches; - while (true){ + while (true) { System.out.print("Ход игрока. Введите количество спичек: "); Scanner scanner = new Scanner(System.in); matches = scanner.nextInt(); From 70c2d42775a5138d3158afd7f76bd0125af6b349 Mon Sep 17 00:00:00 2001 From: Nikita Babaylov Date: Fri, 18 Jun 2021 21:05:30 +0400 Subject: [PATCH 2/2] Add entity Members --- src/main/java/com/epam/izh/rd/online/Computer.java | 2 +- src/main/java/com/epam/izh/rd/online/Members.java | 8 ++++++++ src/main/java/com/epam/izh/rd/online/Player.java | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/epam/izh/rd/online/Members.java diff --git a/src/main/java/com/epam/izh/rd/online/Computer.java b/src/main/java/com/epam/izh/rd/online/Computer.java index b276c33..2592235 100644 --- a/src/main/java/com/epam/izh/rd/online/Computer.java +++ b/src/main/java/com/epam/izh/rd/online/Computer.java @@ -1,7 +1,7 @@ package main.java.com.epam.izh.rd.online; -public class Computer extends Player { +public class Computer extends Members { static int countMatchesComputer = 0; diff --git a/src/main/java/com/epam/izh/rd/online/Members.java b/src/main/java/com/epam/izh/rd/online/Members.java new file mode 100644 index 0000000..0acdb5b --- /dev/null +++ b/src/main/java/com/epam/izh/rd/online/Members.java @@ -0,0 +1,8 @@ +package main.java.com.epam.izh.rd.online; + +public class Members { + + public int move (){ + return 0; + } +} diff --git a/src/main/java/com/epam/izh/rd/online/Player.java b/src/main/java/com/epam/izh/rd/online/Player.java index a29a63e..f57acad 100644 --- a/src/main/java/com/epam/izh/rd/online/Player.java +++ b/src/main/java/com/epam/izh/rd/online/Player.java @@ -2,7 +2,7 @@ import java.util.Scanner; -public class Player { +public class Player extends Members { static int countMatchesPlayer;