diff --git a/bin/.gitignore b/bin/.gitignore index 1b12d5f..66905d0 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,15 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git /.DS_Store /controller/ /model/ -<<<<<<< HEAD ->>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git /view/ -/Instructions.class -======= -/view/ ->>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git diff --git a/bin/model/BigDealStack.class b/bin/model/BigDealStack.class index 5a27ad0..a820dd7 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 282d93b..fb749aa 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 ce4fd7a..158a0ab 100644 Binary files a/bin/model/CardStack.class and b/bin/model/CardStack.class differ diff --git a/bin/model/DealCard.class b/bin/model/DealCard.class index 9a51abb..adc8ef1 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 641fd5f..24b96bf 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 e319493..3884acd 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 538f415..8e23482 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 f68cac1..b3885f0 100644 Binary files a/bin/model/DoodadStack.class and b/bin/model/DoodadStack.class differ diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class index e23f6f4..959a191 100644 Binary files a/bin/model/FinancialStatement.class and b/bin/model/FinancialStatement.class differ diff --git a/bin/model/MarketCard.class b/bin/model/MarketCard.class index 62aad7c..10982d5 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 cf1b145..6c75bff 100644 Binary files a/bin/model/MarketStack.class and b/bin/model/MarketStack.class differ diff --git a/bin/model/OwnedRealEstate.class b/bin/model/OwnedRealEstate.class index 500d944..b9ca4f6 100644 Binary files a/bin/model/OwnedRealEstate.class and b/bin/model/OwnedRealEstate.class differ diff --git a/bin/model/Profession.class b/bin/model/Profession.class index 8206775..8fdeb61 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 491de07..41ab535 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 8b79e20..143fd12 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 b348dae..605e025 100644 Binary files a/bin/model/Stock.class and b/bin/model/Stock.class differ diff --git a/bin/view/CharityWindow$2.class b/bin/view/CharityWindow$2.class index 940ee30..d20110c 100644 Binary files a/bin/view/CharityWindow$2.class and b/bin/view/CharityWindow$2.class differ diff --git a/bin/view/CharityWindow$3.class b/bin/view/CharityWindow$3.class index e4625f3..102ffae 100644 Binary files a/bin/view/CharityWindow$3.class and b/bin/view/CharityWindow$3.class differ diff --git a/bin/view/CharityWindow.class b/bin/view/CharityWindow.class index 55725da..1f159be 100644 Binary files a/bin/view/CharityWindow.class and b/bin/view/CharityWindow.class differ diff --git a/bin/view/ChildWindow$1.class b/bin/view/ChildWindow$1.class index efd900f..a63c280 100644 Binary files a/bin/view/ChildWindow$1.class and b/bin/view/ChildWindow$1.class differ diff --git a/bin/view/ChildWindow$2.class b/bin/view/ChildWindow$2.class index 0120329..35fa16f 100644 Binary files a/bin/view/ChildWindow$2.class and b/bin/view/ChildWindow$2.class differ diff --git a/bin/view/ChildWindow.class b/bin/view/ChildWindow.class index 6f698fb..00056a1 100644 Binary files a/bin/view/ChildWindow.class and b/bin/view/ChildWindow.class differ diff --git a/bin/view/DealCardWindow$1.class b/bin/view/DealCardWindow$1.class index 698118b..ac4aceb 100644 Binary files a/bin/view/DealCardWindow$1.class and b/bin/view/DealCardWindow$1.class differ diff --git a/bin/view/DealCardWindow$2.class b/bin/view/DealCardWindow$2.class index 69547f0..62114ff 100644 Binary files a/bin/view/DealCardWindow$2.class and b/bin/view/DealCardWindow$2.class differ diff --git a/bin/view/DealCardWindow$3$1.class b/bin/view/DealCardWindow$3$1.class index 96db31e..e0a922b 100644 Binary files a/bin/view/DealCardWindow$3$1.class and b/bin/view/DealCardWindow$3$1.class differ diff --git a/bin/view/DealCardWindow$3$2.class b/bin/view/DealCardWindow$3$2.class index 7af86cd..75eab6a 100644 Binary files a/bin/view/DealCardWindow$3$2.class and b/bin/view/DealCardWindow$3$2.class differ diff --git a/bin/view/DealCardWindow$3.class b/bin/view/DealCardWindow$3.class index a57b468..9906e71 100644 Binary files a/bin/view/DealCardWindow$3.class and b/bin/view/DealCardWindow$3.class differ diff --git a/bin/view/DealCardWindow$4$1.class b/bin/view/DealCardWindow$4$1.class index 2d1cd22..a938d08 100644 Binary files a/bin/view/DealCardWindow$4$1.class and b/bin/view/DealCardWindow$4$1.class differ diff --git a/bin/view/DealCardWindow$4$2.class b/bin/view/DealCardWindow$4$2.class index f06db03..111e7c7 100644 Binary files a/bin/view/DealCardWindow$4$2.class and b/bin/view/DealCardWindow$4$2.class differ diff --git a/bin/view/DealCardWindow$4.class b/bin/view/DealCardWindow$4.class index e4ed6d3..dad01a2 100644 Binary files a/bin/view/DealCardWindow$4.class and b/bin/view/DealCardWindow$4.class differ diff --git a/bin/view/DealCardWindow.class b/bin/view/DealCardWindow.class index bd6667d..f81b2f9 100644 Binary files a/bin/view/DealCardWindow.class and b/bin/view/DealCardWindow.class differ diff --git a/bin/view/DoodadCardWindow$1.class b/bin/view/DoodadCardWindow$1.class index 8817738..bdc151b 100644 Binary files a/bin/view/DoodadCardWindow$1.class and b/bin/view/DoodadCardWindow$1.class differ diff --git a/bin/view/DoodadCardWindow$2.class b/bin/view/DoodadCardWindow$2.class index 848faa7..a37a3bc 100644 Binary files a/bin/view/DoodadCardWindow$2.class and b/bin/view/DoodadCardWindow$2.class differ diff --git a/bin/view/DoodadCardWindow.class b/bin/view/DoodadCardWindow.class index 4339f2b..0be9d16 100644 Binary files a/bin/view/DoodadCardWindow.class and b/bin/view/DoodadCardWindow.class differ diff --git a/bin/view/DownSizeWindow$1.class b/bin/view/DownSizeWindow$1.class index 52f3a74..f33d97e 100644 Binary files a/bin/view/DownSizeWindow$1.class and b/bin/view/DownSizeWindow$1.class differ diff --git a/bin/view/DownSizeWindow.class b/bin/view/DownSizeWindow.class index 241aa27..2f1231e 100644 Binary files a/bin/view/DownSizeWindow.class and b/bin/view/DownSizeWindow.class differ diff --git a/bin/view/GameboardWindow.class b/bin/view/GameboardWindow.class index a66be6d..f341325 100644 Binary files a/bin/view/GameboardWindow.class and b/bin/view/GameboardWindow.class differ diff --git a/bin/view/MainWindow$1.class b/bin/view/MainWindow$1.class index 419bfb4..cd197be 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 6f8e8c7..48940ab 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 0720031..0300272 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 9d49cf6..edc924e 100644 Binary files a/bin/view/MainWindow1.class and b/bin/view/MainWindow1.class differ diff --git a/bin/view/Positioner.class b/bin/view/Positioner.class index 588f16b..32ebf82 100644 Binary files a/bin/view/Positioner.class and b/bin/view/Positioner.class differ diff --git a/bin/view/SDStockCardWindow$1.class b/bin/view/SDStockCardWindow$1.class index 09d4e6f..c11d678 100644 Binary files a/bin/view/SDStockCardWindow$1.class and b/bin/view/SDStockCardWindow$1.class differ diff --git a/bin/view/SDStockCardWindow$2.class b/bin/view/SDStockCardWindow$2.class index 02dbdb4..aab4f8a 100644 Binary files a/bin/view/SDStockCardWindow$2.class and b/bin/view/SDStockCardWindow$2.class differ diff --git a/bin/view/SDStockCardWindow$3.class b/bin/view/SDStockCardWindow$3.class index e2d8af2..2921fb3 100644 Binary files a/bin/view/SDStockCardWindow$3.class and b/bin/view/SDStockCardWindow$3.class differ diff --git a/bin/view/SDStockCardWindow.class b/bin/view/SDStockCardWindow.class index c2b2d14..43b9ea3 100644 Binary files a/bin/view/SDStockCardWindow.class and b/bin/view/SDStockCardWindow.class differ diff --git a/bin/view/Window.class b/bin/view/Window.class index fe71bb5..c68be93 100644 Binary files a/bin/view/Window.class and b/bin/view/Window.class differ diff --git a/src/model/DealTile.java b/src/model/DealTile.java index 3decb40..6e751f2 100644 --- a/src/model/DealTile.java +++ b/src/model/DealTile.java @@ -21,7 +21,7 @@ public class DealTile extends Tile { // TODO // Ask user to decide big/small deal: - CharityWindow charityWindow = new CharityWindow(); + CharityWindow charityWindow = new CharityWindow(); charityWindow.showButtonDemo(); diff --git a/src/view/GameboardWindow.java b/src/view/GameboardWindow.java index 62a8a00..adf2cd9 100644 --- a/src/view/GameboardWindow.java +++ b/src/view/GameboardWindow.java @@ -1,5 +1,6 @@ package view; import model.*; + import controller.*; import java.awt.*; import java.util.ArrayList; @@ -195,10 +196,10 @@ public class GameboardWindow extends JPanel { } - public void update() { //updates the location of the player on the board - for (int i = 0; i < Cashflow.numPlayers; i++) { - int x = (int) points[Player[i].getLocation()].getX(); // i will fix this later - int y = (int) points[Player[i].getLocation()].getY(); // + public void update(ArrayList _players) { //updates the location of the player on the board + for (int i = 0; i < _players.size(); i++) { + int x = (int) points[_players.get(i).getLocation()].getX(); // i will fix this later + int y = (int) points[_players.get(i).getLocation()].getY(); // Positioners.get(i).setX(x); Positioners.get(i).setY(y); @@ -206,6 +207,8 @@ public class GameboardWindow extends JPanel { } + + diff --git a/src/view/MainMenu.java b/src/view/MainMenu.java index da5d9af..7ae2065 100644 --- a/src/view/MainMenu.java +++ b/src/view/MainMenu.java @@ -10,10 +10,7 @@ import java.io.*; import javax.imageio.ImageIO; import javax.swing.*; - -import controller.Cashflow; import model.Instructions; -import model.Player; public class MainMenu { @@ -279,7 +276,7 @@ public class MainMenu frame.dispose(); //Cashflow.go(playerNames); - System.exit(0); + //System.exit(0); } }); return playerNames;