Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
ahhhhhhhhhhhh
  • Loading branch information
jackie committed Apr 22, 2017
1 parent c0dbb74 commit e02e5b0
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 15 deletions.
Binary file modified bin/controller/Cashflow.class
Binary file not shown.
Binary file modified bin/view/GameboardWindow.class
Binary file not shown.
10 changes: 8 additions & 2 deletions src/controller/Cashflow.java
@@ -1,15 +1,21 @@
package controller; package controller;


import view.*; import view.*;

import java.util.ArrayList;

import model.*; import model.*;


public class Cashflow public class Cashflow
{ {




private GameBoard _board; private GameBoard _board;
private Player[] _players; public Player[] players;
//private CardStack[] _cards; //private CardStack[] _cards;
public GameboardWindow gameboard;
public static int numPlayers;



public static void main(String[] args) public static void main(String[] args)
{ {
Expand Down Expand Up @@ -57,7 +63,7 @@ public class Cashflow
public boolean isWinner() public boolean isWinner()
{ {
boolean isWinner = false; boolean isWinner = false;
for(Player p : _players) for(Player p : players)
{ {
if(p.hasWon()) if(p.hasWon())
{ {
Expand Down
2 changes: 1 addition & 1 deletion src/model/Player.java
Expand Up @@ -6,7 +6,7 @@ public class Player
private boolean _donate; private boolean _donate;
private int _charityCount; //charity counter private int _charityCount; //charity counter
private int _downsizeCount; //down size counter private int _downsizeCount; //down size counter
private int _location; private int _location;//refers to a tile number
private boolean _hasWon; private boolean _hasWon;


public Player() public Player()
Expand Down
25 changes: 13 additions & 12 deletions src/view/GameboardWindow.java
@@ -1,27 +1,27 @@
package view; package view;
import model.*; import model.*;
import java.awt.Dimension; import controller.*;
import java.awt.Graphics; import java.awt.*;
import java.awt.Image;

import java.awt.Point;
import java.awt.geom.Path2D;
import java.util.ArrayList; import java.util.ArrayList;


import javax.swing.ImageIcon; import javax.swing.ImageIcon;
import javax.swing.JPanel; import javax.swing.JPanel;


import controller.Cashflow;

public class GameboardWindow extends JPanel { public class GameboardWindow extends JPanel {



private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private Image img = new ImageIcon(this.getClass().getResource( private Image img = new ImageIcon(this.getClass().getResource(
"gameboard.png")).getImage(); "gameboard.png")).getImage();


private GameBoard board; // private GameBoard board;
private Point[] points = new Point[24]; private Point[] points = new Point[24];


private ArrayList<Positioner> Positioners; private ArrayList<Positioner> Positioners;



public GameboardWindow(GameBoard board) { public GameboardWindow(GameBoard board) {
this.board = board; this.board = board;
Dimension size = new Dimension(img.getWidth(null), img.getHeight(null)); Dimension size = new Dimension(img.getWidth(null), img.getHeight(null));
Expand All @@ -45,6 +45,7 @@ public class GameboardWindow extends JPanel {
public void setUpTiles() { public void setUpTiles() {
// implement the tiles into the graphical boardspace // 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 // 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); TileButton t1 = new TileButton("Deal", 0, board);
this.add(t1); this.add(t1);
t1.setBounds(125,532,95,20); //xstart,ystart,width,height t1.setBounds(125,532,95,20); //xstart,ystart,width,height
Expand Down Expand Up @@ -182,11 +183,10 @@ public class GameboardWindow extends JPanel {


} }


public void update(ArrayList<Integer> locP) { public void update() { //updates the location of the player on the board
for (int i = 0; i < locP.size(); i++) { for (int i = 0; i < Cashflow.numPlayers; i++) {
int x = (int) points[locP.get(i)].getX(); int x = (int) points[Player[i].getLocation()].getX(); // i will fix this later
int y = (int) points[locP.get(i)].getY(); int y = (int) points[Player[i].getLocation()].getY(); // hopefully lol

Positioners.get(i).setX(x); Positioners.get(i).setX(x);
Positioners.get(i).setY(y); Positioners.get(i).setY(y);


Expand All @@ -197,4 +197,5 @@ public class GameboardWindow extends JPanel {







} }

0 comments on commit e02e5b0

Please sign in to comment.