From cc8ac19a583b47b4b9e11f0bfd54a6d0185b986b Mon Sep 17 00:00:00 2001 From: Joe Hill Date: Tue, 4 Apr 2017 12:26:13 -0400 Subject: [PATCH] All kinds of good stuff --- .DS_Store | Bin 6148 -> 6148 bytes bin/.DS_Store | Bin 0 -> 6148 bytes bin/.gitignore | 3 --- bin/controller/Cashflow.class | Bin 2241 -> 2328 bytes bin/model/BigDealStack.class | Bin 0 -> 8559 bytes bin/model/Card.class | Bin 0 -> 447 bytes bin/model/CardStack.class | Bin 0 -> 1828 bytes bin/model/CharityTile.class | Bin 0 -> 476 bytes bin/model/ChildTile.class | Bin 0 -> 470 bytes bin/model/DealCard.class | Bin 0 -> 1089 bytes bin/model/DealTile.class | Bin 0 -> 1842 bytes bin/model/Die.class | Bin 0 -> 638 bytes bin/model/DoodadCard.class | Bin 0 -> 484 bytes bin/model/DoodadStack.class | Bin 0 -> 4455 bytes bin/model/DoodadTile.class | Bin 0 -> 581 bytes bin/model/FinancialStatement.class | Bin 0 -> 4448 bytes bin/model/GameBoard.class | Bin 0 -> 2215 bytes bin/model/MarketCard.class | Bin 0 -> 1029 bytes bin/model/MarketStack.class | Bin 0 -> 11194 bytes bin/model/MarketTile.class | Bin 0 -> 351 bytes bin/model/OwnedRealEstate.class | Bin 0 -> 896 bytes bin/model/PaydayTile.class | Bin 0 -> 351 bytes bin/model/Player.class | Bin 0 -> 1490 bytes bin/model/Professions.class | Bin 0 -> 1986 bytes bin/model/SmallDealStack.class | Bin 0 -> 4473 bytes bin/model/Stock.class | Bin 0 -> 740 bytes bin/model/Tile.class | Bin 0 -> 1243 bytes bin/model/TileCircularLinkedList$Node.class | Bin 0 -> 789 bytes bin/model/TileCircularLinkedList.class | Bin 0 -> 2549 bytes bin/view/MainWindow$1.class | Bin 0 -> 808 bytes bin/view/MainWindow.class | Bin 0 -> 1461 bytes bin/view/MainWindow1$1.class | Bin 0 -> 722 bytes bin/view/MainWindow1.class | Bin 0 -> 1048 bytes src/controller/Cashflow.java | 8 ++----- src/model/CharityTile.java | 13 ++++++++++++ src/model/ChildTile.java | 7 +++++++ src/model/DealTile.java | 22 +++++++++++++++++--- src/model/DoodadTile.java | 14 +++++++++++++ src/model/FinancialStatement.java | 2 ++ src/model/GameBoard.java | 3 ++- src/model/Player.java | 20 +++++++++++------- src/model/Professions.java | 8 ++----- src/model/Tile.java | 2 +- 43 files changed, 75 insertions(+), 27 deletions(-) create mode 100644 bin/.DS_Store create mode 100644 bin/model/BigDealStack.class create mode 100644 bin/model/Card.class create mode 100644 bin/model/CardStack.class create mode 100644 bin/model/CharityTile.class create mode 100644 bin/model/ChildTile.class create mode 100644 bin/model/DealCard.class create mode 100644 bin/model/DealTile.class create mode 100644 bin/model/Die.class create mode 100644 bin/model/DoodadCard.class create mode 100644 bin/model/DoodadStack.class create mode 100644 bin/model/DoodadTile.class create mode 100644 bin/model/FinancialStatement.class create mode 100644 bin/model/GameBoard.class create mode 100644 bin/model/MarketCard.class create mode 100644 bin/model/MarketStack.class create mode 100644 bin/model/MarketTile.class create mode 100644 bin/model/OwnedRealEstate.class create mode 100644 bin/model/PaydayTile.class create mode 100644 bin/model/Player.class create mode 100644 bin/model/Professions.class create mode 100644 bin/model/SmallDealStack.class create mode 100644 bin/model/Stock.class create mode 100644 bin/model/Tile.class create mode 100644 bin/model/TileCircularLinkedList$Node.class create mode 100644 bin/model/TileCircularLinkedList.class create mode 100644 bin/view/MainWindow$1.class create mode 100644 bin/view/MainWindow.class create mode 100644 bin/view/MainWindow1$1.class create mode 100644 bin/view/MainWindow1.class diff --git a/.DS_Store b/.DS_Store index 5f43d6065d812e0ccae8df659b467478c82dcae3..17330d172ced539afc6f5a67f1db493e07ac9113 100644 GIT binary patch delta 49 zcmZoMXfc@J&nUDpU^g?P&}JSMMn+*~h9rhehP<-iqP(2^ymSTz2FA@?tk0P?vvd6A F2LMAq4HN(X delta 32 ocmZoMXfc@J&nUPtU^g?P;AS2cM#jy`tWTIG7Km+T=lIJH0G=ZWmH+?% diff --git a/bin/.DS_Store b/bin/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6c20a5838c290b18ac6a2741a63c0c9b316c3e76 GIT binary patch literal 6148 zcmeHK&x;c=6n@!u-RX*0LD)UcMexu==dyMYVW{=6co8akP}%Kt%64EnDeZKN)@uI^ z_u|2m;8E~j(7WJG{}lc55=+KzVNW7%UP->p`;p{*nIs(|63s~*5LJoDLs3}XMsFV<$(^XyR%ua zAJqI{uQ9Lrv&OCcn!gt`=5x>6xe?qsI2t^EF?%_G^@iyqfdiQ3s=?oIiiVY9af#m5 zi&lGK-oEB8tXO+FR;`6a5d02Uu_x_OmdflHeX5z3>4Xw2&a}8VVh1*Rah86?d2fBT z`>N$|+%$BZn@7mDD~q4(LH zM5xi#jseF&k%5watg8F}-umzVVvu`s3^)ei?M2W`6e`SRwO$>=9TNG`Z zTA9(CUhPe1yy}%Vy-{Ztr%YRW(VO@Q;yKHlaA^%^k%d+U)U z%f}os`NZE;o%%2%{yr_)HOjcjm=syAF1qExv$g7yTdxQCssZ|C?t>}N8HqtJ%CEpjZ_EaLi)^^s@>!G1x}|3~jm z-%wav&4k@ql#rcPIHrh-{`sO;c0>A2n_JDGSIsun!cOZp9$)&)##`$4^M}T$Qt$YG zM8+fin56tzODQpo#t3^DrIT^?iQh-sf7CKta?vFR2R7)*uk+sYGY<9#d=QWdI2w@N z;8b4!g`Raz&pZ{N#xAjO46&0$W$Eoq(aSV#64@j9sEG8Dlvgi`Gqi|}G3)O)-)v+= zdVfd2(o0GKWqAcurI9sFb?p6d^KT*7 z&V*)mn;2ga+QFUBor!^+iH4pso^Uu}81t#fHYyR>DV#7~qim>zA<}<^^Xtv|$C}fg zlUe6zB`f>5AhYLW!C5BAbDB$Xn5%N$Yusm^hg|1-78(Td_>Dr7J}2}jFSx_16mI1? zcey9aY9qy0;%QRyUA`7imx3#NLqlR2`2pXGr?Vz^3~`2(PBw87xh-^IydrLrQEFh5 VlSD$-q-4@oQZOVE_XVc$-G42}+aLe{ delta 957 zcmZXS%TE(g6vlsdX4)y^09vhR1k`9^iz4C!m0BL6C=WqFK~#hyV=dMe>4@(T6B9SO zaW-yEOxUgs_Va>cb!`{r|Iy1sOq3em!iVkZd7cuI76>V&%bzgDxFQ)oaLPNMc=uMM=WruUp!pmV5dp67 cWx^)na_ukL3HYhWhy^MG$D2+$I0bN4SwEzGB diff --git a/bin/model/BigDealStack.class b/bin/model/BigDealStack.class new file mode 100644 index 0000000000000000000000000000000000000000..a820dd78f8686adda27f9227344758246a3b5ef1 GIT binary patch literal 8559 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 Y8LVo--Qre_0ewQX16AylXA7z{^ zO*pX0?#{e<`{vF5{(b)dxWR=Bi{NjImCTZ{C|53QLbwsHBFRL)P97HsF(B-XV#81C<2pD%%^6tc3Gb-!)@U@@pH5M8w$+glTeWOG#kWrJnoh#;v$$H*`Q#&yJT zfs9zv+Ugu1SniH_&|vLo1HWlx&-4+-#&NQ$>@K&e&m_XUk*-EY|%T4RJ zh#7&HS+C!-UD;JCYxwOpOy{t;eelGpc?>4&nt&cgAoo_YC6LJG!rKz|ijG-i1TMJN zar3FwL!M;df1owIFAyJ)mg!j?Imt>RE5nqeVlBINB!?2GGIKgE;XNK7T3*Fhlp<2o zgljtW<}r6zTRW&RMObn*E?z-kPIm|c~kkqimoWbcsA1+RBB<1?0Th;Li<|(_Jw#>ez<5R4YuVa1hl^wRDWXrj-jNQ<22X|?QKqv`YK1U?k z^=CTX!rKDFH8$rHr`6u*k21-#z?`W-YTvZ|HfaXoN&}s3k_RKwkhHU5IfowYB5Z-F zH=XvZ_1bN-A%s5qYFO+w3F%*ky2C9=coV7b+J-X z{Frop?wVY7vDU?HO4Y@^AW(UJ`nQ~f;>(oh41gsTEm85C6lnzozL#)|U%Z^SjUB$f z#a*BJecwg<{VDC^KFTB?!!91+bBdqDHVkZXQW?g|87f4|V2hqputt%$`K96u)|DO# zGQVWzL+&g>Ib~8zgV0dXu%Pj0Ldb7A;*^t&hED_sl1i>~xHCQVbHtI}8_pMkrU#}A jCcyt$JZ1>fE|FGX{;Pb;;hsD3ehSle{NzWd`tRLW8dpcA literal 0 HcmV?d00001 diff --git a/bin/model/CharityTile.class b/bin/model/CharityTile.class new file mode 100644 index 0000000000000000000000000000000000000000..c4acea3addc0f8034ee376dd641c056a8f2dd191 GIT binary patch literal 476 zcmZXRO-sW-5Qg8Wv8ie8r$!GR^i~zjMNbhg1tAbrXz6{^Ea^&`l$eVBS)K$B{s4cJ zIGY4NXb#J~@6J3kv-$jb{{V1_LlZSZZ;^&Fc1ClNseC2tkTw+P`_4*%5Mnv z(0>%q!ihx^IpaK2N#uH`Q-U#KiiIugw6Kjjq2sGW-mMma%qAkxkiMVJL_Fm-T34o# z&(#xQ;BQRfGBjT=i^7ebJYSHCEcB94z7WVGG$Wb&f^~SG@K(c$_z;V=%v?PqEeY-a zHgm@5Dx1mMV$bfMSGdqkaRTC{^jG7EH{;V}<*}=M^X&ZS4UN|#!Q#{6M4-Wm7MdI# ymuYBWmlYSFjSfR})J3nr_A#iiSM2M0`UUEafL*}s^702p*uy^G^N%SC5555?@ms$D literal 0 HcmV?d00001 diff --git a/bin/model/ChildTile.class b/bin/model/ChildTile.class new file mode 100644 index 0000000000000000000000000000000000000000..e8e1174d1e47eaa9f08aba2b34cff5746ea64d3f GIT binary patch literal 470 zcmZXR!AiqG5QhJ$v9W1wZPn_*gWjrwx#%h4r62@?3N5{Fnk8M?CMBj~AIp>A!3Xf6 z#MvZN)IBUS|IBiqp{M`hDC5n(fEY=wMtZeL+B5J zNAWCNEt1$B<(W!i&p(|ItRXWTY@pG?Ch80gR3h(|^H64E5gJG@NT)(iM5c^iiB>*S zPlRspX9kav`D#&={p-lng{jCQKZ)cEfqX(UmU$r9kM0x34JzJ)7Au)~Wn3gyJ@j~X**y64Dw%PMpHM)Ive)NW|*CN5;+u=l(IkABzTgPP@ vTG(dKMB3;u#8^A%7T6wkE9@2Prk;L)rX#q-!1`ry4I}JfpX2-~Md86WoPSv0 literal 0 HcmV?d00001 diff --git a/bin/model/DealCard.class b/bin/model/DealCard.class new file mode 100644 index 0000000000000000000000000000000000000000..adc8ef1018ee1bef4a6db5029cf8d0d6ba615b69 GIT binary patch literal 1089 zcmZuv&2G~`7@T$N{5noz;!s*b3#AY{P+z!#xTLD66cAETuF*EJ5?79m9G8kG;UzeL zM1;hF2jHO)->w6sjuXk>?B{QGW@r8D_m7_dp200aVK5fa)C=4bj|T%DPfJi4s%cNG z8T9egTTWvCed0$UgE_q9AGjOvaOR#Tu^-N!Gic*Uv`iS-nVgTV!?*n7!V9TY884zZ znemy&&=^nna()^_*Mm9nsZ)I6hko*sq2Jryce`^&KYPTW4#;#B1vGW&XfaqhbbC|* z!z~>plm)VMR8n+XM>R!vbktBLXG1^q-drs%y!aiz2*{Z^j3zu7@z@vZbyH2|{*s|N zycwEEAn_AHtKA4oO=GD|HxnuU55&mkVa&YbWHat|&)$wfoaV6(4Mm0$F$OaHLeHl7 zhERa4hZ__erWipNj@X=n+yxp0ZM!vQn0^ zQj%1Q#L!Wvr$MVvavtb9{qJZv-4#s7Qdej@mbOC2v5G6~e3kTFdhSYzI!PIHMGZ9R z-$4s^VPcQozanwkjMiPM0^O5>0__u0Wbc5C2-97%Uxq5t145cahlGU5hd5fBbg43W zr#av7=nDabjHD+4$qQjU9asx9^kC+Yc MvXe`GDi3%32VZ`(xBvhE literal 0 HcmV?d00001 diff --git a/bin/model/DealTile.class b/bin/model/DealTile.class new file mode 100644 index 0000000000000000000000000000000000000000..1cf47b28baf64709066193bdc7fcbf8e6a3d2f56 GIT binary patch literal 1842 zcmZ`(Yg5}s6g>+Dfg;`{B!s34EiDctB&pLTKxvAB)~yRPCbaa$$o2*lM#Q{WhVX5Z~al7o|S}c9{nI`wfEk0&pmhV{`2pj?*L@*n}Ifg-ilwA-prD8ybafr z22uiMyr=&K`nGEo$Mdv9A#_T60=M$9y>MZFPM~MI=E5ePv+k`2hNP=sGXTY7`SR@E|=aENM%XWL_7K{+<;|ZKw$Vf8YcQN zq=RUm7=cOc7l$*)vh&k0>$+10=&!%A(|HoFUT6*@<@ z)Irm>t7%I>Z_v<;u z3gvp>S6M(^;Ql3@S{jh0w$#nU44xQxEMUd`juo}=6rV5`RbO$Hqe^acrsL8D#wODV z)K%-8foF`2(bf)?EWhGFEZ4MfCO*Rp1J5rElV)OJ7Ca7J%(vl&`XCK6MYEmB0oU=L zTUfvs0tS7vel3g+Z%$jjw6Lfxy|gU(hicua>rQFYl7(e$8qh&bZFj}<53{=*9a75R zD=qEU0=KV`Hkad6nfL~I1K-jmuIp;q7QVwO&ndgm)PM9`|4TYhc#dJ?C@$NcRc%8Pd+{vK^+rL%1^aB@umz!*2&Ycq8%M!#_z+?SJ>d)YvI{ z&(Obhios*tJi`cAcaAao2hD95<9iS(zIzDU%Ui1tqkO-|9Xp1=J-p99f^kO^(W`ML zZR7d_e3+!n(7TN`^9&PPgCCzF{TKh@44qMw9ieK9ntqHbFpY-^!tZ3zLEFUC2_CJU zA+t4of=~I(^Lfc9dy19W)WbWe6XY(_f6UM)1bs?EnJ7^v25Zotz#7)0ofgkW=Lg*#Gx}+`=nm@)?Gp8;dc+RL7QLbCDUn5snlz~SJKQ{z= a#t0oHnlQ003oQ_$0U;8)0>4Cozy1g3Z>bXi literal 0 HcmV?d00001 diff --git a/bin/model/Die.class b/bin/model/Die.class new file mode 100644 index 0000000000000000000000000000000000000000..3884acdc0ea59f435994f97f2479919a24b61f02 GIT binary patch literal 638 zcmZuu(M}UV6g{_Hy4z);1+>;GDgvejlcI^3CivuZ8DU_$YnCnXSNI2C ze1Sw0KfrG?#xtcLi9YPTXJ+m_=bpPie}DS{U;|Hllmyjbwy$lxZL|+hP(MP&!8-}Q(8sZij zK5h%<{^^Wx2TegVxFqT;JE8_1ymzgw2={Pb;HUa?(M@U6Yj-P3SUAJ1_p~0J@F31ndzj=V*B5CvnZ8k%lFXkeKubb=e4kE9bphZgaGk^%EWJfedpza=~--|`Iv QR>&{3eDVoa$Wg-TAKBk@zW@LL literal 0 HcmV?d00001 diff --git a/bin/model/DoodadCard.class b/bin/model/DoodadCard.class new file mode 100644 index 0000000000000000000000000000000000000000..8e23482787e8becfb58c7d537386959e55cca92c GIT binary patch literal 484 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 literal 0 HcmV?d00001 diff --git a/bin/model/DoodadTile.class b/bin/model/DoodadTile.class new file mode 100644 index 0000000000000000000000000000000000000000..916410a6c71cb3395a9779230dc18b0f4a51c994 GIT binary patch literal 581 zcmZWm%TB^j5IqBxN~t`xzEEKYn#e|17&jUdl15D+7+2;(8?2Vr)ME6rj0+M?`~W}7 zIQK$C!=g7c=gc|t=-2oACx8P~btDM+Vd%Ji<1`E%;dDIT)u9oL2`Y1fdE+Ry9gF@w zp=AG+D6mOL9eIHl9}}#aeJ7qo!xzDz(T*c87&Ke;EC@cawmEqWdFnL(+)>b-#t^u z%grvkFMFcO3nlpnaGl(WqXfr%5Ps8~T`?>9!tP#q4C4dl^%&VV6kb(niQlX$Fj$;H zp6|8HSY;x@3M|f8j#aF&rHt0Gp_*)>JZ*Bwc!EEgnWj{+rOd1e`D;el!Z!1S9VM*% E0Ihd%iU0rr literal 0 HcmV?d00001 diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class new file mode 100644 index 0000000000000000000000000000000000000000..ffcc68917ebdb477bef9e547d06cd16aac4be48d GIT binary patch literal 4448 zcma)9d3;n?75?5NVUo#BLIZ_DidIBThC*uHiV0~UEKLn05DW!chc}Z)=D}oUc=Lu3 ziqvW;U686(+ky(ERoaRcEEDJgwRY3E@78_Ss{i|+_?>&-OeTT$*I#~f&wcludzSB> z`<<7u|2=&Uz)-V0Bpt$J}%xGsLHGEXNn# zh*(;?TohNNGQ$>XV$RO2lg>Fg3sYjgy;COBV@YmWmGS&Rd(i2%MwxzNo=!F7eLS_kIcR{<~eq1c}{?|aA~)OFz>sm)+L^2k94~^ zpISA2?qJ&X^B#2;UQDMwFxxYnb_Uj#EVgxMfK#p=cT=wK3QBboP?GS+;o<9=A~2j2 zq!J{{oH((pj}2wgelj)E7aU7{EX#D=9ZpwpVk+imd^=TqtT&J400tI1ONSYbCGFgL zDG+NTkF(uPyM713XuhyqTKX+icCrW~sK5e+7A&+-(cIEs0}EFvRAGwDu2!f)b%b^M z{xIIh%A8zx3Ln5VOm@)mivknDi>|Lj@M0Qql=Q=4nQS4Nx zGq0B`tdQ6Bd|g(EqIA7Ny-~VB;X|S{RlJv%rl_q_XfSF$3caFMM>Q5@P^_Y}R$;2q zS*P&fqN&c(S+RUYZN0)JMs0(_Mp3J!sh*&qMdK!gMx*f&g_vka;KlOpbv#kB6{Z;& z5(?AJ%u%@1Y#dZb%EpK!W6E7NZB>|IR8tBwaakBV-f0)9?g)mkKz3|bn1$Ig%PGt; z#`6k0ig6d=6pft>h=;o7pE7=9$^O3hywpPb<9B%(n@5Ur!0hoNN2tdXGU-q z&xLW0wvBfUm%=y2ouWG)SzprjoSbNWOW}nQuCm(exd|eE0xv1NEN_G=^df`u91S~* zAYrGM=GoUOo4Z;zN|Ak6A&hDZRar5>ZA?IWW*qVS2zw?wkIx;mi@Z1qmA00Car*R*rCP>w$o#AnB)$|>NQPtelB|gsLH^RKH z%ItRvzZY+E{pA>X@;uKPHbjFEU*t-lFn{UbMkVK@`1zoFVl~6joD>mvC0Na^q%Rc%2psD!lN-iJv}m z5R$IKSxC-DOZFBm*(bDQm(Y?uLQ6ISEy?#?O(vnoAC5ei%o<3R- z`_h&2bq9WMxYMZqzDZTl5(WZ8(ig0a=wDF zfZIfVqJTT1(NkDdz@4Iew+#DbI3UBPWcUo@|LjSf=KUP^ur~l#qmthUHT)Q;$2DwN ziwJHzd%|J@(SfUQEmyDO-x6GprR>I?xDm^6Ggczbm96MP1~*_AR^e8x#y<4mUTWQs zH8_lQIL6+59Q`8JBWGCqp0sIk0Xz|?< zogZ^-+brmFvXsA-n>lpLuttV{88*ovzj%_Wi=)v|e1X5ivgC4QKsFEaw_8?jli?07 zdr<;(RIua1o&4R+#r^WISYV{w&)Jm z;*;Rafr~9{=7U5&iF^2T7%7c{GWi84e3^TR%YShw4C_1}EJ}np2rleX1{dNSA~HZr zMLQ$Oj^Zn;k74?Pr|`H%j8Cj;x^fiX*xb&Af`x*fh<{o%>GwHwhM(N+q5ce{z zeN2BZ)4c0-(tqVmr~hqyCkU>KwuLfO6Z0KAimJ-v72_F8g#!n)KXU_A=>{l#Px}*) znX`Pid>>~5vmKPOwN_Ak`Jz_uE5on$Li~P!9|pEI(Y%D%6y3lONg+RCVUN*pmh+#k zpU4%By3!uti9g8NJV+8gR2F?xDf%Y-k|iQR{tB-Kj&`%yq)z9N&(3aWy8JYLE##)l z;kO;y`y5`hv56i{i5{lMBmB;Oh+K7)Uz-nWuTf*Kz{~Xl|h~{RG22$@}yqfjw1bdS+lcD1=64^4C)FxAI8}p^84nq_9Go zcuZlPDYH^l3h;0EJGZc(@!vC3oRMhL1+bgTc$Pa|Ilz-_$OWq VY?cSqdSX&QFI+UBe`&3M{~sc3$rJzp literal 0 HcmV?d00001 diff --git a/bin/model/GameBoard.class b/bin/model/GameBoard.class new file mode 100644 index 0000000000000000000000000000000000000000..7a1eefb39f962105a748fd39446258b6a39e55a1 GIT binary patch literal 2215 zcma)7TUQfT6#hv7+XNBg4nbO*eE65=pi#gbVzVA2(-2KVs8)q z0e$RKU;5C}8rG`I{(%05{*tb)+V7kRH}OFpGH36zFW>(5-iN>b`{Pdlz4*>RK%j2E zXxUEpWjSwOEK1ih5E9sRPd=30jx5Y}kI&q*bDltCdciH;EeY%%^*tsi+NDyySSa5k?L_ibx5U-D=f@OlKyEmm50N?n{*KfMCcft-^s##0}TSTe)3^kIx0gHdjzVKbVP|U)T7D7UhE^Hfl7#`#OP)@8PClZX8Y60 z$tno!H&KOH6bEQNTr67BQrbf%s+IN#6RXfl*J8p{x;6o0XimC$Z$+s)Ow=Go7FnV_ zwm3gyyVvB5V+%Bl7IV^>q@|MAm5H0{>^XA9cKef)F$B@2AlDfORN+!&6bOXWIg zB8-RuQgy($dNs!}^!N^EOc;n7I4cm_bWqoCndk#~k4no@LD;ul8_<+O154qYi9sak zPP++>n3f@LF3(SWrIL-wVLW4D-Kg%RLN$bkwjYG-B)0RAPNriR!8-;nb2us-=vXGw zcvql$*7g*m9_LL@1?_tEs{mhWA-vLwQ20ddU2dk2Rdo8esMmu&Oin|>93Atj)l^Eu5&p>|L>ifH5 z;yxT2+7A|`!@f6eT_^u_=uh5IWED&lRj+DTn0`yr1-IU3a!jcT<(>ubyd^HzM+ z)DZrHER}4_Cx)N}S&0_dC_iLP#*?}GSL8xvr)yd5mbXw5wBF4vYA#1CQ(Sa&_J~eW zyRkMWRAV?{=|aJFha8ogNkb|bnz{BtKGqQg)b8^XP%F)EOg&us%cn|z`8??_-y?oQ zw5mlN{dZB4l-1vvXQ<+G>@i)Y^@J2`r2eoiGtc7MRv_`bh{wo~=ILhA!9j1m) zUM==B_)!K==v&}(K4Hm9y6*`#K>el8HFS19!?EldPCP|7k3Bq|ev01C-_dJ4M=Bd! zMLd%Yt>R!N8(u|oCL38rd!~#xdC^tIz-IdWnt|N}(a7XYgs>Oqun)tCYZy&_Qk=)z zOwRPUfQy7AFhm>8gt$s*RlHkb=u3kN#lbS(>kCy*<9*?Hm{*x#DiTZ?KcOuiD&vE` zXgpfR?J{J8UB>JWh&+jic(gC{#1M_ffgfM|t;}wRo?|2%>>~JqF0CkIzKjKZWKgd$ z@-tHhHJ5`d0c>y>Ej+cdgf<*TJEaa5lR!7wJdZ9GaGVR&fpKc4agxi}0}rQk!MFTU zHVR(C5|&vg%fkvjA{}Aw-N!rynPU#0;1S7-;|@OMkf_Yp@tC&}=Iz91JQ>Wgm%V(% z@%e&rS`d7}RQx9*42%f=Oc_WCruY|e3jfeo;7dI5>7}=#8wiun?q7KD2S*tJXEkWk XH>iLP;45wQHNN3D#=9vN_$|c$`(^1h literal 0 HcmV?d00001 diff --git a/bin/model/MarketCard.class b/bin/model/MarketCard.class new file mode 100644 index 0000000000000000000000000000000000000000..10982d5b30eb6ec1c99eb04f0d92f524b42f5c01 GIT binary patch literal 1029 zcma)4O>fgc5Ph52ahtgLXlqJKfEEhaP9Ya=ph~C+sZ!w5D%WTmTVcUkAksB)*C=8a8TZ3OEJ#d;N8gY8xghjJ9o98Mj)$OvoKE1duz72_d9Sef z5gyZZ?8zdt^O+Kh%=?ASPYRiLmYEL=n_YN0bBD-yBynSTHm|$TDE`jtr`kGy0E+Ra A2><{9 literal 0 HcmV?d00001 diff --git a/bin/model/MarketStack.class b/bin/model/MarketStack.class new file mode 100644 index 0000000000000000000000000000000000000000..6c75bff46a59f2bc9f99e0390e78540fcc41c8c5 GIT binary patch literal 11194 zcmeHN3v?9K8UF4DO$ehTi{cxH8Z?0<4;1=Omw*7_=~Rjc*Ysy5S}iC{X5^ zu4SYanyzO#_JZak1;o(;yG(a%FKgJ@g+?l8?!=bmKOs;uqc>yPo*5H}whZhWjFmQJLy;1#qjIUfSkNB+CWYTm8>g=3& z(*Qis2jU#nmNFbx*@h@$kcz?4lx@A*CE!@f+sq!*)mtpv)TgKYwAW;?{jjlo^hRw>1O-J>T``gy&_guSEnZ(S2uLq?9n~dAV*>9 zl@9-8t+ZKHtIs#OP2I_5S*pXZyY-Y~*t(TumAL77hTErS9X;-_H$B^BdZum$hU(So z!7h+&=|(1#vP@5R?3Aj&qB_UoIkw)@<>(2Q1F*8SdUH|^Rd;%9eNL;+d8Krd`yp#q z>m=3TWU^hHT)ySn63_^W!%j;uMF6FUVXB6&gKX|RHKetrGFXa~VRv$=T+8lk{9lmf zZ3|T`91ejaG-Ap>)+GT)YS1JBM+xjZ-?Ztp^dpV5(aB|Qm*zG%G`AAW z5@JzU!ZnjQk0od{85*HWCseC9C8g0yo5%+3bQzxBVVX9r*otS(M76StgyjW>=Ft|c zq!pK4CRCTQy+JlkQ?k9BYuIr!uue};J6@I@W(>>qs`U<LhIBrKFT)Lqhjq$k}MoOON3G6=0p+W1@a(y)68ogoK zyovSGno2NV;DrG6Ov8#0YmSS)oOM1{qX|ZbzG~{vgz{T(o!?2oTta? z#?|UGq$`&$IZXrgOq#1<_vv;n-N7!MWWQgR{*|s?ImnD_#o2o3PGy~HW!_FQsrH#` zrsz}?+!JoLlUtT8CiG5gxvA$eszBWEy7Xkq>7mQ+Z!-9L(Bty^G@KhLI75`+IJ#L* zi?fn8xL8A(4%L96blanMZ*RZ=JsaN2mAtI$f&E;ebqa_pH8bb3ZP%2KAjvox+UMWn^QG)AvE|!OW$;*uz z^dKsAvxc#fp<9R0U<&vva=V7FNjiQwgmlCT*PYy@;Q&d8FEA#Er7(p~ zIQo&mTZ}F11_MP5Wih#t&?_dX-4JFn`ol+qTdED4l5u5*nJtFRm|;lr*Qgz5_^AL- zlj|8k>QYlI0`7c5Zm9b-R7j#8_$(3*{_>H)iGT8rocKc;#>t8Qgb~GjfMGz~wFEyE zA{Km_6=$AaQ6CV(Af<{l1m?jAg$g^Uki?cyg$l(oH6SnDlQ3pO2a{tz+VV4cHWHU`GJq3F$SkOneqGr#u%#)jg|h8ae5kMVByk<#f^-` z@VK6IowSPAdqzsSL|U*z2gjW57VBo%O@^up&c{i@eyO2S686m2giTW4tFH*7hw0DS z*U}$ebA)8=ISo}9!CNIV`#(pef#w?>DPA{-wm5NKDlvGqgwF~rMG;<<$?%D#too9M zm+^|guFQ-koHSjXOwW6~Wl*^!yqTablvFJ&#cTL|F@DEa`6~`hu50vp8eYd6(sOt% zmd8-&IM!8VRBpYsW2qU>HdY0Yx)~vhH5TI!9CE%bbzPzqZ{kJy=T92m#yhgnM4~Ch zu=-wMzFsvj-ASd`C?m&>Rf{DBf7UP_6L{K`*)D-mgKkyyU&I)hzpkMM&T{>e%wHhj z<%?k{HI1^ZN6g{o%c({MMh|AVFB7mVP_b3*&$;MP+Q!s)+&s#X%T*RMubQrv%r|2+K}p&;WkfDCd8k%;jpCvf6N%IT!&WJN5IOAu#M+|` z(aF(6%8TBK9<~9E_u%jlY$90vObAX_;Ed=@g5v!UZ2m0pm=K&ju+3Hl9vf|oE-163 zi&Q`D3R@CAL18B<%m~ZHiS>r%%&=Ui!h&*ESgxCx7nVya%!w{j?Rl!bT!{4$v!Vgk z7h|aAgQyL~xECf~!LCQi7w- z3&GV2bfQ-fB;i5lYeMiUg1Nd7ygCHGOOU+>CD(=EwLzQLsX5*-xXl2(DFkm}Ne(Fh zZwtXY2y*ZNc&7sIj@}c!H@YDj(7Q3j?kD!+5PMKz4@Vz~K3ZUH~&uapeOb<<9+_0KKq#B;! zClIZr@lHfN{~kvDaNbv%!KayMz#QuHd7W@ECgXSR3AhkK~shc-OSRv*CvJWhQR7UDT9!f$XKUZMU5 z+Ua~3<6SJlX6hfX=Z|p$K4GH1hW?wQ^fXq8O*mCNPyJ<_CSGT%%kug{q(Q#qqK*Gm^{d{bq7~|vFwwCb| z*5kJmHsaOU58%!A4R~u#P4#;Ganbmid-1N^7)9X5z!ct0;sJ()tfODQmfPbxbm4m3 zOLKh`H{w;|ui+*h1#YG>-aoZ$;xG6spI&1K@^AP%iGG_Y>dp8E i$=}Q`<9pm*MffL6j3yGi``4CtHGC)VKHo<0!G8fSW6A9R literal 0 HcmV?d00001 diff --git a/bin/model/MarketTile.class b/bin/model/MarketTile.class new file mode 100644 index 0000000000000000000000000000000000000000..80040574f1700457729c531ee875df03efd9fa23 GIT binary patch literal 351 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 literal 0 HcmV?d00001 diff --git a/bin/model/Stock.class b/bin/model/Stock.class new file mode 100644 index 0000000000000000000000000000000000000000..605e025a08d7c1f1be7c63ea31af813d17423fb1 GIT binary patch literal 740 zcmZ8d$xh=y6s&gaBzR#$ScVxG2E-+BAQw2XT#%3=MSzr1G&kgUTG)^{lHr7rv@xAm|_@)=FKFj>k;E&SA^0!vuVsJ58Z z8S@U)H_QelB0D{=S=`Bc#v<@5$L?@jVI70uaPtAR@GHeifx^itR&t7FcHUCxui*6p L*vi4bwaV3Zz8q?6 literal 0 HcmV?d00001 diff --git a/bin/model/Tile.class b/bin/model/Tile.class new file mode 100644 index 0000000000000000000000000000000000000000..b7a9114e86d15842c253f0e786bcfce1876999cc GIT binary patch literal 1243 zcmZuvT~E_c7=F&yQ79c_8$&=)fuZ|Ah6wlpArTW3k^v?o5cGm{TQiGWM@mQJ(!?wO zg;(Bqp^0GP1wX*w;%^Y2(=Ph}(&Y5?ocDdc-v0Ub`vSlso~Z~3XtjFTtmbyCs;NQ| z7(6sij9k^QE4l6Bp;>YTLI<`{GX-M#_FchsEW5HI(0@>@8%}w{E}I_&#D+lc!BN#X zHJxLDgx}F{t!nOt;~1xT>)2&eU%{%_hTCw6I&)LaYTlRi+Cy4dV^7bjWn1o=z;Noi zj*axLfbx=7Gz1aV5k^cPm`d;VL10Kn2t9H)tV2bwKqPP3=2oLtG@TuzSoO@+OGb6q za4h-VJXG9w7H#NFH8LbBQT#ZxPUGQ<>8^JKL25>!@^s6~ZYY($uA1qwAa5|c^0qAy zO?BIrro@rJK=(0+W|Yf*G*lN$z3smDO{aA9LDP`Itct8a+#6o^D0Do;9CIQZht-*@ zKl_#R8=7d1GjfGUAY5>b()&&0$O}xxJi~I#TK&ZIPPHMv>2NdM58AL$Ni@SiFmiML=-u8QYop+?h0M`gl_E{(UBAH(p%w*3H&y1fT z@xv>=#WenK)-7jbY3fv`yud%Z^{{2ex$c@dDm})jJdG&y3Tk=`&c#XqU!poKofoUZ9 z{Sh;`--P(g8kuM^yZ=0Nv8)8wzG7%JG_kNrHxFjdk>2|h6cY*M%jI9m67;mIkPt+Q6D*QAW>ITrWY Z9yRYKL(FW4Pp!qOHGK*^AwmF8{{yU^*>3;< literal 0 HcmV?d00001 diff --git a/bin/model/TileCircularLinkedList$Node.class b/bin/model/TileCircularLinkedList$Node.class new file mode 100644 index 0000000000000000000000000000000000000000..64dfb0fe95c1b08c36a11f9714d04a1ffbfb14c3 GIT binary patch literal 789 zcmaJ<%TB^T6g^Xr3Ra5m_Zt(y2QJ)c++a+M1Q!za15B`5OVSqOXKA7_ap4E}QN}aH z1bo0^rZe~4bMCow`|~xq#moAQYJ>uU%PRNiM*?wAJute}7abtV?iI9OA?&$~~B{|7+3bTyO5(8|^Y2oNJ&r${@7qIv( zT;x{}8!0?v>5+%7Tp|iuk&O1BU3O&zRbzmR9eWxtfBn zYJF)cs0B`Mn?_#YXy$cshO$hO=HZ%Q6%<;gtddnbqu`B=UgPQvcZ2YvT}KdYtzb?a zezeFetV2UUW}P}(5l{#bpPAh#u9}sr#%h5$!kKc;C|oltmVCR5zS?c8s?h&hV8qmJ z!1e?3NXso+z^#+UCQa(tv;yQY8NFhRZ&6+6;=PKo*&9N0@ zNNG5>%iHDqRfg8_HjdMn@&-|KWo+xMa_Vx$Dp8+`X%y1|OfbKcN7SlDXN&8#`$4>e zQyNY(-79YBco&lj+PVZOkV99@32fICqgtgk>ddTbCbN#j7Dk(R@0IVrYVup9ym?Qd zl?;n!sdnBrZ`b9tXnRh_c??lL?)z;J0bFRJKtUY}b2_Fmso{Nv13N|U0G!^i3VE{< zz(od%1~HF}m^~Rp7MC?FDFk;)M8_3;K*r>gHHtK{Gd8-HvIM!R<3o^oi?P0Lme@!v zotIOm_uh5Uq$R|49V?P8P%Ar7#f_UHdYc1b*=|<$8rwC%I+0#yXY7yNY?7G2^K@9CdzW;o%JEj6cP`xc3P{arFcpGDLpix(8hxyBSMj`Vis$ zPPB71!tZXb>dt)}z(IZ~X$&{^A3X2l+NEdcU5O{2qHi(2h0sGBj3*@rhe(nu9ZwM5 zM4!yE$uWL7+gpgZoADK1^W7pif#kIzjoa{hNaYYZScly>%&`wg(T@=vK>|^B+W_4f z#5oM%B8F|aaR-tMm*99~h=7AE<6#Qq;ms~a2r$oE%+?Ce3yf&!?cpK1=W=_*FrxF6 z!>BEusAF^!sa;efWN4ESBCjJe!Zg4ror;rI0wE-+;~3!|Ba{@5lS&%nHi4*ak#0+(cWFKo%dU z?OtF0;r8Fj$2{dY&L^DnvmDRSt!d_;Vg3uuGfP`$==Xe+K!Xi|28pYMc|$DO9fA0l z7<>VZ#%kPq4`*Ct-?_+!--v7rXI}<)iQqB>mu0dgg1bx*R|sy2;Fg=f4L86IH^6oO zFSzN3hd+t06k%S(%7}E|!!~lJj@eBl>FG1fuY?z#;!=Y6>R7B}xsH#x&F^R?As2t# z{*wpmxUthsP61wLo3F3{Z?MI065=PAz^8Qh78PH`9C9{=ZU=%(!A~coThvas9H6K% zE_}=Yj@>E#O6~at^3R+&&x*JLtTk1Q-;Me;^M2-D{)VUJA&VwfPWzvq^m)&0Vt>3egS`1C#ynE3u(tiaa*)EZ3ma*HOj{fE zc0BBrAQJ_uKiKO>sKagI`7GEaKB>qZr0)hdhB*iK97jUFt zB|+JfqZwaL#~%lt+SRcJnYn;laW*{JG2XxrS>~RK4*kB1$9O_@hE!UhT>JdbGo6T8 z9<*Zh+}FmaV0$3LP=%;~)N?GdVHP;3C#`GTJ?AR8E^eN~IZfOyXD12E!lHA9wmS{N zb!2F+^v2HQAMsopmY;v{OKMibg=P)oXi{D>; C?5FYo literal 0 HcmV?d00001 diff --git a/bin/view/MainWindow.class b/bin/view/MainWindow.class new file mode 100644 index 0000000000000000000000000000000000000000..2f9e5fe9b8c1f4e41fccb78795c937becc40f481 GIT binary patch literal 1461 zcmZuxYje|95Ixs%tXPp_oA4^o;y?iTQRMJysVTHENo(p5Am9M~(7CZMt`bMeNOD5^ ztJ;~?>5v(IK)-hScRD>+cFC*OSbOi@y}M`6?&{Bf-n|EK3#$ea0@-a>?Kn%)^;TW4 zpIJ8>#7|IjK2xwrV=>W)Msy3ZA#hHA=41p;U61M#2rJx{LnRE!|obUpRBzqzJ@=UORnqUpC~ zuO$Ol??=j{47wo${!bnz#*i@~aKXaI8my_Yy0Yi~OmE5PN0%4#%_I5M49qaran?)} zkV(_stc7u;^!BQSYp}_GsG^0pk@7mKvl1~gy0;sekOE2;%G%~EZ62yOvfqp9JwH^- zTPl!|>wDVhQw!JO5Fw3PZs^AOChgb7mVvpWXr4$<^-NTeF>p&@>I2txzvl-gZsLxv z&S$KS-Dt!xs<><63$XARMwplFjc(xgy$*>R6+qW2zEAQsqAxAn#{+urs;KUJ%q`M! zb;}foB^%!GA~uo=Y9_u$-N5_^taIqp!b2>uM`VW)ONSzEZuuU4*A6-TPpOmq#=^H~ z2&4(TDSz_&Z0_?1Tnu$f(vw}n(BP~1&O#GQ!#ndjPZrwHT#U%5b3V2-i^t|8=9V-W z@$nDjenPg}Dhy|<0@v(g%`$|2Y`n}BzaO;KqO1EhyFabhb*%)fhDXloJsE~7#0-0C zj3X|P(2d1a5@{HipeD`TUFrqpi#-0?#q9w;*CqqpD-ZD1YFP}hII>-; zh?Y`^XwsW7uKOZ4UK+leuB7gE<#ADgyI? zHtN-6)K|&DG{XzxP)0qO=-j`!w6a5;3M>WJ744EcnHU=$h5Z|LP{Ull)m`{l7I0FP z^>nHWaaQv~tLLDBTQ*h&7B36f{}QTkreovcb|G_|Xp?m_8Gb%UWXQtGpAtEu^{z>x zAi+RA_zxXp)qV?kRwQ!}`kMn$XXy1fUoN6=dsO&HvxOjkv?Bs}J z5%8NIue{UED08@*ciMevj7s(*nWiemI@l$yGN)VOV(;nQ;OPmipe;W-hjUtlUG7c+ z^I$PprSDEbxQTgs6#AFoE0H;+{{yx6=U5E3turirLnYWg!^&xqS0%nd0Xef@h^RB) zC-X9Avw}KSi&xf($r006Dn#DFT{6_DW34D+gK_?wZ)`Lyf;Z`wa1UFw7Gd|%&~z%n)!Bp5O^Thz@Gx82vaTk+~k3Q`Q& z_q@hGnnB%mkIW}KKCcRf-b2p~g&RKSE?L9YKQYqjtTLpk1jR6_ziHi@4kv`Y&?lhP zLYeN1UPUPAr5YD2PcNxZ(Wjvw0}S13wrhv$3`xCERxyYn1zCn6S=HqA(A=&Omlu(U zgoa^^5I@_kc^`zuL*X-w=^X@KMy|^b9MPgMVA-yC8dVR3|4KTEisc=0r_6m@+HGfw z`$qv4{Le#FB+;jWVN$~tOfifHBHR*hdE|se#|y->W8w4A_DG48zAO1NT+?tJIfgXF zZhDbhA#g?CrBx^^n7$}_OHdVg^rb0zPD2;E6%-hzI(0wr{EG0+?doxOve`PT&~Za* zn3KsjH7vk9D=K3NAXetAy={m%n*>s@#4z$#=GbrX6E6x?EaJArUS{Yb>hfWE+|_Uo z_v0FI9K%Fgec7nkSK=-|5Vm#2WiZzCQ5~J8TR%dOKiSmM`sg*=RhVN{WENfky z8=5+G&x`y+v17|_W;&*MLB4}Q+jR-1=)?w z_nt!CZ$kTq%;#3nD1BAB1hTYGVvJ5&9Ex#VB8y&xfi}!1f|M{NqlwE#cLNhfrjn@) zvY&%&zJaU8De?qA^A)qk7tEeQ-|wN-gweo!>{;ATCY!j`z#T(68dy0ek|VyLx1^9G p)_Ec`O{W?9vuCk|Iao9Z=LAc5h;@ojV59YYgvYeYR;aYo`U8uO?A-tW literal 0 HcmV?d00001 diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java index 1e95398..a0546fe 100644 --- a/src/controller/Cashflow.java +++ b/src/controller/Cashflow.java @@ -20,10 +20,6 @@ public class Cashflow } - - - - public void go() { // Joe @@ -73,8 +69,8 @@ public class Cashflow private static void testGamePlay() { Player p = new Player(); - p.getFinancialStatement().getProfession().getName(); - //GameBoard g = new GameBoard(); + System.out.println(p.getFinancialStatement().getProfession().getName()); + GameBoard g = new GameBoard(); } diff --git a/src/model/CharityTile.java b/src/model/CharityTile.java index b076885..8400994 100644 --- a/src/model/CharityTile.java +++ b/src/model/CharityTile.java @@ -8,4 +8,17 @@ public class CharityTile extends Tile super(type, boardIndex); } + + @Override + public void getLandedOn(Player p) + { + // TODO + // Ask players if they want to donate to charity (returns boolean) + // If true: + // Set players charity coutner to 3 + // Take money from them (check board for deets) + // else: + // Nothin + } + } diff --git a/src/model/ChildTile.java b/src/model/ChildTile.java index 3ffe644..434fbff 100644 --- a/src/model/ChildTile.java +++ b/src/model/ChildTile.java @@ -7,4 +7,11 @@ public class ChildTile extends Tile super(type, boardIndex); } + + @Override + public void getLandedOn(Player p) + { + // Increment child counter using addChild() method in financial statement + } + } diff --git a/src/model/DealTile.java b/src/model/DealTile.java index bb3ce60..ea1cf92 100644 --- a/src/model/DealTile.java +++ b/src/model/DealTile.java @@ -1,5 +1,7 @@ package model; +import java.util.Scanner; + public class DealTile extends Tile { private static SmallDealStack _smallDealStack; @@ -14,12 +16,28 @@ public class DealTile extends Tile } @Override - public void getLandedOn() + public void getLandedOn(Player p) { // TODO + // For now, using a scanner to interact with user until GUI is ready: // Ask user to decide big/small deal: + Scanner s = new Scanner(System.in); + System.out.println("You landed on a deal tile. Enter 0 for small deal or 1 for big deal"); + String input = s.next(); + // Pick card from big/small deal stack: + Card c; + if(input.equals("1")) + { + c = _smallDealStack.pickCard() + } + else + { + c = _smallDealStack.pickCard(); + } + // If stock, update price, then ask user if they want to buy and ask everyone if they want to sell: + if(c.getTitle().equals(anObject)) // If property, ask user if they want to do it (and check if they can afford the down payment): // If yes, call ButIncomeProperty method: // Else, do nothing: @@ -43,6 +61,4 @@ public class DealTile extends Tile } - - } diff --git a/src/model/DoodadTile.java b/src/model/DoodadTile.java index ece68a2..314d14a 100644 --- a/src/model/DoodadTile.java +++ b/src/model/DoodadTile.java @@ -2,8 +2,22 @@ package model; public class DoodadTile extends Tile { + private static DoodadStack _doodadStack; + + public DoodadTile(String name, int boardIndex) { super(name, boardIndex); + _doodadStack = new DoodadStack(); + } + + @Override + public void getLandedOn(Player p) + { + // Pop next card + // Get cash out from card + // Check if player has enough money to pay in full + // If yes: Take cash from player + // Otherwise set players cash balance to 0 } } diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java index caf2de0..4a718dd 100644 --- a/src/model/FinancialStatement.java +++ b/src/model/FinancialStatement.java @@ -103,6 +103,8 @@ public class FinancialStatement _totalExpenses = _expenses; _monthlyCashFlow = _totalIncome - _totalExpenses; _hasWon = _passiveIncome > _totalExpenses; + + // TODO add method to update display if its currently being displayed } private int getPassiveIncome() diff --git a/src/model/GameBoard.java b/src/model/GameBoard.java index 0f15b49..297e530 100644 --- a/src/model/GameBoard.java +++ b/src/model/GameBoard.java @@ -46,10 +46,11 @@ public class GameBoard } currentNode.getData().addPlayers(p); p.setLocation(currentNode.getData().getBoardIndex()); + currentNode.getData().getLandedOn(p); return passedPaydays; } - public void getProfessions() + public Professions getProfessions() { return _profs; } diff --git a/src/model/Player.java b/src/model/Player.java index d8ce3c4..8fd7f8a 100644 --- a/src/model/Player.java +++ b/src/model/Player.java @@ -4,12 +4,14 @@ public class Player { private FinancialStatement _fs; private int _charityCount; //charity counter - private int _downsizeCount; //downsize counter + private int _downsizeCount; //down size counter private int _location; private boolean _hasWon; - public Player() { - + public Player() + { + Professions p = new Professions(); + _fs = new FinancialStatement(p.getProfession()); _charityCount = 0; _downsizeCount = 0; _location = 0; @@ -17,7 +19,8 @@ public class Player } - public boolean hasWon() { + public boolean hasWon() + { return _hasWon; } @@ -26,16 +29,19 @@ public class Player return _fs; } - public boolean donateCharity() { + public boolean donateCharity() + { // return false; } - public void setLocation(int i) { + public void setLocation(int i) + { _location = i; } - public int getLocation() { + public int getLocation() + { return this._location; } diff --git a/src/model/Professions.java b/src/model/Professions.java index f60eec2..a3c1cb1 100644 --- a/src/model/Professions.java +++ b/src/model/Professions.java @@ -36,7 +36,7 @@ public class Professions private static Profession Mechanic = new Profession("Mechanic", 2000, 400, 300, 0, 100, 100, 400, 0, 0, 100, 700, 31000, 0, 3000, 3000); - private static Profession Janitor = new Profession("Janitor", 1600, 300, 200, 0, 100, 100, 300, 0, 0, 100, + private static final Profession Janitor = new Profession("Janitor", 1600, 300, 200, 0, 100, 100, 300, 0, 0, 100, 600, 20000, 0, 4000, 3000); private static Profession[] profs = {Nurse, Teacher, TruckDriver, Secretary, Engineer, BusinessManager, @@ -44,11 +44,7 @@ public class Professions public Profession playerProf; - public Professions() - { - - } - + public Professions() {} public Profession getProfession() { diff --git a/src/model/Tile.java b/src/model/Tile.java index 906ad54..dac00d1 100644 --- a/src/model/Tile.java +++ b/src/model/Tile.java @@ -24,7 +24,7 @@ public class Tile return _name; } - public void getLandedOn() + public void getLandedOn(Player p) { }