Merge remote-tracking branch 'origin/main'

.gitignore

@@ -0,0 +1 @@
+/out/

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="openjdk-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

src/ch/zhaw/catan/Dummy.java

@@ -15,15 +15,14 @@ public class Dummy {
     SHOW, QUIT
   }
 
-
   private void run() {
     TextIO textIO = TextIoFactory.getTextIO();
     TextTerminal<?> textTerminal = textIO.getTextTerminal();
 
     SiedlerBoard board = new SiedlerBoard();
     board.addField(new Point(2, 2), Land.FOREST);
-    board.setCorner(new Point(3, 3), "RR");
-    board.setEdge(new Point(2, 0), new Point(3, 1), "r");
+    board.setCorner(new Point(3, 3), new Settlement(Config.Faction.RED));
+    board.setEdge(new Point(2, 0), new Point(3, 1), new Road(Config.Faction.BLUE));
     board.addFieldAnnotation(new Point(2, 2), new Point(3, 1), "AA");
 
     Map<Point, Label> lowerFieldLabel = new HashMap<>();

src/ch/zhaw/catan/Player.java

@@ -0,0 +1,61 @@
+package ch.zhaw.catan;
+
+import java.util.HashMap;
+
+/**
+ * New Class PLayer
+ * This class is here to add players to the game.
+ * @author: Stefan Amador
+ */
+public class Player {
+
+    private String name;
+    private Config.Faction faction;
+    private HashMap<Config.Resource,Integer> resources;
+    private int roadsToUse;
+    private int settlementsToUse;
+
+    public Player (String name, Config.Faction faction){
+        //Datenfelder
+        this.name = name;
+        this.faction = faction;
+        roadsToUse = Config.Structure.ROAD.getStockPerPlayer();
+        settlementsToUse = Config.Structure.SETTLEMENT.getStockPerPlayer();
+        //Ressourcen initialisiern
+        resources = new HashMap<>();
+        for(Config.Resource resource : Config.Resource.values()) {
+            resources.put(resource,0);
+        }
+
+    }
+
+    /**
+     * This method returns all the resources the player has at the moment
+     * @return HashMap
+     */
+    public HashMap<Config.Resource,Integer> getResources() {
+        return resources;
+    }
+
+
+    public boolean buildRoad() {
+        if (roadsToUse > 0) {
+            roadsToUse--;
+            return true;
+        }
+        return false;
+
+    }
+
+
+    public boolean buildSettlement() {
+        if (settlementsToUse > 0) {
+            settlementsToUse--;
+            return true;
+        }
+        return false;
+    }
+
+
+
+}

src/ch/zhaw/catan/Road.java

@@ -0,0 +1,19 @@
+package ch.zhaw.catan;
+
+import java.util.HashMap;
+
+public class Road {
+    private HashMap<Config.Resource,Integer> buildCost;
+    private Config.Faction faction;
+
+    public Road(Config.Faction faction) {
+        this.faction = faction;
+        buildCost = new HashMap<>();
+        buildCost.put(Config.Resource.BRICK,1);
+        buildCost.put(Config.Resource.LUMBER,1);
+    }
+
+    public HashMap<Config.Resource,Integer> getBuildCost() {
+        return buildCost;
+    }
+}

src/ch/zhaw/catan/Settlement.java

@@ -0,0 +1,22 @@
+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);
+    }
+
+    public HashMap<Config.Resource,Integer> getBuildCost() {
+        return buildCost;
+    }
+
+}

src/ch/zhaw/catan/Siedler.java

@@ -16,5 +16,7 @@ public class Siedler {
         TextTerminal<?> textTerminal = textIO.getTextTerminal();
         textTerminal.println(game.getBoard().getTextView());
 
+
+
     }
 }

src/ch/zhaw/catan/SiedlerBoard.java

@@ -8,7 +8,7 @@ import java.awt.*;
 import java.util.*;
 import java.util.List;
 
-public class SiedlerBoard extends HexBoard<Land, String, String, String> {
+public class SiedlerBoard extends HexBoard<Land, Settlement, Road, String> {
 
     Map<Point, ch.zhaw.hexboard.Label> lowerFieldLabel = new HashMap<>();
 

src/ch/zhaw/catan/SiedlerGame.java

@@ -24,7 +24,9 @@ public class SiedlerGame {
   static final int FOUR_TO_ONE_TRADE_OFFER = 4;
   static final int FOUR_TO_ONE_TRADE_WANT = 1;
 
-  SiedlerBoard board;
+  private SiedlerBoard board;
+  private Player[] allPlayers;
+  private int winPoints;
 
   /**
    * Constructs a SiedlerGame game state object.
@@ -38,6 +40,8 @@ public class SiedlerGame {
   public SiedlerGame(int winPoints, int numberOfPlayers) {
     board = new SiedlerBoard();
     board.createFixGamefield();
+    allPlayers = new Player[numberOfPlayers];
+    this.winPoints = winPoints;
   }
 
   /**
@@ -69,6 +73,9 @@ public class SiedlerGame {
    */
   public List<Faction> getPlayerFactions() {
     // TODO: Implement
+    Faction[] factions = new Faction[allPlayers.length];
+
+
     return Collections.emptyList();
   }
 
@@ -212,7 +219,18 @@ public class SiedlerGame {
    * @return true, if the placement was successful
    */
   public boolean buildRoad(Point roadStart, Point roadEnd) {
-    // TODO: Implement
+    //1. Check if Edge
+    if(!board.hasEdge(roadStart,roadEnd)){
+        // TODO: Error message
+    }
+    //2. Check if Edge is empty
+    if(board.getEdge(roadStart,roadEnd) != null) {
+      // TODO: Error message
+    }
+    //3. Can Player build road
+    // TODO
+
+
     return false;
   }
 

src/ch/zhaw/hexboard/HexBoardTextView.java

@@ -98,7 +98,7 @@ import java.util.Map;
 public class HexBoardTextView<F, C, E, A> {
 
   private static final String ONE_SPACE    = " ";
-  private static final String TWO_SPACES = "  ";
+  private static final String TWO_SPACES   = "  ";
   private static final String FOUR_SPACES  = "    ";
   private static final String FIVE_SPACES  = "     ";
   private static final String SIX_SPACES   = "     ";