From 0c9ea4e0ba4c26390479bfc80b2ebd5ad452f72d Mon Sep 17 00:00:00 2001
From: Arne Keller <arne.keller01@yahoo.de>
Date: Tue, 3 Mar 2020 18:42:59 +0100
Subject: [PATCH] Ballon is not a typo

---
 src/edu/kit/informatik/model/CardGame.java |  4 ++--
 src/edu/kit/informatik/model/Item.java     | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/edu/kit/informatik/model/CardGame.java b/src/edu/kit/informatik/model/CardGame.java
index c195800..86b5194 100644
--- a/src/edu/kit/informatik/model/CardGame.java
+++ b/src/edu/kit/informatik/model/CardGame.java
@@ -20,7 +20,7 @@ import static edu.kit.informatik.model.Card.THUNDERSTORM;
 import static edu.kit.informatik.model.Card.TIGER;
 import static edu.kit.informatik.model.Card.WOOD;
 import static edu.kit.informatik.model.Item.AXE;
-import static edu.kit.informatik.model.Item.BALLOON;
+import static edu.kit.informatik.model.Item.BALLON;
 import static edu.kit.informatik.model.Item.CLUB;
 import static edu.kit.informatik.model.Item.FIREPLACE;
 import static edu.kit.informatik.model.Item.HANG_GLIDER;
@@ -133,7 +133,7 @@ public class CardGame {
                 resources.removeLastOccurrence(resource);
             }
             items.add(item);
-            if (item.equals(STEAMBOAT) || item.equals(BALLOON)) {
+            if (item.equals(STEAMBOAT) || item.equals(BALLON)) {
                 // player won
                 endGame();
                 return "win";
diff --git a/src/edu/kit/informatik/model/Item.java b/src/edu/kit/informatik/model/Item.java
index 283b653..3b3d06c 100644
--- a/src/edu/kit/informatik/model/Item.java
+++ b/src/edu/kit/informatik/model/Item.java
@@ -12,7 +12,7 @@ public enum Item {
     SAILING_RAFT,
     HANG_GLIDER,
     STEAMBOAT,
-    BALLOON;
+    BALLON;
 
     public Card[] resourcesNeeded() {
         switch (this) {
@@ -30,7 +30,7 @@ public enum Item {
                 return new Card[] {WOOD, WOOD, METAL, METAL, PLASTIC, PLASTIC, PLASTIC, PLASTIC};
             case STEAMBOAT:
                 return new Card[] {METAL, METAL, METAL, METAL, METAL, METAL, PLASTIC};
-            case BALLOON:
+            case BALLON:
                 return new Card[] {WOOD, PLASTIC, PLASTIC, PLASTIC, PLASTIC, PLASTIC, PLASTIC};
             default: // we don't have any such items, but could add some eventually
                 throw new IllegalArgumentException("item does not need resources");
@@ -38,7 +38,7 @@ public enum Item {
     }
 
     public boolean requiresFireplace() {
-        return this.equals(STEAMBOAT) || this.equals(BALLOON);
+        return this.equals(STEAMBOAT) || this.equals(BALLON);
     }
 
     public boolean canHaveMoreThanOne() {
@@ -62,7 +62,7 @@ public enum Item {
             case "steamboat":
                 return STEAMBOAT;
             case "ballon":
-                return BALLOON;
+                return BALLON;
             default:
                 return null;
         }
@@ -85,8 +85,8 @@ public enum Item {
                 return "hangglider";
             case STEAMBOAT:
                 return "steamboat";
-            case BALLOON:
-                return "ballon"; // lol, a type in the specification!
+            case BALLON:
+                return "ballon";
             default:
                 return null;
         }