ZHAW-IT21b_WIN
/
gruppe06-hufflepuff-projekt3-catan
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
Leonardo Brandenberger 2021-12-10 10:38:08 +01:00
parent 74e19ad416 c9757f22fc
commit d1d6db894b
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ch/zhaw/catan/Road.java
View File

@ -1,6 +1,6 @@
package ch.zhaw.catan; package ch.zhaw.catan;
import java.awt.*; import java.awt.Point;
/// TODO: 09/12/2021 Java Doc /// TODO: 09/12/2021 Java Doc
@ -15,9 +15,10 @@ public class Road extends Structure {
/** /**
* Constructor of Road * Constructor of Road
*
* @param faction The faction of the owner * @param faction The faction of the owner
* @param start the coordinates of the start Point * @param start the coordinates of the start Point
* @param end the coordinates of the End Point * @param end the coordinates of the End Point
*/ */
public Road(Config.Faction faction, Point start, Point end) { public Road(Config.Faction faction, Point start, Point end) {
super(faction); super(faction);
@ -26,7 +27,6 @@ public class Road extends Structure {
} }
/** /**
*
* @return the coordinates of the start Point * @return the coordinates of the start Point
*/ */
public Point getStart() { public Point getStart() {
@ -34,7 +34,6 @@ public class Road extends Structure {
} }
/** /**
*
* @return the coordinates of the end Point * @return the coordinates of the end Point
*/ */
public Point getEnd() { public Point getEnd() {

2
src/ch/zhaw/catan/Settlement.java
View File

@ -1,6 +1,6 @@
package ch.zhaw.catan; package ch.zhaw.catan;
import java.awt.*; import java.awt.Point;
/** /**
* Sub Class of Structure and Super Class of City * Sub Class of Structure and Super Class of City

7
src/ch/zhaw/catan/SiedlerBoard.java
View File

@ -4,13 +4,13 @@ import ch.zhaw.hexboard.HexBoard;
import ch.zhaw.hexboard.Label; import ch.zhaw.hexboard.Label;
import java.awt.Point; import java.awt.Point;
import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map;
import java.util.Iterator; import java.util.Iterator;
import java.util.Collections; import java.util.List;
import java.util.Map;
//TODO Enhance JavaDoc //TODO Enhance JavaDoc
/** /**
@ -138,6 +138,7 @@ public class SiedlerBoard extends HexBoard<Config.Land, Settlement, Road, String
/** /**
* This method checks for the player with the longest road according to the siedler game rules. * This method checks for the player with the longest road according to the siedler game rules.
*
* @param factionList a List with all factions which can place structures on the board * @param factionList a List with all factions which can place structures on the board
* @return the faction who owns the longest road with minimum length of 5, null there is no road longer then 4 * @return the faction who owns the longest road with minimum length of 5, null there is no road longer then 4
*/ */

4
src/ch/zhaw/catan/SiedlerGame.java
View File

@ -1,10 +1,10 @@
package ch.zhaw.catan; package ch.zhaw.catan;
import java.awt.Point; import java.awt.Point;
import java.util.Map;
import java.util.HashMap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Random; import java.util.Random;