diff --git a/bin/.gitignore b/bin/.gitignore index 4e7e508..66905d0 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1 +1,4 @@ +/.DS_Store /controller/ +/model/ +/view/ diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index c29e2cf..ea7ca53 100644 Binary files a/bin/controller/Cashflow.class and b/bin/controller/Cashflow.class differ diff --git a/bin/model/BigDealStack.class b/bin/model/BigDealStack.class index a820dd7..5a27ad0 100644 Binary files a/bin/model/BigDealStack.class and b/bin/model/BigDealStack.class differ diff --git a/bin/model/Card.class b/bin/model/Card.class index fb749aa..282d93b 100644 Binary files a/bin/model/Card.class and b/bin/model/Card.class differ diff --git a/bin/model/CardStack.class b/bin/model/CardStack.class index c976fdc..ce4fd7a 100644 Binary files a/bin/model/CardStack.class and b/bin/model/CardStack.class differ diff --git a/bin/model/CharityTile.class b/bin/model/CharityTile.class index c4acea3..d52244e 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 e8e1174..1c2f52b 100644 Binary files a/bin/model/ChildTile.class and b/bin/model/ChildTile.class differ diff --git a/bin/model/DealCard.class b/bin/model/DealCard.class index adc8ef1..9a51abb 100644 Binary files a/bin/model/DealCard.class and b/bin/model/DealCard.class differ diff --git a/bin/model/DealTile.class b/bin/model/DealTile.class index 1cf47b2..6b67916 100644 Binary files a/bin/model/DealTile.class and b/bin/model/DealTile.class differ diff --git a/bin/model/Die.class b/bin/model/Die.class index 3884acd..e319493 100644 Binary files a/bin/model/Die.class and b/bin/model/Die.class differ diff --git a/bin/model/DoodadCard.class b/bin/model/DoodadCard.class index 8e23482..538f415 100644 Binary files a/bin/model/DoodadCard.class and b/bin/model/DoodadCard.class differ diff --git a/bin/model/DoodadStack.class b/bin/model/DoodadStack.class index ddbe44a..f8c4af9 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 916410a..aab4fc1 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 ffcc689..b527dce 100644 Binary files a/bin/model/FinancialStatement.class and b/bin/model/FinancialStatement.class differ diff --git a/bin/model/GameBoard.class b/bin/model/GameBoard.class index 7a1eefb..6812249 100644 Binary files a/bin/model/GameBoard.class and b/bin/model/GameBoard.class differ diff --git a/bin/model/MarketCard.class b/bin/model/MarketCard.class index 10982d5..62aad7c 100644 Binary files a/bin/model/MarketCard.class and b/bin/model/MarketCard.class differ diff --git a/bin/model/MarketStack.class b/bin/model/MarketStack.class index 6c75bff..cf1b145 100644 Binary files a/bin/model/MarketStack.class and b/bin/model/MarketStack.class differ diff --git a/bin/model/MarketTile.class b/bin/model/MarketTile.class index 8004057..af03a6d 100644 Binary files a/bin/model/MarketTile.class and b/bin/model/MarketTile.class differ diff --git a/bin/model/OwnedRealEstate.class b/bin/model/OwnedRealEstate.class index b9ca4f6..500d944 100644 Binary files a/bin/model/OwnedRealEstate.class and b/bin/model/OwnedRealEstate.class differ diff --git a/bin/model/PaydayTile.class b/bin/model/PaydayTile.class index fde1634..631fb20 100644 Binary files a/bin/model/PaydayTile.class and b/bin/model/PaydayTile.class differ diff --git a/bin/model/Player.class b/bin/model/Player.class index 8d9ffae..08caaff 100644 Binary files a/bin/model/Player.class and b/bin/model/Player.class differ diff --git a/bin/model/Profession.class b/bin/model/Profession.class index 8fdeb61..8206775 100644 Binary files a/bin/model/Profession.class and b/bin/model/Profession.class differ diff --git a/bin/model/Professions.class b/bin/model/Professions.class index 044c822..72577b6 100644 Binary files a/bin/model/Professions.class and b/bin/model/Professions.class differ diff --git a/bin/model/SmallDealStack.class b/bin/model/SmallDealStack.class index 143fd12..8b79e20 100644 Binary files a/bin/model/SmallDealStack.class and b/bin/model/SmallDealStack.class differ diff --git a/bin/model/Stock.class b/bin/model/Stock.class index 605e025..b348dae 100644 Binary files a/bin/model/Stock.class and b/bin/model/Stock.class differ diff --git a/bin/model/Tile.class b/bin/model/Tile.class index b7a9114..f5c5e59 100644 Binary files a/bin/model/Tile.class and b/bin/model/Tile.class differ diff --git a/bin/model/TileCircularLinkedList$Node.class b/bin/model/TileCircularLinkedList$Node.class index 64dfb0f..06495c6 100644 Binary files a/bin/model/TileCircularLinkedList$Node.class and b/bin/model/TileCircularLinkedList$Node.class differ diff --git a/bin/model/TileCircularLinkedList.class b/bin/model/TileCircularLinkedList.class index 2577118..36c46be 100644 Binary files a/bin/model/TileCircularLinkedList.class and b/bin/model/TileCircularLinkedList.class differ diff --git a/bin/view/MainWindow$1.class b/bin/view/MainWindow$1.class index 5c3d145..1c26d21 100644 Binary files a/bin/view/MainWindow$1.class and b/bin/view/MainWindow$1.class differ diff --git a/bin/view/MainWindow.class b/bin/view/MainWindow.class index 2f9e5fe..55b39c8 100644 Binary files a/bin/view/MainWindow.class and b/bin/view/MainWindow.class differ diff --git a/bin/view/MainWindow1$1.class b/bin/view/MainWindow1$1.class index 589edb8..f40f2c6 100644 Binary files a/bin/view/MainWindow1$1.class and b/bin/view/MainWindow1$1.class differ diff --git a/bin/view/MainWindow1.class b/bin/view/MainWindow1.class index 077cd20..68c09eb 100644 Binary files a/bin/view/MainWindow1.class and b/bin/view/MainWindow1.class differ diff --git a/bin/view/Window.class b/bin/view/Window.class index c68be93..fe71bb5 100644 Binary files a/bin/view/Window.class and b/bin/view/Window.class differ diff --git a/src/model/CardStack.java b/src/model/CardStack.java index da79c68..d80bbf8 100644 --- a/src/model/CardStack.java +++ b/src/model/CardStack.java @@ -1,6 +1,7 @@ package model; import java.util.ArrayList; + import java.util.LinkedList; import java.util.Random; import java.util.Stack; diff --git a/src/model/CharityTile.java b/src/model/CharityTile.java index 8400994..35d4f34 100644 --- a/src/model/CharityTile.java +++ b/src/model/CharityTile.java @@ -12,13 +12,21 @@ public class CharityTile extends Tile @Override public void getLandedOn(Player p) { + // TODO // Ask players if they want to donate to charity (returns boolean) - // If true: - // Set players charity coutner to 3 - // Take money from them (check board for deets) - // else: - // Nothin + + if (p.donateCharity()) + { + p.setCharityCount(p.getCharityCount() + 3); + p.getFinancialStatement().setCashBalance(p.getFinancialStatement().getCashBalance() + - (p.getFinancialStatement().getPassiveIncome()*.10)); + } + else + { + //you're an asshole + } + } } diff --git a/src/model/ChildTile.java b/src/model/ChildTile.java index 434fbff..bdc42fa 100644 --- a/src/model/ChildTile.java +++ b/src/model/ChildTile.java @@ -11,7 +11,8 @@ public class ChildTile extends Tile @Override public void getLandedOn(Player p) { - // Increment child counter using addChild() method in financial statement + p.getFinancialStatement().addChild(); + } } diff --git a/src/model/DealTile.java b/src/model/DealTile.java index ea1cf92..5cdebb3 100644 --- a/src/model/DealTile.java +++ b/src/model/DealTile.java @@ -29,7 +29,7 @@ public class DealTile extends Tile Card c; if(input.equals("1")) { - c = _smallDealStack.pickCard() + c = _smallDealStack.pickCard(); } else { @@ -37,7 +37,8 @@ public class DealTile extends Tile } // If stock, update price, then ask user if they want to buy and ask everyone if they want to sell: - if(c.getTitle().equals(anObject)) + //if(c.getTitle().equals(anObject)) + // If property, ask user if they want to do it (and check if they can afford the down payment): // If yes, call ButIncomeProperty method: // Else, do nothing: diff --git a/src/model/DoodadTile.java b/src/model/DoodadTile.java index 314d14a..89ac791 100644 --- a/src/model/DoodadTile.java +++ b/src/model/DoodadTile.java @@ -3,7 +3,8 @@ package model; public class DoodadTile extends Tile { private static DoodadStack _doodadStack; - + private DoodadCard card; + private int amount; public DoodadTile(String name, int boardIndex) { @@ -14,6 +15,16 @@ 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); + } + else if(p.getFinancialStatement().getCashBalance() < amount) + { + p.getFinancialStatement().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 4a718dd..0b8ece4 100644 --- a/src/model/FinancialStatement.java +++ b/src/model/FinancialStatement.java @@ -107,7 +107,7 @@ public class FinancialStatement // TODO add method to update display if its currently being displayed } - private int getPassiveIncome() + int getPassiveIncome() { int passiveInc = 0; for(OwnedRealEstate re : _realEstate) @@ -184,6 +184,11 @@ public class FinancialStatement return _cashBalance; } + public void setCashBalance(double d) + { + _cashBalance = (int) d; + } + public void increaseCashBalance(int cashIncrease) { this._cashBalance =+ cashIncrease; diff --git a/src/model/Player.java b/src/model/Player.java index 8fd7f8a..57994ff 100644 --- a/src/model/Player.java +++ b/src/model/Player.java @@ -3,6 +3,7 @@ package model; public class Player { private FinancialStatement _fs; + private boolean _donate; private int _charityCount; //charity counter private int _downsizeCount; //down size counter private int _location; @@ -31,8 +32,11 @@ public class Player public boolean donateCharity() { - // - return false; + return _donate; + } + public void setCharity(boolean charityq) + { + _donate = charityq; } public void setLocation(int i) @@ -51,7 +55,11 @@ public class Player return _charityCount; } - + public void setCharityCount(int charityCount) + { + _charityCount = charityCount; + } + public void decrementCharityCount() { _charityCount--;