Merge remote-tracking branch 'origin/main' into main

# Conflicts: # .idea/misc.xml
2021-11-29 15:57:01 +01:00
parent ce31d0f439 ef51b7c980
commit d70a3daed0
3 changed files with 2 additions and 26 deletions
@@ -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;
-    }
-
 }