diff --git a/bin/model/CharityTile.class b/bin/model/CharityTile.class index 8d5917c..80cfd97 100644 Binary files a/bin/model/CharityTile.class and b/bin/model/CharityTile.class differ diff --git a/bin/model/ChildTile.class b/bin/model/ChildTile.class index af89722..54da5e4 100644 Binary files a/bin/model/ChildTile.class and b/bin/model/ChildTile.class differ diff --git a/bin/model/DealTile.class b/bin/model/DealTile.class index 8c5c68c..3439ceb 100644 Binary files a/bin/model/DealTile.class and b/bin/model/DealTile.class differ diff --git a/bin/model/DoodadStack.class b/bin/model/DoodadStack.class index ddbe44a..b3885f0 100644 Binary files a/bin/model/DoodadStack.class and b/bin/model/DoodadStack.class differ diff --git a/bin/model/DoodadTile.class b/bin/model/DoodadTile.class index 80d2911..7e73a9e 100644 Binary files a/bin/model/DoodadTile.class and b/bin/model/DoodadTile.class differ diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class index ee05e29..dfb60c0 100644 Binary files a/bin/model/FinancialStatement.class and b/bin/model/FinancialStatement.class differ diff --git a/src/model/CharityTile.java b/src/model/CharityTile.java index 0b92dd8..a732946 100644 --- a/src/model/CharityTile.java +++ b/src/model/CharityTile.java @@ -12,13 +12,14 @@ public class CharityTile extends Tile @Override public void getLandedOn(Player p) { - //call view method + FinancialStatement f = p.getFinancialStatement(); + // call view method // TODO if (p.donateCharity()) { p.setCharityCount(p.getCharityCount() + 3); - p.getFinancialStatement().increaseCashBalance((int) -((p.getFinancialStatement().getTotalIncome()*.1))); + p.getFinancialStatement().increaseCashBalance((int) -((f.getTotalIncome()*.1))); } else { diff --git a/src/model/ChildTile.java b/src/model/ChildTile.java index c9bdbf5..bdc42fa 100644 --- a/src/model/ChildTile.java +++ b/src/model/ChildTile.java @@ -12,7 +12,6 @@ public class ChildTile extends Tile public void getLandedOn(Player p) { p.getFinancialStatement().addChild(); - p.getFinancialStatement().update(); } diff --git a/src/model/DealTile.java b/src/model/DealTile.java index 5cdebb3..c7543e4 100644 --- a/src/model/DealTile.java +++ b/src/model/DealTile.java @@ -21,9 +21,7 @@ public class DealTile extends Tile // TODO // For now, using a scanner to interact with user until GUI is ready: // Ask user to decide big/small deal: - Scanner s = new Scanner(System.in); - System.out.println("You landed on a deal tile. Enter 0 for small deal or 1 for big deal"); - String input = s.next(); + // Pick card from big/small deal stack: Card c; diff --git a/src/model/DoodadStack.java b/src/model/DoodadStack.java index a30512e..78b635c 100644 --- a/src/model/DoodadStack.java +++ b/src/model/DoodadStack.java @@ -67,7 +67,12 @@ public class DoodadStack extends CardStack _doodadStack = DoodadCardStack; } - + + @Override + public DoodadCard pickCard() + { + return (DoodadCard) super.pickCard(); + } diff --git a/src/model/DoodadTile.java b/src/model/DoodadTile.java index 5190806..97bc6b5 100644 --- a/src/model/DoodadTile.java +++ b/src/model/DoodadTile.java @@ -3,8 +3,6 @@ package model; public class DoodadTile extends Tile { private static DoodadStack _doodadStack; - private DoodadCard card; - private int amount; public DoodadTile(String name, int boardIndex) { @@ -15,18 +13,17 @@ public class DoodadTile extends Tile @Override public void getLandedOn(Player p) { - card = (DoodadCard) _doodadStack.pop(); - amount = card.getValue(); - if (p.getFinancialStatement().getCashBalance() > amount) - { - p.getFinancialStatement().setCashBalance(p.getFinancialStatement().getCashBalance() - amount); - p.getFinancialStatement().update(); - } - else if(p.getFinancialStatement().getCashBalance() < amount) - { - p.getFinancialStatement().setCashBalance(0); - p.getFinancialStatement().update(); - } + FinancialStatement f = p.getFinancialStatement(); + DoodadCard dc = _doodadStack.pickCard(); + int amount = dc.getValue(); + if (f.getCashBalance() > amount) + { + f.increaseCashBalance(-amount); + } + else if(f.getCashBalance() < amount) + { + f.setCashBalance(0); + } // Pop next card // Get cash out from card // Check if player has enough money to pay in full diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java index cbd79a0..c4a394a 100644 --- a/src/model/FinancialStatement.java +++ b/src/model/FinancialStatement.java @@ -91,7 +91,7 @@ public class FinancialStatement update(); } - public void update() + private void update() { _income = _salary + _REcashFlow; _expenses = _taxes + _homeMortgagePayment + _schoolLoanPayment + _carLoanPayment + _creditCardPayment + _otherExpenses + (_perChildExpense * _numChildren); @@ -184,9 +184,10 @@ public class FinancialStatement return _cashBalance; } - public void setCashBalance(double d) + public void setCashBalance(int d) { - _cashBalance = (int) d; + _cashBalance = d; + update(); } public void increaseCashBalance(int cashIncrease) diff --git a/src/view/CharityCard.java b/src/view/CharityCardWindow.java similarity index 91% rename from src/view/CharityCard.java rename to src/view/CharityCardWindow.java index 75f5bfd..0bc006e 100644 --- a/src/view/CharityCard.java +++ b/src/view/CharityCardWindow.java @@ -4,18 +4,18 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; -public class CharityCard { +public class CharityCardWindow { private JFrame mainFrame; private JLabel headerLabel; private JLabel statusLabel; private JPanel controlPanel; - public CharityCard(){ + public CharityCardWindow(){ prepareGUI(); } public static void main(String[] args){ - CharityCard CharityCard = new CharityCard(); - CharityCard.showButtonDemo(); + CharityCardWindow CharityCardWindow = new CharityCardWindow(); + CharityCardWindow.showButtonDemo(); } private void prepareGUI(){ mainFrame = new JFrame("Charity"); @@ -42,7 +42,7 @@ public class CharityCard { mainFrame.setVisible(true); } private static ImageIcon createImageIcon(String path, String description) { - java.net.URL imgURL = CharityCard.class.getResource(path); + java.net.URL imgURL = CharityCardWindow.class.getResource(path); if (imgURL != null) { return new ImageIcon(imgURL, description); } else { diff --git a/src/view/ChildCard.java b/src/view/ChildCardWindow.java similarity index 93% rename from src/view/ChildCard.java rename to src/view/ChildCardWindow.java index 19eec34..babd4a2 100644 --- a/src/view/ChildCard.java +++ b/src/view/ChildCardWindow.java @@ -4,18 +4,18 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; -public class ChildCard { +public class ChildCardWindow { private JFrame mainFrame; private JLabel headerLabel; private JLabel statusLabel; private JPanel controlPanel; - public ChildCard(){ + public ChildCardWindow(){ prepareGUI(); } public static void main(String[] args){ - ChildCard ChildCard = new ChildCard(); + ChildCardWindow ChildCard = new ChildCardWindow(); ChildCard.showButtonDemo(); } private void prepareGUI(){ diff --git a/src/view/DealCard.java b/src/view/DealCardWindow.java similarity index 93% rename from src/view/DealCard.java rename to src/view/DealCardWindow.java index 6a0d78c..62bac61 100644 --- a/src/view/DealCard.java +++ b/src/view/DealCardWindow.java @@ -5,7 +5,7 @@ import java.awt.event.*; import javax.swing.*; import model.*; -public class DealCard { +public class DealCardWindow { private JFrame mainFrame; private JLabel headerLabel; private JLabel statusLabel; @@ -16,12 +16,12 @@ public class DealCard { private JPanel controlPanel2; public int response; - public DealCard(){ + public DealCardWindow(){ prepareGUI(); } public static void main(String[] args){ - DealCard DealCard = new DealCard(); - DealCard.showButtonDemo(); + DealCardWindow DealCardWindow = new DealCardWindow(); + DealCardWindow.showButtonDemo(); } private void prepareGUI(){ mainFrame = new JFrame("Deal"); @@ -71,7 +71,7 @@ public class DealCard { mainFrame2.setVisible(true); } - private int showButtonDemo(){ + private int showButtonDemo() { headerLabel.setText("Deal"); statusLabel.setText("What type of deal would you like?"); diff --git a/src/view/DoodadCard.java b/src/view/DoodadCardWindow.java similarity index 92% rename from src/view/DoodadCard.java rename to src/view/DoodadCardWindow.java index cec2a5e..9b165a1 100644 --- a/src/view/DoodadCard.java +++ b/src/view/DoodadCardWindow.java @@ -14,18 +14,18 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; -public class DoodadCard { +public class DoodadCardWindow { private JFrame mainFrame; private JLabel headerLabel; private JLabel statusLabel; private JPanel controlPanel; - public DoodadCard(){ + public DoodadCardWindow(){ prepareGUI(); } public static void main(String[] args){ - DoodadCard DoodadCard = new DoodadCard(); - DoodadCard.showButtonDemo(); + DoodadCardWindow DoodadCardWindow = new DoodadCardWindow(); + DoodadCardWindow.showButtonDemo(); } private void prepareGUI(){ mainFrame = new JFrame("Doodad"); diff --git a/src/view/SDStockCard.java b/src/view/SDStockCardWindow.java similarity index 91% rename from src/view/SDStockCard.java rename to src/view/SDStockCardWindow.java index 4f0e3f7..d632c81 100644 --- a/src/view/SDStockCard.java +++ b/src/view/SDStockCardWindow.java @@ -4,18 +4,18 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; -public class SDStockCard { +public class SDStockCardWindow { private JFrame mainFrame; private JLabel headerLabel; private JLabel statusLabel; private JPanel controlPanel; - public SDStockCard(){ + public SDStockCardWindow(){ prepareGUI(); } public static void main(String[] args){ - SDStockCard SDStockCard = new SDStockCard(); - SDStockCard.showButtonDemo(); + SDStockCardWindow SDStockCardWindow = new SDStockCardWindow(); + SDStockCardWindow.showButtonDemo(); } private void prepareGUI(){ mainFrame = new JFrame("Small Deal"); @@ -57,7 +57,7 @@ public class SDStockCard { public void actionPerformed(ActionEvent e) { //put message that they BuyStockd xx dollars after 10 seconds, close window try { - Thread.sleep(1000); + Thread.sleep(10000); } catch (InterruptedException e1) { // TODO Auto-generated catch block e1.printStackTrace();