diff --git a/bin/model/CardStack.class b/bin/model/CardStack.class index b0b95d2..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 6d5ff4b..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 b82e2e7..1c2f52b 100644 Binary files a/bin/model/ChildTile.class and b/bin/model/ChildTile.class differ diff --git a/bin/model/DoodadTile.class b/bin/model/DoodadTile.class index 2d59940..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 c839fbd..b527dce 100644 Binary files a/bin/model/FinancialStatement.class and b/bin/model/FinancialStatement.class differ diff --git a/bin/model/Player.class b/bin/model/Player.class index 7641f8b..08caaff 100644 Binary files a/bin/model/Player.class and b/bin/model/Player.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 CharityTile(String type, int boardIndex) @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 ChildTile(String type, int boardIndex) @Override public void getLandedOn(Player p) { - // Increment child counter using addChild() method in financial statement + p.getFinancialStatement().addChild(); + } } 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 @@ 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 DoodadTile(String name, int boardIndex) @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 @@ private void update() // 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 int getCashBalance() 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 @@ 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 FinancialStatement getFinancialStatement() public boolean donateCharity() { - // - return false; + return _donate; + } + public void setCharity(boolean charityq) + { + _donate = charityq; } public void setLocation(int i) @@ -51,7 +55,11 @@ public int getCharityCount() return _charityCount; } - + public void setCharityCount(int charityCount) + { + _charityCount = charityCount; + } + public void decrementCharityCount() { _charityCount--;