From 3576bf037069015f5d98bd87e725aad77c43f71c Mon Sep 17 00:00:00 2001 From: Alexander Hartung Date: Fri, 4 Feb 2022 16:57:15 +0100 Subject: [PATCH] ADD Cards to StartStacks --- src/main/java/solitaer/SolitaerGamePanel.java | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/src/main/java/solitaer/SolitaerGamePanel.java b/src/main/java/solitaer/SolitaerGamePanel.java index 2c22ba6..5d1165f 100644 --- a/src/main/java/solitaer/SolitaerGamePanel.java +++ b/src/main/java/solitaer/SolitaerGamePanel.java @@ -32,17 +32,40 @@ public class SolitaerGamePanel extends JPanel { public SolitaerGamePanel() { setLayout(null); + + + int Offset_x_Save = setLayoutX(STARTSTACK_SIZE + 1); + int Offset_y_Save = setLayouty(1); + + JLabel label = new JLabel(); + label.setText("selected Cards"); + label.setBounds(Offset_x_Save, Offset_y_Save - 25, 200, 25); + this.add(label); + + save = new SaveStack(Offset_x_Save, Offset_y_Save); + this.add(save); + mouseL = new MyMouseListener(save); this.addMouseListener(mouseL); deck = new CardDeck(); + System.out.println(deck.getDeck().size()); 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]); } + System.out.println(deck.getDeck().size()); for (int i = 0; i < ABLAGESTACK_SIZE; i++) { int x = setLayoutX(((STARTSTACK_SIZE - ABLAGESTACK_SIZE) + i)); @@ -67,17 +90,6 @@ public class SolitaerGamePanel extends JPanel { this.add(ablage[i]); } - int Offset_x_Save = setLayoutX(STARTSTACK_SIZE + 1); - int Offset_y_Save = setLayouty(1); - - JLabel label = new JLabel(); - label.setText("selected Cards"); - label.setBounds(Offset_x_Save, Offset_y_Save - 25, 200, 25); - this.add(label); - - save = new SaveStack(Offset_x_Save, Offset_y_Save); - this.add(save); - waste = new WasteStack(setLayoutX(1), OFFSET_STACKS_Y); geber = new GeberStack(setLayoutX(0), OFFSET_STACKS_Y, waste); this.add(waste);