EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-06-25 10:44:42 +02:00
Code Issues Projects Releases Wiki Activity

lagde flere tester i PlayerDeckTest

Browse Source
This commit is contained in:
Petter Tobias Madsen
2020-03-03 15:25:39 +01:00
parent f2a29a2b08
commit 42726b5e78
3 changed files with 80 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/inf112/fiasko/roborally/objects/Deck.java
View File

@ -29,12 +29,12 @@ public abstract class Deck<T> implements IDeck<T> {
Random randomNumber = new Random();
for (int i = cardDeck.size() - 1; i > 0; i--) {
int index = randomNumber.nextInt(i);
int randomIndex = randomNumber.nextInt(i);
T CardIndex = cardDeck.get(index);
cardDeck.add(index, cardDeck.get(i));
cardDeck.remove(index+1);
cardDeck.add(i, CardIndex);
T CardRandomIndex = cardDeck.get(randomIndex);
cardDeck.add(randomIndex, cardDeck.get(i));
cardDeck.remove(randomIndex+1);
cardDeck.add(i, CardRandomIndex);
cardDeck.remove(i+1);
}
@ -77,7 +77,8 @@ public abstract class Deck<T> implements IDeck<T> {
@Override
public void emptyInto(IDeck<T> other) {
Deck<T> otherDeck = (Deck) other;
for (int i=0; i<otherDeck.size();i++){
int size = otherDeck.size();
for (int i=0; i<size;i++){
otherDeck.draw(this);
}
@ -107,11 +108,7 @@ public abstract class Deck<T> implements IDeck<T> {
*/
@Override
public List<T> getCards() {
ArrayList<T> returnDeck = new ArrayList();
for (int i=0;i<cardDeck.size();i++){
returnDeck.add(cardDeck.get(i));
}
return returnDeck;
return cardDeck;
}

5
src/main/java/inf112/fiasko/roborally/objects/PlayerDeck.java
View File

@ -4,7 +4,12 @@ import java.util.ArrayList;
public class PlayerDeck<ProgrammingCard> extends Deck<ProgrammingCard> {
/**
* initalizes the PlayerDeck with a list of cards
* @param cardlist list of programing cards
*/
public PlayerDeck(ArrayList<ProgrammingCard> cardlist) {
super(cardlist);
}
}