|
|
@ -47,21 +47,21 @@ public class SolitaerGamePanel extends JPanel { |
|
|
|
mouseL = new MyMouseListener(save); |
|
|
|
this.addMouseListener(mouseL); |
|
|
|
|
|
|
|
deck = new CardDeck(); |
|
|
|
deck.shuffelDeck(); |
|
|
|
// deck = new CardDeck(); |
|
|
|
// deck.shuffelDeck(); |
|
|
|
|
|
|
|
for (int i = 0; i < STARTSTACK_SIZE; i++) { |
|
|
|
int y = setLayouty(1); |
|
|
|
start[i] = new StartStack(setLayoutX(i), y); |
|
|
|
int tmp = i; |
|
|
|
while(tmp != 0) { |
|
|
|
start[i].addCard(deck.getDeck().remove(0)); |
|
|
|
tmp -= 1; |
|
|
|
} |
|
|
|
Card card = deck.getDeck().remove(0); |
|
|
|
card.setFaceUp(true); |
|
|
|
start[i].addCard(card); |
|
|
|
this.add(start[i]); |
|
|
|
// int tmp = i; |
|
|
|
// while (tmp != 0) { |
|
|
|
// start[i].addCard(deck.getDeck().remove(0)); |
|
|
|
// tmp -= 1; |
|
|
|
// } |
|
|
|
// Card card = deck.getDeck().remove(0); |
|
|
|
// card.setFaceUp(true); |
|
|
|
// start[i].addCard(card); |
|
|
|
// this.add(start[i]); |
|
|
|
} |
|
|
|
|
|
|
|
for (int i = 0; i < ABLAGESTACK_SIZE; i++) { |
|
|
@ -84,22 +84,24 @@ public class SolitaerGamePanel extends JPanel { |
|
|
|
default: |
|
|
|
break; |
|
|
|
} |
|
|
|
this.add(ablage[i]); |
|
|
|
// this.add(ablage[i]); |
|
|
|
} |
|
|
|
|
|
|
|
waste = new WasteStack(setLayoutX(1), OFFSET_STACKS_Y); |
|
|
|
geber = new GeberStack(setLayoutX(0), OFFSET_STACKS_Y, waste); |
|
|
|
|
|
|
|
while(deck.getDeck().size() != 1) { |
|
|
|
geber.addCard(deck.getDeck().remove(0)); |
|
|
|
} |
|
|
|
|
|
|
|
Card card = deck.getDeck().remove(0); |
|
|
|
card.setFaceUp(true); |
|
|
|
waste.addCard(card); |
|
|
|
// while (deck.getDeck().size() != 1) { |
|
|
|
// geber.addCard(deck.getDeck().remove(0)); |
|
|
|
// } |
|
|
|
// |
|
|
|
// Card card = deck.getDeck().remove(0); |
|
|
|
// card.setFaceUp(true); |
|
|
|
// waste.addCard(card); |
|
|
|
// |
|
|
|
// this.add(waste); |
|
|
|
// this.add(geber); |
|
|
|
|
|
|
|
this.add(waste); |
|
|
|
this.add(geber); |
|
|
|
restartGame(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
@ -108,10 +110,54 @@ public class SolitaerGamePanel extends JPanel { |
|
|
|
} |
|
|
|
|
|
|
|
private int setLayouty(int _row) { |
|
|
|
if(_row == 1) |
|
|
|
if (_row == 1) |
|
|
|
return IMAGE_HIGHT + (OFFSET_STACKS_Y * 3); |
|
|
|
else |
|
|
|
return OFFSET_STACKS_Y; |
|
|
|
} |
|
|
|
|
|
|
|
public void restartGame() { |
|
|
|
deck = new CardDeck(); |
|
|
|
deck.shuffelDeck(); |
|
|
|
|
|
|
|
for (int i = 0; i < STARTSTACK_SIZE; i++) { |
|
|
|
int tmp = i; |
|
|
|
while (tmp != 0) { |
|
|
|
start[i].addCard(deck.getDeck().remove(0)); |
|
|
|
tmp -= 1; |
|
|
|
} |
|
|
|
Card card = deck.getDeck().remove(0); |
|
|
|
card.setFaceUp(true); |
|
|
|
start[i].addCard(card); |
|
|
|
this.add(start[i]); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < ABLAGESTACK_SIZE; i++) { |
|
|
|
this.add(ablage[i]); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
while (deck.getDeck().size() != 1) { |
|
|
|
geber.addCard(deck.getDeck().remove(0)); |
|
|
|
} |
|
|
|
|
|
|
|
Card card = deck.getDeck().remove(0); |
|
|
|
card.setFaceUp(true); |
|
|
|
waste.addCard(card); |
|
|
|
|
|
|
|
this.add(waste); |
|
|
|
this.add(geber); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|