diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..73f69e0
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml
new file mode 100644
index 0000000..af78b50
--- /dev/null
+++ b/.idea/libraries/lib.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..dda7141
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..1f55f5d
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gruppe06-hufflepuff-projekt3-catan.iml b/gruppe06-hufflepuff-projekt3-catan.iml
new file mode 100644
index 0000000..df9bc4d
--- /dev/null
+++ b/gruppe06-hufflepuff-projekt3-catan.iml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Faction.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Faction.class
new file mode 100644
index 0000000..e858b80
Binary files /dev/null and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Faction.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Land.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Land.class
new file mode 100644
index 0000000..a42363d
Binary files /dev/null and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Land.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Resource.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Resource.class
new file mode 100644
index 0000000..691739a
Binary files /dev/null and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Resource.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Structure.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Structure.class
new file mode 100644
index 0000000..5450d08
Binary files /dev/null and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Structure.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config.class
new file mode 100644
index 0000000..b6deddd
Binary files /dev/null and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$1.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$1.class
new file mode 100644
index 0000000..94798d1
Binary files /dev/null and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$1.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$Actions.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$Actions.class
new file mode 100644
index 0000000..6c4a87a
Binary files /dev/null and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$Actions.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy.class
new file mode 100644
index 0000000..86b6216
Binary files /dev/null and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoard.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoard.class
new file mode 100644
index 0000000..5eb62b8
Binary files /dev/null and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoard.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoardTextView.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoardTextView.class
new file mode 100644
index 0000000..808965a
Binary files /dev/null and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoardTextView.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerGame.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerGame.class
new file mode 100644
index 0000000..1abbc24
Binary files /dev/null and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerGame.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/Edge.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/Edge.class
new file mode 100644
index 0000000..0204af4
Binary files /dev/null and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/Edge.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/FieldAnnotationPosition.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/FieldAnnotationPosition.class
new file mode 100644
index 0000000..7c662ff
Binary files /dev/null and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/FieldAnnotationPosition.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/HexBoard.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/HexBoard.class
new file mode 100644
index 0000000..2d797ed
Binary files /dev/null and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/HexBoard.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/HexBoardTextView.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/HexBoardTextView.class
new file mode 100644
index 0000000..93a6dd9
Binary files /dev/null and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/HexBoardTextView.class differ
diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/Label.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/Label.class
new file mode 100644
index 0000000..034467e
Binary files /dev/null and b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/Label.class differ
diff --git a/src/ch/zhaw/catan/SiedlerBoard.java b/src/ch/zhaw/catan/SiedlerBoard.java
index 9143967..aca0679 100644
--- a/src/ch/zhaw/catan/SiedlerBoard.java
+++ b/src/ch/zhaw/catan/SiedlerBoard.java
@@ -2,13 +2,61 @@ package ch.zhaw.catan;
import ch.zhaw.catan.Config.Land;
import ch.zhaw.hexboard.HexBoard;
+import ch.zhaw.hexboard.Label;
import java.awt.*;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
public class SiedlerBoard extends HexBoard {
+ Map lowerFieldLabel = new HashMap<>();
+
+ public void createFixGamefield(){
+ Integer[][] waterCoordinates = {{4,2},{6,2},{8,2},{10,2},{3,5},{11,5},{2,8},{12,8},{1,11},
+ {13,11},{2,14},{12,14},{3,17},{11,17},{4,20},{6,20},{8,20},{10,20}};
+ Integer[][] desertCoordinates = {{7,11}};
+ Integer[][] forestCoordinates = {{5,5,6},{10,8,10},{3,11,5},{8,14,3}};
+ Integer[][] hillCoordinates = {{5,11,9},{5,17,8},{9,17,11}};
+ Integer[][] fieldCoordinates = {{4,8,2},{8,8,5},{11,11,9},{4,14,10}};
+ Integer[][] pastureCoordinates = {{7,5,3},{9,5,8},{10,14,12},{7,17,4}};
+ Integer[][] mountainCoordinates = {{6,8,4},{9,11,6},{6,14,11}};
+
+ placeFieldWithoutLabel(Land.WATER, waterCoordinates);
+ placeFieldWithoutLabel(Land.DESERT, desertCoordinates);
+ placeFieldWithLabel(Land.FOREST, forestCoordinates);
+ placeFieldWithLabel(Land.HILLS, hillCoordinates);
+ placeFieldWithLabel(Land.FIELDS, fieldCoordinates);
+ placeFieldWithLabel(Land.PASTURE, pastureCoordinates);
+ placeFieldWithLabel(Land.MOUNTAIN, mountainCoordinates);
+
+
+ }
+
+ private void placeFieldWithoutLabel(Land fieldType, Integer[][] fieldCoordinates) {
+ for(Integer[] coordinates : fieldCoordinates) {
+ addField(new Point(coordinates[0], coordinates[1]), fieldType);
+ }
+ }
+ private void placeFieldWithLabel(Land fieldType, Integer[][] fieldInformation) {
+ for(Integer[] information : fieldInformation) {
+ addField(new Point(information[0], information[1]), fieldType);
+ char[] label = information[2].toString().toCharArray();
+ if (label.length == 1) {
+ lowerFieldLabel.put(new Point(information[0], information[1]), new ch.zhaw.hexboard.Label('0', label[0]));
+ } else {
+ lowerFieldLabel.put(new Point(information[0], information[1]), new Label(label[0], label[1]));
+ }
+ }
+ }
+
+
+
+
+
+
//TODO: Add fields, constructors and methods as you see fit. Do NOT change the signature
// of the methods below.