diff --git a/bin/.gitignore b/bin/.gitignore index 2255885..1b12d5f 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,8 +1,15 @@ <<<<<<< 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/controller/Cashflow.class b/bin/controller/Cashflow.class index 88b07e4..530a3f7 100644 Binary files a/bin/controller/Cashflow.class and b/bin/controller/Cashflow.class differ diff --git a/bin/view/GameboardWindow.class b/bin/view/GameboardWindow.class index ee0b303..95f2eea 100644 Binary files a/bin/view/GameboardWindow.class and b/bin/view/GameboardWindow.class differ diff --git a/bin/view/TileButton.class b/bin/view/TileButton.class index 4cdaa25..b802234 100644 Binary files a/bin/view/TileButton.class and b/bin/view/TileButton.class differ diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java index b57c1d8..aa92a9f 100644 --- a/src/controller/Cashflow.java +++ b/src/controller/Cashflow.java @@ -1,6 +1,9 @@ package controller; import view.*; + +import java.util.ArrayList; + import model.*; public class Cashflow @@ -8,8 +11,11 @@ public class Cashflow private GameBoard _board; - private Player[] _players; + public Player[] players; //private CardStack[] _cards; + public GameboardWindow gameboard; + public static int numPlayers; + public static void go() @@ -50,7 +56,7 @@ public class Cashflow public boolean isWinner() { boolean isWinner = false; - for(Player p : _players) + for(Player p : players) { if(p.hasWon()) { diff --git a/src/model/Player.java b/src/model/Player.java index 5d2fbcb..5afc969 100644 --- a/src/model/Player.java +++ b/src/model/Player.java @@ -6,7 +6,7 @@ public class Player private boolean _donate; private int _charityCount; //charity counter private int _downsizeCount; //down size counter - private int _location; + private int _location;//refers to a tile number private boolean _hasWon; public Player() diff --git a/src/view/GameboardWindow.java b/src/view/GameboardWindow.java index 29b0969..d6d8c45 100644 --- a/src/view/GameboardWindow.java +++ b/src/view/GameboardWindow.java @@ -1,27 +1,27 @@ package view; import model.*; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Image; - -import java.awt.Point; -import java.awt.geom.Path2D; +import controller.*; +import java.awt.*; import java.util.ArrayList; import javax.swing.ImageIcon; import javax.swing.JPanel; +import controller.Cashflow; + public class GameboardWindow extends JPanel { + private static final long serialVersionUID = 1L; private Image img = new ImageIcon(this.getClass().getResource( "gameboard.png")).getImage(); - private GameBoard board; // + private GameBoard board; private Point[] points = new Point[24]; private ArrayList Positioners; + public GameboardWindow(GameBoard board) { this.board = board; Dimension size = new Dimension(img.getWidth(null), img.getHeight(null)); @@ -45,6 +45,7 @@ public class GameboardWindow extends JPanel { public void setUpTiles() { // implement the tiles into the graphical boardspace // the buttons are going to be a little off as i couldnt figure out how to rotate jbuttons +// i guess it doesnt really matter what tile is which but the position matters - 0 is starting TileButton t1 = new TileButton("Deal", 0, board); this.add(t1); t1.setBounds(125,532,95,20); //xstart,ystart,width,height @@ -182,11 +183,10 @@ public class GameboardWindow extends JPanel { } - public void update(ArrayList locP) { - for (int i = 0; i < locP.size(); i++) { - int x = (int) points[locP.get(i)].getX(); - int y = (int) points[locP.get(i)].getY(); - + 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(); // hopefully lol Positioners.get(i).setX(x); Positioners.get(i).setY(y); @@ -197,4 +197,5 @@ public class GameboardWindow extends JPanel { + } diff --git a/src/view/MainMenu.java b/src/view/MainMenu.java index d5b97c3..e107d25 100644 --- a/src/view/MainMenu.java +++ b/src/view/MainMenu.java @@ -3,6 +3,7 @@ package view; import javax.imageio.ImageIO; import javax.swing.*; +<<<<<<< HEAD import controller.Cashflow; import model.Instructions; @@ -132,3 +133,103 @@ public class MainMenu }} +======= +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; + +public class MainMenu +{ + public static void main (String[] args) + { + JFrame frame = new JFrame("CashFlow"); + + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.setSize(650,530); + Dimension dimension = Toolkit.getDefaultToolkit().getScreenSize(); + int x = (int) ((dimension.getWidth() - frame.getWidth()) / 2); + int y = (int) ((dimension.getHeight() - frame.getHeight()) / 2) -100; + frame.setLocation(x, y); + + JPanel panel1 = new JPanel(); + panel1.setSize(140, 45); + panel1.setLocation(255, 125); + panel1.setOpaque(false); + //Font font = new Font ("Times New Roman", Font.BOLD, 30); + //panel1.setFont(font); + + JPanel panel2 = new JPanel(); + panel2.setSize(140, 45); + panel2.setLocation(255, 160); + panel2.setOpaque(false); + + JPanel panel3 = new JPanel(); + panel3.setSize(140, 45); + panel3.setLocation(255, 260); + panel3.setOpaque(false); + + JPanel panel4 = new JPanel(); + panel4.setSize(140, 45); + panel4.setLocation(255, 295); + panel4.setOpaque(false); + + JPanel panel5 = new JPanel(); + panel5.setSize(140, 45); + panel5.setLocation(255, 330); + panel5.setOpaque(false); + + + JButton newGame = new JButton("New Game"); + JButton savedGame = new JButton("Saved Game"); + JButton rules = new JButton("Rules"); + JButton settings = new JButton("Settings"); + JButton exit = new JButton("Exit"); + + newGame.setPreferredSize(new Dimension(140,40)); + newGame.setForeground(Color.MAGENTA); + + savedGame.setPreferredSize(new Dimension(130,40)); + savedGame.setForeground(Color.MAGENTA); + + + rules.setPreferredSize(new Dimension(80,40)); + rules.setForeground(Color.MAGENTA); + + + settings.setPreferredSize(new Dimension(120,40)); + settings.setForeground(Color.MAGENTA); + + + exit.setPreferredSize(new Dimension(100,40)); + exit.setForeground(Color.MAGENTA); + + + BufferedImage img = null; + try { + img = ImageIO.read(new File("gameboard.png")); + } catch (IOException e) { + e.printStackTrace(); + } + Image dimg = img.getScaledInstance(800, 508, Image.SCALE_SMOOTH); + ImageIcon imageIcon = new ImageIcon(dimg); + frame.setContentPane(new JLabel(imageIcon)); + frame.getContentPane().add(new JLabel(imageIcon)); + + + panel1.add(newGame); + panel2.add(savedGame); + panel3.add(rules); + panel4.add(settings); + panel5.add(exit); + + frame.add(panel1); + frame.add(panel2); + frame.add(panel3); + frame.add(panel4); + frame.add(panel5); + frame.setVisible(true); + + } +} +>>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git