jschmelz/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

removed card and fixed codes style

Browse Source 
removed card because it was unnecessary and reworked all classes containing it to implement the change
This commit is contained in:
Hanno Fleischer
2024-11-14 15:49:22 +01:00
parent c7b65d949a
commit 9bafd749b6
4 changed files with 18 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Projekte/mdga/model/src/main/java/pp.mdga/game/Game.java
View File

@@ -14,8 +14,8 @@ public class Game {
private int diceEyes;
private Map <Color, Player> players;
private Statistic gameStatistics;
private ArrayList<Card> drawPile;
private ArrayList<Card> discardPile = new ArrayList<>();
private ArrayList<BonusCard> drawPile;
private ArrayList<BonusCard> discardPile = new ArrayList<>();
private Board board;
private Color activeColor;
private LinkedList<Color> order;
@@ -31,11 +31,11 @@ public Game(){
gameStatistics = new Statistic();
drawPile = new ArrayList<>();
for (int i = 0; i < AMOUNT_OF_TURBO_CARDS; i++) {
drawPile.add(new Card(BonusCard.TURBO));
drawPile.add(BonusCard.TURBO);
}
for (int i = 0; i < AMOUNT_OF_SHIELD_AND_SWAP_CARDS; i++) {
drawPile.add(new Card(BonusCard.SHIELD));
drawPile.add(new Card(BonusCard.SWAP));
drawPile.add(BonusCard.SWAP);
drawPile.add(BonusCard.SHIELD);
}
board = new Board();
}
@@ -117,7 +117,7 @@ public void setGameStatistics(Statistic gameStatistics) {
*
* @return the draw pile
*/
public ArrayList<Card> getDrawPile() {
public ArrayList<BonusCard> getDrawPile() {
return drawPile;
}
@@ -126,7 +126,7 @@ public ArrayList<Card> getDrawPile() {
*
* @param drawPile the new draw pile
*/
public void setDrawPile(ArrayList<Card> drawPile) {
public void setDrawPile(ArrayList<BonusCard> drawPile) {
this.drawPile = drawPile;
}
@@ -135,7 +135,7 @@ public void setDrawPile(ArrayList<Card> drawPile) {
*
* @return the discard pile
*/
public ArrayList<Card> getDiscardPile() {
public ArrayList<BonusCard> getDiscardPile() {
return discardPile;
}
@@ -144,7 +144,7 @@ public ArrayList<Card> getDiscardPile() {
*
* @param discardPile the new discard pile
*/
public void setDiscardPile(ArrayList<Card> discardPile) {
public void setDiscardPile(ArrayList<BonusCard> discardPile) {
this.discardPile = discardPile;
}