From c0dbb74eef6c2dc236a76895a8b88a4bad685599 Mon Sep 17 00:00:00 2001 From: jackie Date: Fri, 21 Apr 2017 19:31:11 -0400 Subject: [PATCH 1/3] trying to pull --- bin/.gitignore | 6 ------ bin/model/CardStack.class | Bin 1828 -> 1828 bytes bin/model/Handler.class | Bin 741 -> 0 bytes bin/view/TileButton.class | Bin 1204 -> 820 bytes src/model/Handler.java | 25 ------------------------- src/view/TileButton.java | 17 ----------------- 6 files changed, 48 deletions(-) delete mode 100644 bin/model/Handler.class delete mode 100644 src/model/Handler.java diff --git a/bin/.gitignore b/bin/.gitignore index 4a6964c..66905d0 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,10 +1,4 @@ -<<<<<<< HEAD -/view/ -/controller/ -/model/ -======= /.DS_Store /controller/ /model/ /view/ ->>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git diff --git a/bin/model/CardStack.class b/bin/model/CardStack.class index d9e4bf91d77e8940b9adac3ddc072f4a7d4d563c..158a0abd37987cf05ebabaeda4e8f892d442f058 100644 GIT binary patch delta 19 bcmZ3&w}fxQYPQMu*i0s`U^AX9#4ZE?Olk(B delta 19 bcmZ3&w}fxQYPQLb*bFAGU^AaA#4ZE?Ooj%h diff --git a/bin/model/Handler.class b/bin/model/Handler.class deleted file mode 100644 index 168fca9f0006f3bd9506aa83659ccce633696c44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 741 zcmaJ<+fLg+5IvJP2?U3Pa4Qf>3k8Cu;urcvh16EPM6yaHP~JDrLKitUS`7R{|E3R7 zB_8?#{V3F#by`}fsw``6XJ^iw-5>XN-vJz8w}uj-G0KKI2|uWGm}pyrM`&HB8xmWO2UVl1Sk!FYPSL;4I%cW*Ob&=nLbjY*&MCXa#Fy%mX#%(d0FPU$5XJ=*?Ym2n@`ThO@;2dY6HV*{&zI1_3G)Oy5uW}4mhvwh literal 1204 zcmZuwYflqV5IvW+RLWv`KP$>ZX&1|?peRL@hd@cAAHW*@wzM~J&9WuCTkvOTqBYUP z#IOD+ePVyG z{8Qx~SUZtHpxc+8vYo2*eARGYmp25&jzHIX!}SB(4XU=&lqq8CpAbj}L=`Y9M~%94 z!W<=j^`sjxvMi7~_Ee1??aRtl!HU34zM?Z*j?KKgfyeZvavZ*8AIY_b?bS<#DpA&n znLz@52D0cE7`P&|P|aWv!)Xk$&WOYrih&V~3ZxHYpo^zNzFfG-v;zV;0~vH?cpEox z6SoBVeHpOcfHkao(%w{#BkQD-f2WfPOd6QNG;!%yb^~7^k&i5Q49sYR3@ugVt9?hN zQDFNbV%xS`cciDY&KkImE`2K+Fwm7j9+ocip1@ST{I?;R_LbeyJRTUB$AUnQU9Yd! z0?wj(f^j^e z=R%Yji+IczInc61Uiwxd*S7GsjHl#0Po67y#yTl8OvmgOd20U-&FUwfzd0w93BxDZ rh}kfi5jn=m1lF(~gJ|kHl{gR9eFUs9a4<5Su@u Date: Fri, 21 Apr 2017 20:04:01 -0400 Subject: [PATCH 2/3] Create MainMenu.java --- src/view/MainMenu.java | 103 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 src/view/MainMenu.java diff --git a/src/view/MainMenu.java b/src/view/MainMenu.java new file mode 100644 index 0000000..6b52d2f --- /dev/null +++ b/src/view/MainMenu.java @@ -0,0 +1,103 @@ +package view; + +import javax.imageio.ImageIO; + +import javax.swing.*; +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); + + } +} From e02e5b0e1cee29ee489cc287950c46b9af47836f Mon Sep 17 00:00:00 2001 From: jackie Date: Fri, 21 Apr 2017 20:18:58 -0400 Subject: [PATCH 3/3] ahhhhhhhhhhhh --- bin/controller/Cashflow.class | Bin 2286 -> 2351 bytes bin/view/GameboardWindow.class | Bin 5533 -> 5224 bytes src/controller/Cashflow.java | 10 ++++++++-- src/model/Player.java | 2 +- src/view/GameboardWindow.java | 25 +++++++++++++------------ 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index e57c612d6a538afdf0ea50ce975543e4715354f6..0dfa4b16cb965ed07505224298ad26b826feb80f 100644 GIT binary patch literal 2351 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 diff --git a/bin/view/GameboardWindow.class b/bin/view/GameboardWindow.class index 06f8a0b2c92dd6de15bb927885ac76e1feae25f9..dceacd12a6d57048d49b97a3aa2e1efec6c1da81 100644 GIT binary patch delta 689 zcmZ{iT};h!7{@=qmqVShUQ}Dd_MgTKTcU-?h=eq0sukj2{ZXCHznzXlrjGYA%1e{H zG%+zZ)DEl3w6WQ8W!8m++T74wm@7A$|FYR!xOtxM_jx|g#k1$>T=Zpu`}O40=Rhjs zz3zdq;B?*#qN>b*nd~vW`;)VLKHC?@2Z6u9>$B=?Pr#}$%I%ukN{{KUw7o{H&o1*= zHFfERJ3P;0)>}TK-1K^Fzfooxe<%F5VHyF`S7|!%|H1eQ<6qLv2v%q~JV(StGlLj3 z(ZoA>7IC2^5y{hnDMYcMSnmLN4juT-MdJ=|-;T3$*KYuIg?&bU)Yi5I6K2 zZt5{Q^$%{j6kRSiw_Sc3VK0XdQPSW7SX;YnNG&(x+59M6#nBxSWoG2Ol4MGd5 AWB>pF delta 991 zcma))TWnNS6o$WjIRfJt(voQuizX7ywABn?DW+vmplE7GsZhrPp?X?Q>Xfk~)6>dC z>7almDn-1YsA!3z@j-1Z4h9SuNk}kJF7ZJqP%es4K@nd}RAAM{gv1vg&i?=Pt+n@A zJA0iDZ!8IXeR10kpp@Tx1KUSh#kJvedqdfxxZ<{Otl4dMBW->n8JV6=yO~&`)t@>H zlWt2>q^iaDn!I$yw2Gqm2o5Xq{@HM4EFTm{_5AqEs6ee6$ zITZg8WIrbY_?!xo{fW~G+v@psBH^l{_)uan$j|@sdBT&a#u|lMDqluX5KA?>$+(+N zxD83KHuJbwJ7g5a|Nk0_z}!?@y0On4HB;r~aSi!c@(77uPpI#+K;)|I1V%Ga&?Ih> zzDt?ROvt2%jD<0E(Xwl!3(q~zs|0ZoLttKDe+)TSE z;|UXGsi`Jo>Uq+nc*?Z1%&elrWM5~w`H-hg56_sLtS|>yWlr*}8Kl$v!D@Ro&)Gtr zx8r%iPGpUp#abKZMZ1u7b}=v64qmZqdDX6Gz1_@f_H#DaJ-lJ}@unT%Eqj5t9m6|L zfNtkHHaWNQt`p@wr;^Ri9NxE%$47l$zNbPx1o>2+r;l-LAtFA?)|Usy%*Y-@%abAN zAqqrKVQ@qjnCJ)86mMa2NnwuNU(%oB$fO*{x~BaXp6n{KLhFYs{c$;dydn(Q9A{Q) zRalbaz@|$d_sa2>WwPEtc7(__`QvuR@&yyvAycrE*}~?tiw?<_4)-H-vRoqRjI(kR xB^}qXf|a6UWwOqRGqV3iei3K+RVss0HC%sQT&MU^=)Z8(pTq?GCctPeTn69t`b_`; diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java index fde4514..6ef1cc0 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 main(String[] args) { @@ -57,7 +63,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 { + }