/**
 * Created with IntelliJ IDEA.
 * User: tjunghans
 * Date: 29.10.2013
 * Time: 10:48 PM
 * To change this template use File | Settings | File Templates.
 */
public class Game {

    private ShapeDeck deck;

    public boolean start() {
        System.out.println("Start Game");

        deck = new ShapeDeck();

        return true;
    }

    public boolean newRound(Player player1, Player player2) {

        Shape playerOneShape = deck.getRandomShapeFromDeck();
        Shape playerTwoShape = deck.getRandomShapeFromDeck();

        System.out.println(player1.getPlayerType() + " vs " + player2.getPlayerType());
        System.out.println(playerOneShape.getShapeType());
        System.out.println(playerTwoShape.getShapeType());

        return true;
    }

}

@@ -1,8 +1,57 @@
+import java.util.HashMap;%0Aimport java.util.Map;%0A%0A
 /**%0A * C
@@ -262,322 +262,1095 @@
    p
-ublic boolean start() %7B%0A        System.out.println(%22Start Game%22);%0A%0A        deck = new ShapeDeck();%0A%0A        return true;%0A    %7D%0A%0A    public boolean newRound(Player player1, Player player2) %7B%0A%0A        Shape playerOneShape = deck.getRandomShapeFromDeck();%0A        Shape playerTwoShape = deck.getRandomShapeFromDeck();
+rivate int%5B%5D%5B%5D resultMatrix = new int%5B%5D%5B%5D%7B%0A            %7B 0, -1, 1 %7D,%0A            %7B 1, 0, -1 %7D,%0A            %7B -1, 1, 0 %7D%0A    %7D;%0A%0A    private Map%3CString, Integer%3E shapeIndex = new HashMap%3CString, Integer%3E();%0A%0A    public Game() %7B%0A        this.shapeIndex.put(%22rock%22, 0);%0A        this.shapeIndex.put(%22paper%22, 1);%0A        this.shapeIndex.put(%22scissors%22, 2);%0A    %7D%0A%0A    public boolean start() %7B%0A        System.out.println(%22Start Game%22);%0A%0A        deck = new ShapeDeck();%0A%0A        return true;%0A    %7D%0A%0A    public boolean newRound(Player player1, Player player2) %7B%0A%0A        Shape playerOneShape = deck.getRandomShapeFromDeck();%0A        Shape playerTwoShape = deck.getRandomShapeFromDeck();%0A%0A        // Compare shapes%0A        int result = this.resultMatrix%5Bthis.shapeIndex.get(playerOneShape.getShapeType())%5D%5Bthis.shapeIndex.get(playerTwoShape.getShapeType())%5D;%0A%0A        String resultText;%0A%0A        if (result %3E 0) %7B%0A            resultText = %22Player 1 wins%22;%0A        %7D else if (result %3C 0) %7B%0A            resultText = %22Player 2 wins%22;%0A        %7D else %7B%0A            resultText = %22It's a tie%22;%0A        %7D
 %0A%0A  
@@ -1552,16 +1552,56 @@
 Type());
+%0A        System.out.println(resultText);
 %0A%0A      
@@ -1622,10 +1622,12 @@
 %0A    %7D%0A%0A
+%0A%0A
 %7D%0A

Update game