diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..8fcccbe --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,3 @@ +/view/ +/controller/ +/model/ diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index c29e2cf..13f0cc3 100644 Binary files a/bin/controller/Cashflow.class and b/bin/controller/Cashflow.class differ diff --git a/bin/model/MarketTile.class b/bin/model/MarketTile.class index 8004057..c4b9bfa 100644 Binary files a/bin/model/MarketTile.class and b/bin/model/MarketTile.class differ diff --git a/bin/view/FSWindow$1.class b/bin/view/FSWindow$1.class index 420404d..106a5ab 100644 Binary files a/bin/view/FSWindow$1.class and b/bin/view/FSWindow$1.class differ diff --git a/bin/view/FSWindow$2.class b/bin/view/FSWindow$2.class deleted file mode 100644 index 8252443..0000000 Binary files a/bin/view/FSWindow$2.class and /dev/null differ diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class index d04cbaf..81c158b 100644 Binary files a/bin/view/FSWindow.class and b/bin/view/FSWindow.class differ diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java index 5848dd2..867a104 100644 --- a/src/controller/Cashflow.java +++ b/src/controller/Cashflow.java @@ -43,6 +43,7 @@ public class Cashflow { // TODO Play method // Get player whose turn it is + // Display their financial statement // Check down sized (check if player's down size counter is 0) // Check charity (Check if charity counter is 0) // Roll dice diff --git a/src/model/MarketTile.java b/src/model/MarketTile.java index cc34c9d..9a07a01 100644 --- a/src/model/MarketTile.java +++ b/src/model/MarketTile.java @@ -6,5 +6,11 @@ public class MarketTile extends Tile super(type, boardIndex); // TODO Auto-generated constructor stub } + + @Override + public void getLandedOn(Player p) + { + + } } diff --git a/src/view/TileButton.java b/src/view/TileButton.java index 20bbca9..c3c06c8 100644 --- a/src/view/TileButton.java +++ b/src/view/TileButton.java @@ -34,7 +34,7 @@ public class TileButton extends JButton { if (this.tile instanceof Tile) { /* * i dont actually really like this method - * but i think it should be like that iterator in cashflow + * but i think it should be like that iterator in cash flow * that determines moving over the tiles and if it's landed on * the gui should be brought up already in the handler method */