Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/java/com/epam/izh/rd/online/Computer.java
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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;
}
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/epam/izh/rd/online/Display.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

public class Display {

private static int initialNumberMatches = 20;
private static int initialNumberMatches = 20;


public static int getInitialNumberMatches() {
Expand All @@ -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("Для игрока осталась последняя спичка. Игрок проиграл!");
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/epam/izh/rd/online/GameLogic.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/com/epam/izh/rd/online/Members.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package main.java.com.epam.izh.rd.online;

public class Members {

public int move (){
return 0;
}
}
4 changes: 2 additions & 2 deletions src/main/java/com/epam/izh/rd/online/Player.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

import java.util.Scanner;

public class Player {
public class Player extends Members {

static int countMatchesPlayer;

static int countMatchesNumberMovePlayer;

public int move() {
int matches;
while (true){
while (true) {
System.out.print("Ход игрока. Введите количество спичек: ");
Scanner scanner = new Scanner(System.in);
matches = scanner.nextInt();
Expand Down