diff --git a/Domain/Player.java b/Domain/Player.java index a8fec2f..a92519c 100644 --- a/Domain/Player.java +++ b/Domain/Player.java @@ -3,25 +3,25 @@ package Domain; public class Player { private String name; - private Yatzy_Sheet sheet; - private Dice dice; + // private Yatzy_Sheet sheet; + // private Dice dice; public Player(String name, Yatzy_Sheet sheet, Dice dice){ this.name = name; - this.sheet = sheet; - this.dice = dice; + // this.sheet = sheet; + // this.dice = dice; } public String getName(){ return name; } - public Yatzy_Sheet getSheet(){ - return sheet; - } + // public Yatzy_Sheet getSheet(){ + // return sheet; + // } - public Dice getDice(){ - return dice; - } + // public Dice getDice(){ + // return dice; + // } } diff --git a/Domain/Yatzy_Sheet.java b/Domain/Yatzy_Sheet.java index e9bd9fd..8328c7d 100644 --- a/Domain/Yatzy_Sheet.java +++ b/Domain/Yatzy_Sheet.java @@ -1,12 +1,20 @@ package Domain; public class Yatzy_Sheet { - private int[] tabelle; + private int[] tabelle = new int[15]; public Yatzy_Sheet(){ } - + + public void addScore(int categoryNumber, int score){ + for(int i = 0; i < 14; i++){ + if(i == categoryNumber){ + tabelle[i] = categoryNumber; + } + } + } + //counts all the public int getSumOne(){ int sum = 0; diff --git a/Facade/Game.java b/Facade/Game.java index ded5915..a2aedd4 100644 --- a/Facade/Game.java +++ b/Facade/Game.java @@ -3,7 +3,20 @@ package Facade; import java.util.ArrayList; import Domain.Dice; +import Domain.Fives; +import Domain.FourPairs; +import Domain.Fours; +import Domain.FullHouse; +import Domain.Ones; import Domain.Player; +import Domain.RoyalStraightFlush; +import Domain.Sixes; +import Domain.StraightFlush; +import Domain.ThreePairs; +import Domain.Threes; +import Domain.TwoPairs; +import Domain.Twos; +import Domain.Yatzy; import Domain.Yatzy_Sheet; public class Game { @@ -12,26 +25,28 @@ public class Game { private int numberOfDice; private Dice dice = new Dice(numberOfDice); private int[] diceValues; + private int category; + private Player player1; + private Yatzy_Sheet sheet = new Yatzy_Sheet(); - public ArrayList newPlayer(int playerCount, String name){ - - for(int i = 0; i < playerCount; i++){ - Player p1 = new Player(name, null); - player.add(p1); - } - return player; - } - - public int showScore(){ - Player secondPlayer = player.get(1); - return secondPlayer.getSheet(); - } - + private Ones ones = new Ones(player1); + private Twos twos = new Twos(player1); + private Threes threes = new Threes(player1); + private Fours fours = new Fours(player1); + private Fives fives = new Fives(player1); + private Sixes sixes = new Sixes(player1); + private TwoPairs twoPairs = new TwoPairs(player1); + private ThreePairs threePairs = new ThreePairs(player1); + private FourPairs fourPairs = new FourPairs(player1); + private FullHouse fullHouse = new FullHouse(player1); + private StraightFlush straightFlush = new StraightFlush(player1); + private RoyalStraightFlush royalStraightFlush = new RoyalStraightFlush(player1); + private Yatzy yatzy = new Yatzy(player1); + public void startgame(int playerCount, String[] name, int numberOfDice){ for(int i = 0; i < playerCount; i++){ - Yatzy_Sheet sheet = new Yatzy_Sheet(); - Player player1 = new Player(name[i], sheet, dice); + player1 = new Player(name[i], sheet, dice); player.add(player1); } } @@ -42,7 +57,47 @@ public class Game { return diceValues; } - public void choosCategory(int diceValues){ - + public void choosCategory(int category){ + switch(category){ + case 1: + ones.correctCategory(diceValues); + sheet.addScore(0, ones.getScore()); + case 2: + twos.correctCategory(diceValues); + sheet.addScore(1, twos.getScore()); + case 3: + threes.correctCategory(diceValues); + sheet.addScore(2, threes.getScore()); + case 4: + fours.correctCategory(diceValues); + sheet.addScore(3, fours.getScore()); + case 5: + fives.correctCategory(diceValues); + sheet.addScore(4, fives.getScore()); + case 6: + sixes.correctCategory(diceValues); + sheet.addScore(5, sixes.getScore()); + case 7: + twoPairs.correctCategory(diceValues); + sheet.addScore(6, twoPairs.getScore()); + case 8: + threePairs.correctCategory(diceValues); + sheet.addScore(7, threePairs.getScore()); + case 9: + fourPairs.correctCategory(diceValues); + sheet.addScore(8, fourPairs.getScore()); + case 10: + fullHouse.correctCategory(diceValues); + sheet.addScore(9, fullHouse.getScore()); + case 11: + straightFlush.correctCategory(diceValues); + sheet.addScore(10, straightFlush.getScore()); + case 12: + royalStraightFlush.correctCategory(diceValues); + sheet.addScore(11, royalStraightFlush.getScore()); + case 13: + yatzy.correctCategory(diceValues); + sheet.addScore(12, yatzy.getScore()); + } } }