From e7c3a40ac05c52dab0e3ff61226b4cc1293beab5 Mon Sep 17 00:00:00 2001
From: Arne Keller <arne.keller01@yahoo.de>
Date: Wed, 11 Mar 2020 11:13:25 +0100
Subject: [PATCH] Only build items when not expecting dice roll

---
 generic_waf2_test_output.txt                   | 18 +++++++++---------
 .../informatik/cardgame/model/CardGame.java    |  2 ++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/generic_waf2_test_output.txt b/generic_waf2_test_output.txt
index 662f559..c903259 100644
--- a/generic_waf2_test_output.txt
+++ b/generic_waf2_test_output.txt
@@ -28,7 +28,7 @@ wood
 spider
 Error, roll dice, please
 wood
-Error, could not build item
+Error, awaiting dice roll, can not build
 Error, unknown command
 EMPTY
 Error, can not get buildable items: awaiting dice roll
@@ -38,7 +38,7 @@ survived
 snake
 Error, roll dice, please
 wood
-Error, could not build item
+Error, awaiting dice roll, can not build
 Error, unknown command
 EMPTY
 Error, can not get buildable items: awaiting dice roll
@@ -48,7 +48,7 @@ survived
 tiger
 Error, roll dice, please
 wood
-Error, could not build item
+Error, awaiting dice roll, can not build
 Error, unknown command
 EMPTY
 Error, can not get buildable items: awaiting dice roll
@@ -166,16 +166,16 @@ sailingraft
 shack
 steamboat
 spider
-<e
-<e
+Error, awaiting dice roll, can not build
+Error, can not get buildable items: awaiting dice roll
 survived
 OK
 spider
-<e
-<e
+Error, awaiting dice roll, can not build
+Error, can not get buildable items: awaiting dice roll
 survived
 OK
 spider
-<e
-<e
+Error, awaiting dice roll, can not build
+Error, can not get buildable items: awaiting dice roll
 survived
diff --git a/src/edu/kit/informatik/cardgame/model/CardGame.java b/src/edu/kit/informatik/cardgame/model/CardGame.java
index 0f1850b..26d0929 100644
--- a/src/edu/kit/informatik/cardgame/model/CardGame.java
+++ b/src/edu/kit/informatik/cardgame/model/CardGame.java
@@ -112,6 +112,8 @@ public class CardGame {
     public String build(Item item) throws LogicException {
         if (item == null) {
             throw new LogicException("can not build item");
+        } else if (awaitingDiceRoll()) {
+            throw new LogicException("awaiting dice roll, can not build");
         } else if (item.requiresFireplace() && !items.contains(FIREPLACE)) {
             throw new LogicException("need fireplace to build");
         } else if (items.contains(item)) {