From 761816ac8bf22aa07eb54649c2050dd05246cf1b Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 25 Apr 2017 10:05:04 -0400 Subject: [PATCH] this probably wont work --- bin/.gitignore | 11 ----------- bin/controller/Cashflow.class | Bin 3387 -> 3387 bytes bin/model/BigDealStack.class | Bin 8559 -> 8559 bytes bin/model/Card.class | Bin 447 -> 447 bytes bin/model/CardStack.class | Bin 1828 -> 1828 bytes bin/model/DealCard.class | Bin 1089 -> 1089 bytes bin/model/Die.class | Bin 638 -> 638 bytes bin/model/DoodadCard.class | Bin 484 -> 484 bytes bin/model/DoodadStack.class | Bin 4641 -> 4641 bytes bin/model/FinancialStatement.class | Bin 6352 -> 6352 bytes bin/model/GameBoard.class | Bin 3978 -> 3978 bytes bin/model/MarketCard.class | Bin 1029 -> 1029 bytes bin/model/MarketStack.class | Bin 11194 -> 11194 bytes bin/model/OwnedRealEstate.class | Bin 896 -> 896 bytes bin/model/Player.class | Bin 2323 -> 2323 bytes bin/model/Profession.class | Bin 2597 -> 2597 bytes bin/model/Professions.class | Bin 1965 -> 1965 bytes bin/model/SmallDealStack.class | Bin 4473 -> 4473 bytes bin/model/Stock.class | Bin 740 -> 740 bytes bin/model/Tile.class | Bin 1587 -> 1587 bytes bin/view/CharityWindow$1.class | Bin 692 -> 692 bytes bin/view/CharityWindow$2.class | Bin 935 -> 935 bytes bin/view/CharityWindow$3.class | Bin 713 -> 713 bytes bin/view/CharityWindow.class | Bin 2505 -> 2505 bytes bin/view/ChildWindow$1.class | Bin 680 -> 680 bytes bin/view/ChildWindow$2.class | Bin 1088 -> 1088 bytes bin/view/ChildWindow.class | Bin 2399 -> 2399 bytes bin/view/DealCardWindow$1.class | Bin 698 -> 698 bytes bin/view/DealCardWindow$2.class | Bin 698 -> 698 bytes bin/view/DealCardWindow$3$1.class | Bin 720 -> 720 bytes bin/view/DealCardWindow$3$2.class | Bin 720 -> 720 bytes bin/view/DealCardWindow$3.class | Bin 1683 -> 1683 bytes bin/view/DealCardWindow$4$1.class | Bin 720 -> 720 bytes bin/view/DealCardWindow$4$2.class | Bin 720 -> 720 bytes bin/view/DealCardWindow$4.class | Bin 1687 -> 1687 bytes bin/view/DealCardWindow.class | Bin 3590 -> 3590 bytes bin/view/DoodadCardWindow$1.class | Bin 734 -> 734 bytes bin/view/DoodadCardWindow$2.class | Bin 964 -> 964 bytes bin/view/DoodadCardWindow.class | Bin 2439 -> 2439 bytes bin/view/DownSizeWindow$1.class | Bin 719 -> 719 bytes bin/view/DownSizeWindow.class | Bin 2194 -> 2194 bytes bin/view/GameboardWindow.class | Bin 5541 -> 5842 bytes bin/view/MainWindow$1.class | Bin 808 -> 808 bytes bin/view/MainWindow.class | Bin 1461 -> 1461 bytes bin/view/MainWindow1$1.class | Bin 722 -> 722 bytes bin/view/MainWindow1.class | Bin 1112 -> 1112 bytes bin/view/Positioner.class | Bin 974 -> 974 bytes bin/view/SDStockCardWindow$1.class | Bin 716 -> 716 bytes bin/view/SDStockCardWindow$2.class | Bin 1150 -> 1150 bytes bin/view/SDStockCardWindow$3.class | Bin 737 -> 737 bytes bin/view/SDStockCardWindow.class | Bin 2839 -> 2839 bytes bin/view/TileButton.class | Bin 1172 -> 1172 bytes bin/view/Window.class | Bin 253 -> 253 bytes src/view/GameboardWindow.java | 11 +++++++---- 54 files changed, 7 insertions(+), 15 deletions(-) diff --git a/bin/.gitignore b/bin/.gitignore index 1b12d5f..66905d0 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,15 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git /.DS_Store /controller/ /model/ -<<<<<<< HEAD ->>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git /view/ -/Instructions.class -======= -/view/ ->>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index b0858531d4a7e1ea7b232a3b26676997ac3e4796..e2c2ff7829459f595a7538b1c867414f852d222e 100644 GIT binary patch delta 17 ZcmdljwOfkg)W2Q(7#J8#HgXvA0sujb1|R?c delta 17 ZcmdljwOfkg)W2Q(7#J9gHgXvA0sujR1|9$a diff --git a/bin/model/BigDealStack.class b/bin/model/BigDealStack.class index 5a27ad02598023c3d289cda48280aed948fe15a3..a820dd78f8686adda27f9227344758246a3b5ef1 100644 GIT binary patch delta 17 ZcmaFw^xlc%)W2Q(7#J8#HgcpZ0su`o2Ot0d delta 17 ZcmaFw^xlc%)W2Q(7#J9gHgcpZ0su`e2Oa;@^>5cc1_lO`jT}w<06d}w82|tP delta 17 YcmeB@?~>;@^>5cc1_lPBjT}w<06drm7XSbN diff --git a/bin/model/MarketCard.class b/bin/model/MarketCard.class index 62aad7c1bd1d8b3cdd6ac6d6fce375b9d06af5fc..10982d5b30eb6ec1c99eb04f0d92f524b42f5c01 100644 GIT binary patch delta 17 YcmZqWXyxEI^>5cc1_lO`jU0cO0XjMcPyhe` delta 17 YcmZqWXyxEI^>5cc1_lPBjU0cO0Xi@SP5=M^ diff --git a/bin/model/MarketStack.class b/bin/model/MarketStack.class index cf1b1450edd0b4945cf8ad575445d36b7af90889..6c75bff46a59f2bc9f99e0390e78540fcc41c8c5 100644 GIT binary patch delta 17 ZcmdlLzAK#L)W2Q(7#J8#Hgasz1^`K}2Q>fy delta 17 ZcmdlLzAK#L)W2Q(7#J9gHgasz1^`K<2QvTw diff --git a/bin/model/OwnedRealEstate.class b/bin/model/OwnedRealEstate.class index 500d944e88b7e5bee1f9e7201cba61332cafae66..b9ca4f6486066cb69d8a5f3c5a603405543d43a9 100644 GIT binary patch delta 17 YcmZo*Z(!#*^>5cc1_lO`jT{xs06205zW@LL delta 17 YcmZo*Z(!#*^>5cc1_lPBjT{xs061s`y#N3J diff --git a/bin/model/Player.class b/bin/model/Player.class index ded97737825bdff118dba7e8013a2d4b03ff42ba..2b7f7eaf35b458b3a908655fbbb4856431bfc0b6 100644 GIT binary patch delta 17 ZcmbO%G+Bt_)W2Q(7#J8#Hga%t0suQm1(W~) delta 17 ZcmbO%G+Bt_)W2Q(7#J9gHga%t0suQc1(E;& diff --git a/bin/model/Profession.class b/bin/model/Profession.class index 8206775f8dfd9f979a18b9da8b87f2568dd1faa1..8fdeb619cfbf0611443cdf9dd2e107bdaf0a3a90 100644 GIT binary patch delta 17 ZcmZ1~vQ&iQ)W2Q(7#J8#Hgd>v0RTPe1v0RTPU1zm}il)W2Q(7#J8#HgYUw2LL}{23i0B delta 17 ZcmZ3>zm}il)W2Q(7#J9gHgYUw2LL}-23P<9 diff --git a/bin/model/SmallDealStack.class b/bin/model/SmallDealStack.class index 8b79e2031e7a0a4fa8dab3c9437c04c324ca73fc..143fd12a6cc2428f52713ca0b54d1bf75baa28e3 100644 GIT binary patch delta 17 ZcmeyV^izrB)W2Q(7#J8#HgXgS0su<92JQd= delta 17 ZcmeyV^izrB)W2Q(7#J9gHgXgS0su;~2J8R; diff --git a/bin/model/Stock.class b/bin/model/Stock.class index b348dae0b521a9335c78b91d25973e4be58764b5..605e025a08d7c1f1be7c63ea31af813d17423fb1 100644 GIT binary patch delta 17 ZcmaFD`h=C^)W2Q(7#J8#Hgeoy0suvQ2Ic?& delta 17 ZcmaFD`h=C^)W2Q(7#J9gHgeoy0suvG2IK$$ diff --git a/bin/model/Tile.class b/bin/model/Tile.class index a779fd7a4b3480fd5e7c274472dd8b6ce5e16c54..6d947976ee16a38653b7a99d2adad2d2962e6e25 100644 GIT binary patch delta 17 ZcmdnYvzdqE)W2Q(7#J8#HgagQ0RTSH1?2z$ delta 17 ZcmdnYvzdqE)W2Q(7#J9gHgagQ0RTS71>*n! diff --git a/bin/view/CharityWindow$1.class b/bin/view/CharityWindow$1.class index f38a143228dc335dd84c844977e3d5d669964701..e815cf81aea154aa9fa03eaeb7c9df1963862249 100644 GIT binary patch delta 17 ZcmdnOx`mbF)W2Q(7#J8#Hgc?C0suc9237z7 delta 17 ZcmdnOx`mbF)W2Q(7#J9gHgc?C0sub~22=n5 diff --git a/bin/view/CharityWindow$2.class b/bin/view/CharityWindow$2.class index 9816afb36baab2a5872c0d03b5cfedb499d30168..e7767b952542163f889b1a88adb5c50b77ee3e0b 100644 GIT binary patch delta 17 ZcmZ3^zMP%o)W2Q(7#J8#Hge2o1^_*v1~dQw delta 17 ZcmZ3^zMP%o)W2Q(7#J9gHge2o1^_*l1~LEu diff --git a/bin/view/CharityWindow$3.class b/bin/view/CharityWindow$3.class index 9da374bba45928c35da26db3da81350ff84fd5cf..ee0ab41f162d83a335d79d9d7e195f776a1d016e 100644 GIT binary patch delta 17 ZcmX@fdXkmn)W2Q(7#J8#HgX(f0sukh29*E+ delta 17 ZcmX@fdXkmn)W2Q(7#J9gHgX(f0sukX29p2) diff --git a/bin/view/CharityWindow.class b/bin/view/CharityWindow.class index d954bf35300f4fef4380360bf16ed9341c490ed5..20005582253f8ad23e4b023f95fa3a62e72a841b 100644 GIT binary patch delta 17 ZcmX>pd{UU>)W2Q(7#J8#HgX)~1OP*l2DktK delta 17 ZcmX>pd{UU>)W2Q(7#J9gHgX)~1OP*b2DShI diff --git a/bin/view/ChildWindow$1.class b/bin/view/ChildWindow$1.class index efd900fcf07eef43eaa55a6574580ffee267b680..a63c280d149bec193fe6df3077ff1d6adc8f3185 100644 GIT binary patch delta 17 ZcmZ3%x`LJC)W2Q(7#J8#HgYUr0suXQ1~LEu delta 17 ZcmZ3%x`LJC)W2Q(7#J9gHgYUr0suXG1~32s diff --git a/bin/view/ChildWindow$2.class b/bin/view/ChildWindow$2.class index 01203297261b5917d65f06b7ab98c5c06f2dddc6..35fa16f1888e7b11e172bc32e32183707bbc9243 100644 GIT binary patch delta 17 ZcmX@Wae#y4)W2Q(7#J8#HgZ_7002M{1_A&8 delta 17 ZcmX@Wae#y4)W2Q(7#J9gHgZ_7002M-1^@s6 diff --git a/bin/view/ChildWindow.class b/bin/view/ChildWindow.class index 6f698fb42f1d281acfe68cf0826f975e6874cf56..00056a14cebab156919bce82a67886198feb83de 100644 GIT binary patch delta 17 ZcmcaFbYF<$)W2Q(7#J8#Hgbe>0suu|26zAf delta 17 ZcmcaFbYF<$)W2Q(7#J9gHgbe>0suu;26g}d diff --git a/bin/view/DealCardWindow$1.class b/bin/view/DealCardWindow$1.class index 698118baa12d0fc2c800282f59be215717d9a9de..ac4aceb14e4abc361a5ff07de31cad9600bc5cd5 100644 GIT binary patch delta 17 ZcmdnRx{HdVy8o)W2Q(7#J8#7}VGqm>3zvCr%XIsJfa70EcV{FaQ7m delta 28 kcmcb>dVy8o)W2Q(7#J9g7}VGqm>3zvCr%XIsJfa70EbKnE&u=k diff --git a/bin/view/DealCardWindow$3$2.class b/bin/view/DealCardWindow$3$2.class index 7af86cd5f5ca9b6c21258c99ab768a3a2fdc5f59..75eab6a985c7cc88bc02682520e0353c3996d513 100644 GIT binary patch delta 28 kcmcb>dVy8o)W2Q(7#J8#7}VGqm>3zvCr%XIsJfa70EcV{FaQ7m delta 28 kcmcb>dVy8o)W2Q(7#J9g7}VGqm>3zvCr%XIsJfa70EbKnE&u=k diff --git a/bin/view/DealCardWindow$3.class b/bin/view/DealCardWindow$3.class index a57b468141ee8ddb3862f4be019cc53be0ce2d26..9906e71e7dc098f3cf6ff0c96d760d253662aec2 100644 GIT binary patch delta 17 ZcmbQtJDHc`)W2Q(7#J8#Hga^c0RTI%1_uBD delta 17 ZcmbQtJDHc`)W2Q(7#J9gHga^c0RTIt1_b~B diff --git a/bin/view/DealCardWindow$4$1.class b/bin/view/DealCardWindow$4$1.class index 2d1cd226ba46d787e7e8c9a850cb43635b4d5162..a938d08adb4c7e062b39f24f69c7d2f765dbb255 100644 GIT binary patch delta 28 kcmcb>dVy8o)W2Q(7#J8#7}VGqm>3zvCr%XIsJfa70EcV{FaQ7m delta 28 kcmcb>dVy8o)W2Q(7#J9g7}VGqm>3zvCr%XIsJfa70EbKnE&u=k diff --git a/bin/view/DealCardWindow$4$2.class b/bin/view/DealCardWindow$4$2.class index f06db0349e89b753d9960baf2cada14acf92cd1d..111e7c726beab4230a939d25476765e056d8c378 100644 GIT binary patch delta 28 kcmcb>dVy8o)W2Q(7#J8#7}VGqm>3zvCr%XIsJfa70EcV{FaQ7m delta 28 kcmcb>dVy8o)W2Q(7#J9g7}VGqm>3zvCr%XIsJfa70EbKnE&u=k diff --git a/bin/view/DealCardWindow$4.class b/bin/view/DealCardWindow$4.class index e4ed6d360d0963101317cdb149c010a288538972..dad01a226493c3a5d30823681397293b234c96d5 100644 GIT binary patch delta 17 ZcmbQvJDr!~)W2Q(7#J8#Hgfc{0RTKV1`_}P delta 17 ZcmbQvJDr!~)W2Q(7#J9gHgfc{0RTKL1`z-N diff --git a/bin/view/DealCardWindow.class b/bin/view/DealCardWindow.class index bd6667d628d6d58d374851f97ba128c843d94212..f81b2f9516fde6440856ff65a24e571d9f576be0 100644 GIT binary patch delta 29 lcmZpZX_FB+^>5cc1_lNbhP~_zOpFY|lN(uuH!45o1pteT2$KK+ delta 29 lcmZpZX_FB+^>5cc1_lNrhP~_zOpFY|lN(uuH!45o1ptd`2$28) diff --git a/bin/view/DoodadCardWindow$1.class b/bin/view/DoodadCardWindow$1.class index 88177380bc412d09cc4d278cf9136ec39cbd0e41..bdc151b63a22fbe9c3613452c191b5f571a8e580 100644 GIT binary patch delta 17 Zcmcb|dXJUk)W2Q(7#J8#Hga5J0sus@2Gjrm delta 17 Zcmcb|dXJUk)W2Q(7#J9gHga5J0sus(2GRfk diff --git a/bin/view/DoodadCardWindow$2.class b/bin/view/DoodadCardWindow$2.class index 848faa7a9094024224776034f0517d7592332eca..a37a3bc7541a1afd0cbfe26063e23357beda4bfc 100644 GIT binary patch delta 28 kcmX@YeuQ1%)W2Q(7#J8#7|hujm>3zvCr%XIs5+k+0EQz7A^-pY delta 28 kcmX@YeuQ1%)W2Q(7#J9g7|hujm>3zvCr%XIs5+k+0EPnyAOHXW diff --git a/bin/view/DoodadCardWindow.class b/bin/view/DoodadCardWindow.class index 4339f2b47e4a29cc5ce87a203a226933b3ff1ff9..0be9d163030331b14a668ec4a81a8660a0c204da 100644 GIT binary patch delta 17 YcmZn{ZWrb_^>5cc1_lO`jU4ry06NYE@&Et; delta 17 YcmZn{ZWrb_^>5cc1_lPBjU4ry06N44@Bjb+ diff --git a/bin/view/DownSizeWindow$1.class b/bin/view/DownSizeWindow$1.class index 52f3a74ea5b4a36250848aac4126a12bf775e893..f33d97ee57040630b71d78a1e058be216ddee04e 100644 GIT binary patch delta 17 ZcmX@ldY+Zz)W2Q(7#J8#HgX(i0sum@2B!c3 delta 17 ZcmX@ldY+Zz)W2Q(7#J9gHgX(i0sum(2BiQ1 diff --git a/bin/view/DownSizeWindow.class b/bin/view/DownSizeWindow.class index 241aa271423c98a9bc30a4c3aef29dafb04ca1ac..2f1231ef9aa37fbd24437ae0e2977ff491be17bf 100644 GIT binary patch delta 29 lcmbOvI7v|8)W2Q(7#J8#7`oUQm>3y^Co8fFZ&c3b004zh2Z;ax delta 29 lcmbOvI7v|8)W2Q(7#J9g7`oUQm>3y^Co8fFZ&c3b004z92ZsOv diff --git a/bin/view/GameboardWindow.class b/bin/view/GameboardWindow.class index 4528875623d3a7c84a440ce8d6cfb35e9f7e64cb..f3413252316d3f60cb91e973e660c71f3354c32e 100644 GIT binary patch delta 1096 zcma)*ZA_JA7{`D2%QNNl%=v~k0?NcZM>L4YwNz4~h=OE=yjY4yI4XJ&;v7iSc0wu3 zj5vb|Yi4DPYDN)u=CnC&Yg1{nbZyOAuC0-!g=Jc%Y1ff2ZhdLb?(2WO|F8Smb$6#9 zo#8ordCxu|TbVvjb%Iq~?~NWwjQC0wUT@(_f0I9>FQ|B z8O1?=bD&{X&MaT)2!2wy*SbBNQ;NmHWUej%LTm!zS4N$PnW-j1A%abVq|6gRq~KRt&!8Lm=I?OmiilN z{7Zv@lIHqANnBA(`CoUCp8l$;Kq!=!sTk+=b&U1wcE;c#spE*}Owlb^Qn`Uiq%jq* zd~@+}FVlE{bmlXi5@t|A28+0j6=YG%?X;3jCwK6Q;8texq4;-mXTR$nb0Rs6;%>%E zqe;w@IPT<6oE%LwUJH0pIU=?y%gqpZ>0tkoa0PJhCBJ;0Ot1Q9*NQ~EqD#%*jnAvPH^Lfrxve_)-dDF-i6M2?4)5VKsJME^Is5wA~`I1iaH7}V#UN#r# zvI%Upqj}Y)@|w+Jo6Y5QTflZ(#v67eZ`rl%ur0i8+v&DD=&}90WB2f`J;ZzVTXx#h zyl>Ca>u5f366tfM@R2i}e&;TBS*M7-{Y%CLRN_8d_A`b9q{zR`5Pc4xbsQg`8yQ41 zRvw4uMHFJ6>p0{ zv@y=NYL%QG zOvVMdiIR!SX(uX}Bn$YrXh!O9lwFBR`%9APO4e}xKcaPto`AlDqb^c7dL);*LdTNC Zn^kt&Bigt*|1q-K4Dk>X_OrHjNW4G}%V`HijB4 zv==Q@Llm}04=qn6K@UL$VVf-w1rbD-c?f#wK78l9_k8C&T+Vqm=;T1x?(^3x8<#%W0ezfGChuON#?{rz#nMGdqHrHFW_G8_k`SKcB$W6UFmUxm42UH9q^ZU z+}`CmwkvMB$64tP*rkro=MUN?Zu@UV&~H0-$O%+BM*M$aVwwG~(nSlwNR8{Em4J(G zk=*uQ^V8AvpgT5c^r0Vp8EbGN{h7i53K+<2GALp&#bi;z5WMDp8yQ9&+0>iZ$Z#&1 z_v?&^hU1&9@F+Skny!qYw=o+=F5?(a9ut^jj4KQaF^M%yW}9hph^d?>pD5F~ZyG*l z25*?jM`rPh*`fn;MGp!^8uLUpMIw*+qL2k*A;rSWLQ%_Nu@^@)P$EuKDsF^vizk$e zXDkt~sSw|(k`_y4JRX^XS7zatW2u&TER%%<t$ zBVVyrejzM>uuf@eRWch?UpA`2Y*HiHtP0qo7O_>8vrW~oU4^%>Q#G(l9bvb+$R2f% zed;L@^@2Lp!hZFWdL2iDPM}fun6_VN1W9!Ij37WufK7@l3cVBxn!kt*~;LGl|xip`7}kFySPQ-E#kRDC+?aN-y_rT zQ9Ov`C+3b%L6BrtH5+9ZxNgu=)cM^tKHM=kNvgp%vCKoW7#N?JiXH5Pgmz{+t&tr` Ysj0nUSsAPO6vNMaG0|o8$tIff2VfAu_5c6? diff --git a/bin/view/MainWindow$1.class b/bin/view/MainWindow$1.class index 419bfb4fa642f6377b344c663df60b727c5363bb..cd197be9bbb124c4e5434e946769b4433ed5bd2f 100644 GIT binary patch delta 17 ZcmZ3%wt|i0)W2Q(7#J8#HgYI10{}dv1+@SG delta 17 ZcmZ3%wt|i0)W2Q(7#J9gHgYI10{}dl1+xGE diff --git a/bin/view/MainWindow.class b/bin/view/MainWindow.class index 6f8e8c709d474b6d649ad30e4ee0e6449c873975..48940aba92aae17720d23f37fa5db253ea790d6c 100644 GIT binary patch delta 17 ZcmdnWy_K8e)W2Q(7#J8#Hgc?G1pq(x250~P delta 17 ZcmdnWy_K8e)W2Q(7#J9gHgc?G1pq(n24(;N diff --git a/bin/view/MainWindow1$1.class b/bin/view/MainWindow1$1.class index 072003103b479c243dfafddd69a6fdae9446a085..0300272617c3847dcbd412760c2f914c3ef0ca73 100644 GIT binary patch delta 17 Zcmcb_dWn_e)W2Q(7#J8#HgcR|0suo92Cx7C delta 17 Zcmcb_dWn_e)W2Q(7#J9gHgcR|0sun~2Ce`A diff --git a/bin/view/MainWindow1.class b/bin/view/MainWindow1.class index 9d49cf6cc888cd044ad4e4a20b88277aaac35004..edc924e3c73e6e1536f11521078c514c9ded69e7 100644 GIT binary patch delta 17 Zcmcb?af5^7)W2Q(7#J8#HgW{8002Wl21)<` delta 17 Zcmcb?af5^7)W2Q(7#J9gHgW{8002Wb21oz^ diff --git a/bin/view/Positioner.class b/bin/view/Positioner.class index 588f16bfaadcfc52b7eb7719b53e97cfd84ca355..32ebf821b6339327bbb34f5eeaa767a58b192f4d 100644 GIT binary patch delta 17 ZcmX@devX~v)W2Q(7#J8#HgX(e1^`0N2B`o5 delta 17 ZcmX@devX~v)W2Q(7#J9gHgX(e1^`0D2B!c3 diff --git a/bin/view/SDStockCardWindow$1.class b/bin/view/SDStockCardWindow$1.class index 09d4e6ff2791810622e7b1aed71000620163e393..c11d6780367841703dc99538cc5c71ecf7c7af96 100644 GIT binary patch delta 17 ZcmX@ZdWMzb)W2Q(7#J8#HgX(c0suly2A%)_ delta 17 ZcmX@ZdWMzb)W2Q(7#J9gHgX(c0sulo2Alu@ diff --git a/bin/view/SDStockCardWindow$2.class b/bin/view/SDStockCardWindow$2.class index 02dbdb42b489b11654ba2b03cbea6a1d2b0ce7e1..aab4f8a780ca656bf17d74776e74d6aa56b6eab4 100644 GIT binary patch delta 17 Zcmeyz@sES!)W2Q(7#J8#Hgc4)002l$2D|_O delta 17 Zcmeyz@sES!)W2Q(7#J9gHgc4)002ls2D$(M diff --git a/bin/view/SDStockCardWindow$3.class b/bin/view/SDStockCardWindow$3.class index e2d8af2033ed9e7a419bab35a1e9ef03f5715fb7..2921fb3f3d4cfb6e2fa6e5c3ba7b0374f6e81103 100644 GIT binary patch delta 17 ZcmaFJ`jD05)W2Q(7#J8#Hgeo#0suu92HgMv delta 17 ZcmaFJ`jD05)W2Q(7#J9gHgeo#0sut~2HOAt diff --git a/bin/view/SDStockCardWindow.class b/bin/view/SDStockCardWindow.class index c2b2d143ba1bbddbd17c9a88a9959bf359c234c5..43b9ea31434cff0cb26ff8378f36f0c40c551001 100644 GIT binary patch delta 29 lcmbO(HeF2M)W2Q(7#J8#7*??}FflTSO;%(S+o<-D3jm6D2u1(^ delta 29 lcmbO(HeF2M)W2Q(7#J9g7*??}FflTSO;%(S+o<-D3jm5$2t)t? diff --git a/bin/view/TileButton.class b/bin/view/TileButton.class index 74e89f35f997ee0065014b1728a1a36844d846cd..c3244dd9548baa760d3c21bf695b63916240e8bb 100644 GIT binary patch delta 17 ZcmbQjIfaws)W2Q(7#J8#Hgfc^0028z1^@s6 delta 17 ZcmbQjIfaws)W2Q(7#J9gHgfc^0028p1^xg4 diff --git a/bin/view/Window.class b/bin/view/Window.class index fe71bb585cb9090b491f256af3681c5534b0e673..c68be936dff58fb320e6e1a871331e9afe1c4f25 100644 GIT binary patch delta 16 Ycmey%_?MC6)W2Q(7#J8#CUSfQ06@+M2LJ#7 delta 16 Ycmey%_?MC6)W2Q(7#J9gCUSfQ06@kE1poj5 diff --git a/src/view/GameboardWindow.java b/src/view/GameboardWindow.java index efec53c..ca5d379 100644 --- a/src/view/GameboardWindow.java +++ b/src/view/GameboardWindow.java @@ -1,5 +1,6 @@ package view; import model.*; + import controller.*; import java.awt.*; import java.util.ArrayList; @@ -195,10 +196,10 @@ public class GameboardWindow extends JPanel { } - 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(); // + public void update(ArrayList _players) { //updates the location of the player on the board + for (int i = 0; i < _players.size(); i++) { + int x = (int) points[_players.get(i).getLocation()].getX(); // i will fix this later + int y = (int) points[_players.get(i).getLocation()].getY(); // Positioners.get(i).setX(x); Positioners.get(i).setY(y); @@ -206,6 +207,8 @@ public class GameboardWindow extends JPanel { } + +