From ef51b7c980fcbc10f17d7726d677338854242eae Mon Sep 17 00:00:00 2001
From: Andrin Fassbind <fassband@students.zhaw.ch>
Date: Mon, 29 Nov 2021 15:55:36 +0100
Subject: [PATCH] overworked Settlement

---
 .idea/misc.xml                    |  2 +-
 .idea/runConfigurations.xml       | 10 ----------
 src/ch/zhaw/catan/Settlement.java | 16 +---------------
 3 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index b573818..6bc01a8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_16" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/ch/zhaw/catan/Settlement.java b/src/ch/zhaw/catan/Settlement.java
index 6e11e5d..773324c 100644
--- a/src/ch/zhaw/catan/Settlement.java
+++ b/src/ch/zhaw/catan/Settlement.java
@@ -1,22 +1,8 @@
 package ch.zhaw.catan;
 
-import java.util.HashMap;
-
 public class Settlement {
-    private HashMap<Config.Resource,Integer> buildCost;
-    private Config.Faction faction;
 
     public Settlement(Config.Faction faction) {
-        this.faction = faction;
-        buildCost = new HashMap<>();
-        buildCost.put(Config.Resource.LUMBER,1);
-        buildCost.put(Config.Resource.BRICK,1);
-        buildCost.put(Config.Resource.GRAIN,1);
-        buildCost.put(Config.Resource.WOOL,1);
+        super(faction);
     }
-
-    public HashMap<Config.Resource,Integer> getBuildCost() {
-        return buildCost;
-    }
-
 }