Skip to content
Permalink
Browse files

ahhhhhhhhhhhh

  • Loading branch information
jackie
jackie committed Apr 22, 2017
1 parent c0dbb74 commit e02e5b0e1cee29ee489cc287950c46b9af47836f
BIN +65 Bytes (100%) bin/controller/Cashflow.class
Binary file not shown.
BIN -309 Bytes (94%) bin/view/GameboardWindow.class
Binary file not shown.
@@ -1,15 +1,21 @@
package controller;

import view.*;

import java.util.ArrayList;

import model.*;

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 main(String[] args)
{
@@ -57,7 +63,7 @@ public void play()
public boolean isWinner()
{
boolean isWinner = false;
for(Player p : _players)
for(Player p : players)
{
if(p.hasWon())
{
@@ -6,7 +6,7 @@
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()
@@ -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<Positioner> Positioners;


public GameboardWindow(GameBoard board) {
this.board = board;
Dimension size = new Dimension(img.getWidth(null), img.getHeight(null));
@@ -45,6 +45,7 @@ public GameboardWindow(GameBoard board) {
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 void paintComponent(Graphics g) {

}

public void update(ArrayList<Integer> 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 void update(ArrayList<Integer> locP) {




}

0 comments on commit e02e5b0

Please sign in to comment.
You can’t perform that action at this time.