EpicKnarvik97/Fiasko
EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-02-01 07:39:35 +01:00
Code Issues Projects Releases Wiki Activity

lagde flere metoder i deck klassen

Browse Source
This commit is contained in:
Tobydrama 2020-03-03 04:33:58 +01:00
parent 62ce1fdc7e
commit f3a02b7ecc
1 changed files with 24 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,5 @@
package inf112.fiasko.roborally.objects; package inf112.fiasko.roborally.objects;
import inf112.fiasko.roborally.element_properties.Action;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Random; import java.util.Random;
@ -25,69 +23,49 @@ public class Deck {
} }
} }
public ProgrammingCard drawCard(){ public ProgrammingCard drawCard(){
ProgrammingCard draw = cardDeck.get(0); ProgrammingCard draw = cardDeck.get(0);
cardDeck.remove(0); cardDeck.remove(0);
return draw; return draw;
} }
public void drawNCardsFromOtherDeck(int n, Deck otherDeck){
if (n<1 || n>otherDeck.getCards().size()){
throw new IllegalArgumentException("cant draw negativ cards or more cards then are in the deck");
}
else{
for (int i=0;i<n;i++){
cardDeck.add(otherDeck.drawCard());
}
}
}
public void drawCardOtherDeck(Deck otherCardDeck){ public void drawCardOtherDeck(Deck otherCardDeck){
cardDeck.add(otherCardDeck.drawCard()); cardDeck.add(otherCardDeck.drawCard());
} }
public ArrayList<ProgrammingCard> getDeck(){
return cardDeck;
}
public ArrayList<ProgrammingCard> drawAllCard(){ public ArrayList<ProgrammingCard> drawAllCard(){
ArrayList<ProgrammingCard> allCards= new ArrayList<>(); ArrayList<ProgrammingCard> allCards= new ArrayList<>();
int cardDecksize = cardDeck.size(); int cardDeckSize = cardDeck.size();
for (int i=0;i<cardDecksize;i++){ for (int i=0;i<cardDeckSize;i++){
allCards.add(cardDeck.get((cardDecksize-1)-i)); allCards.add(cardDeck.get((cardDeckSize-1)-i));
} }
for (int i=0; i<cardDecksize;i++){ for (int i=0; i<cardDeckSize;i++){
cardDeck.remove(0); cardDeck.remove(0);
} }
return allCards; return allCards;
} }
public ArrayList<ProgrammingCard> getCards(){
return cardDeck;
public static void main(String args[]) //skal fjernes måtte bare se at shuffle virket
{
ArrayList<ProgrammingCard> cardDeck = new ArrayList<>();
cardDeck.add(new ProgrammingCard(3, Action.MOVE_1));
cardDeck.add(new ProgrammingCard(4, Action.MOVE_1));
cardDeck.add(new ProgrammingCard(5, Action.MOVE_1));
cardDeck.add(new ProgrammingCard(6, Action.MOVE_1));
ArrayList<ProgrammingCard> cardDeck2 = new ArrayList<>();
cardDeck2.add(new ProgrammingCard(8, Action.MOVE_1));
cardDeck2.add(new ProgrammingCard(9, Action.MOVE_1));
cardDeck2.add(new ProgrammingCard(99, Action.MOVE_1));
cardDeck2.add(new ProgrammingCard(8989, Action.MOVE_1));
Deck test66 = new Deck(cardDeck2);
Deck test23 = new Deck(cardDeck);
System.out.println("drawAllbefore "+test66.getDeck().size());
System.out.println("drawAll "+test66.drawAllCard().size());
System.out.println("drawAllafter "+test66.getDeck().size());
} }
/*
test.shuffle();
ArrayList<ProgrammingCard> cardDeckShuffle = test.getDeck();
System.out.println("size: "+cardDeckShuffle.size());
for (int i = 0; i< cardDeckShuffle.size();i++ ){
System.out.println(cardDeckShuffle.get(i).getValue());
public Boolean isEmpty(){
return cardDeck.isEmpty();
} }
*/ public int size(){
return cardDeck.size();
}
} }