diff --git a/bin/.gitignore b/bin/.gitignore index 4e7e508..6a15f9e 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1 +1,3 @@ /controller/ +/model/ +/view/ diff --git a/bin/model/GameBoard.class b/bin/model/GameBoard.class index 7a1eefb..b2bb7bc 100644 Binary files a/bin/model/GameBoard.class and b/bin/model/GameBoard.class differ diff --git a/bin/view/MainWindow1$1.class b/bin/view/MainWindow1$1.class index 589edb8..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 077cd20..edc924e 100644 Binary files a/bin/view/MainWindow1.class and b/bin/view/MainWindow1.class differ diff --git a/src/model/GameBoard.java b/src/model/GameBoard.java index 297e530..5a30b04 100644 --- a/src/model/GameBoard.java +++ b/src/model/GameBoard.java @@ -11,9 +11,29 @@ public class GameBoard private TileCircularLinkedList _tiles; private static Tile t1 = new DealTile("Deal Tile", 0); - private static Tile t2 = new DealTile("Doodad", 1); - private static Tile t3 = new DealTile("Deal", 2); - private static Tile t4 = new DealTile("Charity", 3); + private static Tile t2 = new MarketTile("Market Tile", 1); + private static Tile t3 = new DealTile("Deal Tile", 2); + private static Tile t4 = new PaydayTile("Payday Tile", 3); + private static Tile t5 = new DealTile("Deal Tile", 4); + private static Tile t6 = new DownsizeTile("Downsize", 5); + private static Tile t7 = new DealTile("Deal Tile", 6); + private static Tile t8 = new DoodadTile("Doodad Tile", 7); + private static Tile t9 = new DealTile("Deal Tile", 8); + private static Tile t10 = new MarketTile("Market Tile", 9); + private static Tile t11 = new DealTile("Deal Tile", 10); + private static Tile t12 = new PaydayTile("Payday Tile", 11); + private static Tile t13 = new DealTile("Deal Tile", 12); + private static Tile t14 = new CharityTile("Charity Tile", 13); + private static Tile t15 = new DealTile("Deal Tile", 14); + private static Tile t16 = new DoodadTile("Doodad Tile", 15); + private static Tile t17 = new DealTile("Deal Tile", 16); + private static Tile t18 = new MarketTile("Market Tile", 17); + private static Tile t19 = new DealTile("Deal Tile", 18); + private static Tile t20 = new PaydayTile("Payday Tile", 19); + private static Tile t21 = new DealTile("Deal Tile", 20); + private static Tile t22 = new ChildTile("Child Tile", 21); + private static Tile t23 = new DealTile("Deal Tile", 22); + private static Tile t24 = new DoodadTile("Doodad Tile", 23); public GameBoard(Player... players) diff --git a/src/view/DownSizeWindow b/src/view/DownSizeWindow deleted file mode 100644 index bd082ad..0000000 --- a/src/view/DownSizeWindow +++ /dev/null @@ -1,75 +0,0 @@ -package view; - -import java.awt.Color; -import java.awt.FlowLayout; -import java.awt.Font; -import java.awt.GridLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; - -public class DownSizeWindow { - private JFrame mainFrame; - private JLabel headerLabel; - private JLabel statusLabel; - private JPanel controlPanel; - - public DownSizeWindow(){ - prepareGUI(); - } - public static void main(String[] args){ - DownSizeWindow DownSizeWindow = new DownSizeWindow(); - DownSizeWindow.showButtonDemo(); - } - private void prepareGUI(){ - mainFrame = new JFrame("Doodad"); - mainFrame.getContentPane().setBackground(new Color(149, 32, 216)); - mainFrame.setSize(400,250); - //need to set this to null and position everything manually - mainFrame.setLayout(new GridLayout(3, 1)); - -// mainFrame.addWindowListener(new WindowAdapter() { -// public void windowClosing(WindowEvent windowEvent){ -// System.exit(0); -// } -// }); - headerLabel = new JLabel("", JLabel.CENTER); - headerLabel.setFont(headerLabel.getFont().deriveFont(Font.BOLD, 16f)); - statusLabel = new JLabel("",JLabel.CENTER); - statusLabel.setSize(350,100); - - controlPanel = new JPanel(); - controlPanel.setLayout(new FlowLayout()); - controlPanel.setBackground(new Color(149, 32, 216)); - - mainFrame.add(headerLabel); - mainFrame.add(controlPanel); - mainFrame.add(statusLabel); - mainFrame.setVisible(true); - } - - private void showButtonDemo(){ - headerLabel.setText("Downsize"); - statusLabel.setText("You lose 3 turns."); - //resources folder should be inside SWING folder. - - JButton Downsize = new JButton("Downsize"); - // Downsize.setLayout(null); - // Downsize.setLocation(10,220); - Downsize.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - //run downsize update method - System.exit(0); - } - }); - - controlPanel.add(Downsize); - mainFrame.setVisible(true); - } -} diff --git a/bin/view/DownSizeWindow b/src/view/DownSizeWindow.java similarity index 100% rename from bin/view/DownSizeWindow rename to src/view/DownSizeWindow.java diff --git a/src/view/GameboardWindow.java b/src/view/GameboardWindow.java new file mode 100644 index 0000000..55a3275 --- /dev/null +++ b/src/view/GameboardWindow.java @@ -0,0 +1,88 @@ +package view; +import model.*; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Image; + +import java.awt.Point; + +import java.util.ArrayList; + +import javax.swing.ImageIcon; +import javax.swing.JPanel; + +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 Point[] points = new Point[40];// location of topleft corner of + // buttons + + private ArrayList Positioners; + + public GameboardWindow(GameBoard board) { + this.board = board; + Dimension size = new Dimension(img.getWidth(null)+250, img.getHeight(null)); + setPreferredSize(size); + setMinimumSize(size); + setMaximumSize(size); + setSize(size); + setLayout(null); + + setUpTiles(); + + Positioners = new ArrayList(); + for (int i = 1; i <= 4; i++) { + String path = "piece" + i + ".png"; + Image img = new ImageIcon(this.getClass().getResource(path)) + .getImage(); + Positioners.add(new Positioner(img, 602, 602)); + } + } + + public void setUpTiles() { +// implement the tiles into the graphical boardspace?? +// Tile t1; +// this.add(t1); +// t1.setBounds(133,521,50,75); //xstart,ystart,width,height +// points[1] = newPoint(133,521); + + +// LocationButton b2 = new LocationButton("name", 21, board); +// this.add(b2); +// b2.setBounds(98, 10, 56, 88);// xStart, Ystart, width, height +// points[21] = new Point(98, 10); + + + + } + + public void paintComponent(Graphics g) { + g.drawImage(img, 0, 0, null); + + for (int i = 0; i < Positioners.size(); i++) { + Positioner curr = Positioners.get(i); + g.drawImage(curr.getImage(), curr.getX(), curr.getY(), null); + } + + } + + 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(); + + Positioners.get(i).setX(x); + Positioners.get(i).setY(y); + + } + + } + + + + +} diff --git a/src/view/MainWindow1.java b/src/view/MainWindow1.java index b68860b..c69d8fe 100644 --- a/src/view/MainWindow1.java +++ b/src/view/MainWindow1.java @@ -9,6 +9,10 @@ import javax.swing.border.EmptyBorder; public class MainWindow1 extends JFrame { + /** + * + */ + private static final long serialVersionUID = 1L; private JPanel contentPane; /** diff --git a/src/view/Positioner.java b/src/view/Positioner.java new file mode 100644 index 0000000..a1a2d90 --- /dev/null +++ b/src/view/Positioner.java @@ -0,0 +1,38 @@ +package view; + +import java.awt.Image; + +public class Positioner { + + private Image img; + private int x, y; + public Positioner(Image img, int x, int y){ + this.img = img; + this.x = x; + this.y = y; + } + + public int getX(){ + return this.x; + } + + public int getY(){ + return this.y; + } + + public Image getImage(){ + return this.img; + } + + public void setX(int x2){ + this.x = x2; + } + + public void setY(int y){ + this.y = y; + } + + public void setImage(Image newImage){ + this.img = newImage; + } +} diff --git a/src/view/gameboard.png b/src/view/gameboard.png new file mode 100644 index 0000000..50aaab3 Binary files /dev/null and b/src/view/gameboard.png differ diff --git a/src/view/piece1.png b/src/view/piece1.png new file mode 100644 index 0000000..b0d191c Binary files /dev/null and b/src/view/piece1.png differ diff --git a/src/view/piece2.png b/src/view/piece2.png new file mode 100644 index 0000000..26c2077 Binary files /dev/null and b/src/view/piece2.png differ diff --git a/src/view/piece3.png b/src/view/piece3.png new file mode 100644 index 0000000..2623e8b Binary files /dev/null and b/src/view/piece3.png differ diff --git a/src/view/piece4.png b/src/view/piece4.png new file mode 100644 index 0000000..14ffc2d Binary files /dev/null and b/src/view/piece4.png differ