From 32004f1db0dee979100f4954e79ad8c4ee0de780 Mon Sep 17 00:00:00 2001 From: Joe Hill Date: Sun, 23 Apr 2017 16:49:10 -0400 Subject: [PATCH] asdf --- bin/controller/Cashflow.class | Bin 2757 -> 3387 bytes bin/model/GameBoard.class | Bin 3043 -> 3978 bytes bin/model/Tile.class | Bin 1495 -> 1587 bytes bin/view/GameboardWindow.class | Bin 5224 -> 5541 bytes bin/view/TileButton.class | Bin 820 -> 1172 bytes src/controller/Cashflow.java | 81 +++++++++++++++++++-------------- src/model/GameBoard.java | 2 +- src/model/Tile.java | 5 ++ 8 files changed, 52 insertions(+), 36 deletions(-) diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index 6ee27eb0b8fe2946a0f6ac8c53d4d5e88aecb2a3..e2c2ff7829459f595a7538b1c867414f852d222e 100644 GIT binary patch literal 3387 zcmZ`+>tEZ}8GdBT$W}y12oPvV>bA>b6R1a)(9ICql7!5}hO7`6P1_)BVFb41$})tu zSue}hwWGUq*Y2Ke8M|*uHj|aD$%lQ~zU;5qU$I}=b7UJ#!UB=bdG%hO_j%7r{`t`d z9|AamdkTCK4y0|%b?jWuaAK$R;{06BUREGW*teiB>9L${Wn*Kr3r55*vnK3UM}SH6~ie?Xia(nO0JoU zJ>xj~O42O4!q2#wwRE@S7!r=`rZZ3te!=t9KS&$ZD&;F%I+hX=0&@-3n#}xajPSqt7WIR89A>PemN3gnRa=z3ToxUPUKGeot!%pn<65^P+7#FrnXoMNkQ) zEZ(Av+apkI1c4lP_4Hy&FL+&5@Ho{A?1N~~h=%h>lI3QREV2y8qYQH%WwdQyXC23O zg18{z{6)(#igs?v$b{2&zF_8b*R-v0!LiAkd_1g%gm2DEIIUZj?S^NK@Ro&ZhxPDM zm1L@l6ix&&&H?BR;v!$iLzu#}g3s+3=JA!HYveUNhf7S)E^)4_qiEW(3#6ONS`9tl zFPip(h8J;J!k(<*3QmjcyrL2+bfgu`))=wVSVIOxP$>w1Ihx3kgdlMoSq<|rIf8k6 z$s@2psX4N9rW4VGg2ftZhsP^3sbWE}b^(?K8wL6(I7UHtjB^(`^84@eA;K-d(NGjK zv$r^JFAtSm*S5|Wc{{)pkbjQuQ?ZN{1y^=JG%-&AG8$gSDb;RidYG9X)qTfog3#&!Lq?xKQsiGO9FhRp04L(h5Xs#q0Z zuj1<(z9A@}kOJf8%Z7q)N;tS(ePuF+N@gx&I4Zu4?<)At4mc|s8or13>1IjKm5i}D zG2n@4T?y3*Q}Ldl@ehd!>CerNHT(oW<>jLn3Wmjlp=Y-PGCd(451dKozGWSL_mke22to z&fOlaeGq4RBlddhChYUx`_b&Z4|w_tb$KK5*+yxMZ;9_f*E$Z~^wc`|Z198{9^zW7 zDBxjqau>oO9HvAVALn0TEZ@N++qNpx0NR;uN1eTl$M87iA$)8r_&*?frHpRi$n-jn zp6@CnlH5QyH&5I~?AUZX@L`|qA6&yj9f3o~Q@0S?K<{+-IzCxO-_$j~bf{InzWJXG z#Haaf9Rs)Vl*mNH1|tf99^o@gP#(oWN+OK^B;QYSl|rAFVVL?s4C5ILQNNMz)67+( zMib89EbAGjybZohiW?LhQE(2DB%YK?_{>&CPjM#@39^#J`FCESdypmsbGV2sHRt&y&z*%u6!=rb5=vg#gDg$uw>R)6eYVi*3tUO`c?s9}#Yd0B z_#(CZ^z|6NgtwT*BFE>;c$?36XeGE^(buY7?i5`%5m3zc%1MwT9kKd1jD+ZQ#A>LwE44b$q}12W9-ItFw&j_i&?(HSWsz zZ5e;K=94-fzP|Zy8viLJ9s+t{*!*Xjb=Rxbf9R?I;O~>yaI#gFXZiwFrPe@w+*bDJ zfxxoVDl_uGwmCXTz5}mt7GC8PT;;Lx8j1KiPH}yf=#CKAF`_t61m7TjZ}H50mp^5$ z@A3i?r^U0h4&n}F>)bWsHrIQJaua9muUz@)@hCpv%1?hw*udW?8^cTZJ6C>2==bzw o`i**e0dM*aL;eWO3RWelXOj{(Xq7#=!C#I|FC&QmF!^xze^|*G#Q*>R literal 2757 zcmbVOTUQfT7~PXhm}DG8(NGbzQL6?7Q@qd?6f1Zs62J;#k+wP{V;G&x#K{E2YOU7R zUbOFh^vS-qt`%HmE%mv5>96Qhe?pgZpUD70Xdj9&bLO1yy1)H>$KPK4`W(O^{GcEt zVN=GjJ=d`;!%g++#i=WnGowJ3u;Hpct*0#A&ZUMYuNoOoLd~T~M|ZOlHm37V*055i z^}Nw5wz?(6a{LI+8`9IJG2&#F{wM+T4mOg8^MF~8>fhgH73+GHEfMULza2mGio3 zOK3<=q?fZA@m$l+b+?SEkno0vEy7a%IH=&9I=It6=#9UtThUMhAYDL`ov z7S~Q=C-!M*Lp#ybvn`02l$6or@3DT4vnMb9l|JjYE`5>B=x%wnQsXN@cD z(Cq&fTN)wBiru!r{%htrUqtYIoHa!SAG3lL0{5D^6NYa2z^j-LjW~fz8ZJX89dd>@ zV%}uEIbHe{WZ37+P*?iDw`5vb!&PA*r{Ky;Li-a!!xT&!o7Sz8F-(bgvcF|De^g8& z8HGiX5;cC<8XOcj;`Bnnu-T67YqjkvLqR~@A`w?Z5p1I{6ItaqXlMn~oU0Wy1UxEA zxS?SdH%T_?jhdbqo12sW67ww$w|!a9sURX8-_h^|?$U9=VFv4|yX=7N`z5)4rd0G2 zJT4g7u7v1J_TT0}thy@fi*;hgo2-&w3yENcc@I!0(?L>Jn-+VVK)AQKLkGBT*jd#^N?~H^y*OA8(t(+fQ-u7aXqdF5{>ONA^?MLzke_CPmzK;>FGuXxcPx+y? zQYVT5^rDYCwK#%Uhr~;8?BzTrShG(= z0Y5zwKKcY5&GO|Q7GoZh%1!RBNjitv+b4KJZy`I4;YVJ0pQmJW}m9F0bKOFo>RiUxvR2byx-aw#;G}w>b1}<1X&t0iTa>4`r@j;A+JKDV|*eua7k6Oz=vKsH9i SQbCEoWJCu&Jfy!69{mG-Y<@5R diff --git a/bin/model/GameBoard.class b/bin/model/GameBoard.class index c0f3e02327623554fbd966903d74cd4c51d653f3..c588a9b1710beac8f913621766436bf79f107633 100644 GIT binary patch delta 1214 zcmZXUS!^3s6o$WBJ052;p`{Q-My+b4tz?r2gH-jwhE@qk5R@j7S|Ndu;Kp+mIkCsa z9#@S(SV)yXQFuTIB&71tyikcy=z>dIXxWz%_I)c$+4p@Zg>uF=B$Ssk=gv9jKmR%R zpE=e&wZcB~*MUR88vfj6A8o7I%(BzsZiQ1Qx+b3*$?Hi|cDRRo6&+*7A1r3IpDTKb zP$D^Ca|62__OMOSZt|vJJipJkndUx+I{O5tYzoEArir6CJu$ctIFr28W`_L^2RNwc zw4}q3+2Si!Cz3Z`wY;`!NN8jNzy}=;aahqv(FLP8Gm#t|*PC@Juf4Ii!ZkHPn0EO-ZtAUb*SfR!GPS(U9qDk(+m&vMwMl4iXl*34*1D6v zSh&vp>1ZrkXM3FomZs}GbUTr)5w)8q4l;My(&zT^LXailm+QP%=dC*L#-i!)R!enR z%eJ39+=vS5hqd1M#E<`Z`*~MnRv3l2Mr=Pz#HMK@!(z@O#`&yZ9X+fkK_4l}SkHxG zFXl=vAuFdmgH+kT^$an^FxLvg70oHRmD}Vb^YRs6Q&SE18+NcrTHMID;)SHqb$rM7 zvYHq^KVVC&hY5a^XoS^V#82W`(tHg+OJ0;;1gD44N#PW=P!_XF%#6jfk`^b3$>BIF jQT)npVpmCi3U$l2j&r(y7k?4Q`9q$z#Af7|a{~1@as5|v delta 313 zcmYLEJxc>Y5PcUvvjhTyq|+%cSfsHr2EjsXt`LlZ<(gZQmA&0#Zw&+mOVL*J2UrR5 zD@KhdXz!1(@qdU*QpmuYd5`yonX~zy68rjn`v9WBAL0` zNLeY9)a1O^by7ifsRYT4v~k4O(^Sa@_X}yy*rAEr=0PH~%P1V>%Z#CmhXNMR3osi- z|JQChD|K_ZyxpJ6Uys-PS7W{a_Kxn(%zrqOy2>t+V>sq$} diff --git a/bin/model/Tile.class b/bin/model/Tile.class index 1c963de514a859274396b61b91922fd495d38936..6d947976ee16a38653b7a99d2adad2d2962e6e25 100644 GIT binary patch delta 81 zcmcc4y_tvW)W2Q(7#J8#7`!)f`7m>FCZ?nWt>*gt%q+ fMxZ(-1{om91*91mbQw4q^d@g)m1p+^%Xk3*qstNc delta 36 scmdnYbDf*()W2Q(7#J8#7`!%e`7lpTVs>I=+q{(7l8Kdpfr-Hr0N*AFn*aa+ diff --git a/bin/view/GameboardWindow.class b/bin/view/GameboardWindow.class index dceacd12a6d57048d49b97a3aa2e1efec6c1da81..a66be6d088b01ae83a69e9bec3fbfa7cf90a1043 100644 GIT binary patch literal 5541 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 diff --git a/bin/view/TileButton.class b/bin/view/TileButton.class index 56055d01c712aab61a54f145344334a33cbed63b..c3244dd9548baa760d3c21bf695b63916240e8bb 100644 GIT binary patch literal 1172 zcmZ`&T~E|N6g|UscXcV>u!x}eg><_}ML|d~B%+Zl+2{kf555i1z?g1J+AjE`e9%NN z@xdS9k20Q_7FYo{+3DQ5_nvd^nfCXepT7VsVx^28fq^6CAA8#>@Yg$O8ii$80wbT~ zk^Jl>$12?SHnW7lVB*J01}#5MR1|(_yb%za0)4NeFiB;Ywq(%pi^SGHAz-CM6|kG_ zXwMG}$ErX@pT6s~cl?ViVAg4BUN4Yj-AZGUuQu}L4cYeBBN^|l)>=e< zO~eWc7`D-m5rMI5T5GKen6XjCxWH)Qrxcp{Vfrfek6GP>joX;yG_2EZ zoGG-NMpkgg#$63mVL?kJYDdpD&{Sbwx-HGga5LJaN0Lr4&JV5hKqUf0%}Zv}4lCqj z0>f8F7wFYO-iKyxf#QyyU!!DxURc81p;TciP|bai$Emjw%fkb;n;6H$K5sSS_$Mb& z-p>XW=yz(}S9O!_c{VEOWl`=5Cw97P^kwwr0B4RBoLWQoF4?frN5i(FPQ2^Wac!6$ zDSM&j^=0EeD+_#I3ben75~DJs9^Bxc)Mif@K6S1i16&6gwVAj09CPbGFyt0aG3rj8 z;+AWjV(Ob|o90?2C@{ozlyGBgALniY_ju}N0F>~65uxx9j|i`KGoyT_QNH~|N> zoO+4pIwvk@v^HScz*e*5IjkU2oq2&dJjo$E69Yx}JLbO{Jgqi^nK3XnOIVP@2t36? z-n>Qv&0lisCz!twQ8A}=_RMt&DV+-`8AG*@XLz1tbqiVia!JU-wL%?18^n|nuwmnZZ)oa|m?$JJ z`~W}7I4wqVbLY;?nRCwEm*iVQ`TG9&1aOQaUm5xS=~z>tVwsSsv>xq|Z8^5vv2MI! z*X=Z_cM4XJk)ab(y?$Fb*0tRe7kzu!R$*Y3Aa{g!+jRsFRGQV+Y$$9rk|5+%C|FQ9 zTT@X$k)S^b@3QZD!u8IF!oCV*(h}<`Hc$-C=vks>Fs1uoAeF}w@|Z({$ue&&VV*Cm zMLF@(i;OIBH9!n;esgARij-L|Opty@){IS%H{%nOUL(pTM}q|cjboarI)BbUmd_S< z&6xwm)i5Tk#eaA}|v=^8WePnS@~0pkQK HA|Cz#J3BWq diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java index 377958c..675ca46 100644 --- a/src/controller/Cashflow.java +++ b/src/controller/Cashflow.java @@ -3,15 +3,17 @@ package controller; import view.*; import java.util.ArrayList; -import java.awt.*; -import java.swing.*; +import javax.swing.*; + +import java.awt.*; import model.*; public class Cashflow { private static GameBoard _board; public GameboardWindow gameboard; + public static ArrayList _players; public static int numPlayers; private JFrame frame; private JWindow sidewindow; @@ -19,7 +21,7 @@ public class Cashflow public static void main(String[] args) { - go(); + testGamePlay(); } public static void go() @@ -28,16 +30,16 @@ public class Cashflow // Initialize players (pick professions) MainMenu mm = new MainMenu(); String[] names = mm.makeMainMenu(); - ArrayList players = new ArrayList(); + _players = new ArrayList(); for(String name : names) { - players.add(new Player(name)); + _players.add(new Player(name)); } // Initialize game board - _board = new GameBoard(players); + _board = new GameBoard(_players); + - System.out.println("hello"); // Initialize GUI @@ -85,9 +87,13 @@ public class Cashflow private static void testGamePlay() { - Player p1 = new Player(); - Player p2 = new Player(); - GameBoard g = new GameBoard(p1, p2); + + Player p1 = new Player("1"); + Player p2 = new Player("2"); + ArrayList players = new ArrayList(); + players.add(p1); + players.add(p2); + GameBoard g = new GameBoard(players); System.out.println(p1.getLocation()); g.movePlayer(p1, 5); System.out.println(p1.getLocation()); @@ -137,31 +143,36 @@ public class Cashflow } - public void setUpScreen() { - frame = new JFrame("Cashflow"); - frame.setLayout(new FlowLayout()); - window = new GameboardWindow(_board); - - sidewindow = new JWindow(); - sidewindow.setLayout(new GridLayout(5, 5)); - - frame.add(window); - - - frame.pack(); - - frame.setVisible(true); - frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - } - public static void main(String[] args) { - new Cashflow(4); - - } - public Cashflow(int numPlayers) - { - //this.setUpScreen(); // just did this to test the screen - - } + + +// +// public void setUpScreen() +// { +// frame = new JFrame("Cashflow"); +// frame.setLayout(new FlowLayout()); +// window = new GameboardWindow(_board); +// +// sidewindow = new JWindow(); +// sidewindow.setLayout(new GridLayout(5, 5)); +// +// frame.add(window); +// +// +// frame.pack(); +// +// frame.setVisible(true); +// frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); +// } +// public static void main(String[] args) { +// new Cashflow(4); +// +// } +// public Cashflow(int numPlayers) +// { +// //this.setUpScreen(); // just did this to test the screen +// +// } + } diff --git a/src/model/GameBoard.java b/src/model/GameBoard.java index 2711657..a284424 100644 --- a/src/model/GameBoard.java +++ b/src/model/GameBoard.java @@ -73,7 +73,7 @@ public class GameBoard currentNode = nextNode; } - currentNode.getData().addPlayers(p); + currentNode.getData().addPlayer(p); p.setLocation(currentNode.getData().getBoardIndex()); currentNode.getData().getLandedOn(p); return passedPaydays; diff --git a/src/model/Tile.java b/src/model/Tile.java index 5518930..5c2cc8c 100644 --- a/src/model/Tile.java +++ b/src/model/Tile.java @@ -39,5 +39,10 @@ public class Tile { _players.remove(p); } + + public void addPlayer(Player p) + { + _players.add(p); + } }