From f97939a02b6509a13107e992533df62a6b783f2b Mon Sep 17 00:00:00 2001 From: afortuna2016 Date: Thu, 6 Apr 2017 16:37:20 -0400 Subject: [PATCH] tilesssss, had to change a few ints to doubles and added/changed a bunch of getters and setters, i dont't think i changed anything that affected the rest of the game though --- bin/model/CardStack.class | Bin 1828 -> 1828 bytes bin/model/CharityTile.class | Bin 476 -> 879 bytes bin/model/ChildTile.class | Bin 470 -> 621 bytes bin/model/DoodadTile.class | Bin 581 -> 1047 bytes bin/model/FinancialStatement.class | Bin 4448 -> 4557 bytes bin/model/Player.class | Bin 1490 -> 1737 bytes src/model/CardStack.java | 1 + src/model/CharityTile.java | 18 +++++++++++++----- src/model/ChildTile.java | 3 ++- src/model/DoodadTile.java | 13 ++++++++++++- src/model/FinancialStatement.java | 7 ++++++- src/model/Player.java | 14 +++++++++++--- 12 files changed, 45 insertions(+), 11 deletions(-) diff --git a/bin/model/CardStack.class b/bin/model/CardStack.class index b0b95d2045e0a8035b7a34e43e82dc89b0d7ba80..ce4fd7a0d792cf851c17bfef2ef0bad2658d84b9 100644 GIT binary patch delta 108 zcmZ3&w}fwlAPc7m0}F#F11E#nWGNPRPH6@%1{nr^2HDA3EK$5l3>*x~3_=Vl4B`x` zlP|KkF=|bgV6|b?pB&0MP1Ou2YtA6RU*wf3_=Xb4B`wb zlP|KkF=|ehV6|b?n;gnIP1O`AYsMhJV9B7uV9lTnq)i#@fh-3GM+PT`5Fj1L;JR6W HO@t8uWXBJy diff --git a/bin/model/CharityTile.class b/bin/model/CharityTile.class index 6d5ff4b02382794b8da18891887a38921d547d5c..d52244e9b809f4950740fec9adb142c48a94a0a1 100644 GIT binary patch delta 515 zcmZ`#NlF7j6n&M11lo!NCY=})=b_t}I8V3`j0gb*L2=_*@B>0Q1xH&-hY314Zer9myf4s0E^hT)!tef;z&fGGw`}|Cat*x zOEl#rM-l@J(KE*ut}IlyEE zq-a#Og+(Q#N}T1$DXOgx3fM Gu>J|hA9gkX delta 91 zcmaFQc88hk)W2Q(7#J9g7$hcgy`5~pBtAKusn5X_D8vNBj2poWE+EOqzz8J87`VYC ZSdxKZ&XAom#;K|KTNzKs@$VseBE#hI2V31^F z5KT`lam&n0%uCKp%n2?@EJ@8x%`0JKkkQcefhfn6wdP`wW{_oPkYQwyz@>(VL5@M5 zk%1$TJ0-V@l4h)P8OhDIhXm4W>*~TEX5y)m@-~y6dU~xVMb_M|k fZXjO_qK<)wffvXF>R?b{Pz35`WKaU~m>84+_JT8u delta 87 zcmaFMa*dhm)W2Q(7#J9g7$hcgy_{UnxY)rI$Ylaz#*JVG7m#FQU<8u<4BS9c3?j+E W!@vvV0hKX`Fo*(4MxYExqc{NU847#= diff --git a/bin/model/DoodadTile.class b/bin/model/DoodadTile.class index 2d599401cc63b8c3707d65826f8ccfe4701612cb..aab4fc1727033edc9b58fc4325f7203cef8a09c2 100644 GIT binary patch literal 1047 zcmZWn+fEZv6kVsS3`|c86j}jM0TJ7R)EizXpaLOjte2!sjZfy#nZW3DhLow%FYrH% ziEk!eD2XPMt`uqY6#tEMH8I+5I9jJZD5@LOIWAWC#r9M1{X1Txw3 zEA>VdT;=T)DnZlnc8aB3jjc9F$wU-`5^+ca!ve!SGffO(L<2?zqS;(+0Bk9727Lm9 zWyiChv>MxXv#PfB4ym$VS8h!;9qo66v0&HPKh0V1toQL$BdqJ;$m?wTT&(0-_FIAY zjvbU0ZR@E=p4sjJp1JCs-7My6n&-5{3@(x9p1&uM%;vhF@ID4EpOQg`^*UE14D_3r zMNT4*d4YZot0}idX56`?L02UPV45i4x`As{t8=N&d`X>e3Zz-K<#@`gJIbYEf!(mR z9+O8*db33nOSog;w!m1YWiLkJu4a{F`wg|fyRN8Zozg8~S)zy)ruI*yc-QQv)>!B} zoII64B797b)m~R0v*Nd!b$cs(g@gZ}=%UsH(_B8vmmGzuRi_ov=L-M4Ncg8bki;eE zJttD*hx7B3he-a!(2GN)z9Ic3gr4O$83N*LCaGEiV~kC8iZG4|dMw8|OtPi6&T~wJ z_61z*4*5)Ugt=<|E7EOD{l@G8=JNUPm}?_@fQ9)s7TdVRz`{pNXzy6Wdf&#qPZ&QI z`hd9hl1ylxQD~ks;hHHj93jV1%prqiW>)DvBF_qsqq%1~T#mR`iC81k`^?1GY)W2Q(7#J9g7!)UR`A%%mHsa=CU}xZ9XW(UI5X{X_NzKuB$}VAjwK<78lD5Sn#30Hb2IK*?Gl(-t0F4B(BpIZ@mPj+mKrJz4umjo4z`%$w fl?|*~3~ZVhL=tWqBZDl198jK-K^~}yi9rDX0D2=0 diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class index c839fbd5f3c231353ad890bd74dbd6803c6bdf68..b527dce92127679951eddfe19e01aa8236cfc3df 100644 GIT binary patch delta 210 zcmaE$bXJ+`)W2Q(7#J9g7(Q&|D(8^nD^4wOPAtxFO3X>jOHO5EV9{{V3}a+qOaWq- z&Gj6mjEwx7zjFRyWZX9S9rt`jhRuCEE-Y^L49q~tz`(Ah-nW(E)J7naiD5dBa81^yD0J6lue0GMJ46}edpazEL3@;dfhBLfmcs2R7fF|c523Cf{44e!{CjS)> m=YGw=0hWEk@OHAipo;7Xuqix1F$SPIh$)N=?|?iehW7xGk1-$s delta 110 zcmX@B{6LB8)W2Q(7#J9g7~X8;D(Bd|kfWH9k#Dmo*AGU2SaNiZ1rLY8)cC1tDaqQOu8AU|jV zl1SnY@JAWXY=^ck%a@&*J9E!H=bqdC`TOfPfJfK}qE0|NE98uPdONRQ7{ws`0g6D!&4(`3-}I>N&>x^^4ks5(ygqi=XY$~HqH#oUJwW#(Go<5K%3%REF2l767x$Tv?CHkmq7P@9OaW94ZY|iy<@}Pu4D^zB*&DtYIGrl zPCSrB2Lz(YyZ2+ejSv{pP>+Dz4QpsbNbW{7gv+~!8np5*si6rC0xcQSGPcgo4vpeF z{V>mdMKbI{ewXc%XBG6@Cnj6od|TGBhiw)g1ln(d6$K^U1a2G1zR`gwCEhhkpuZyZ z?k!Q8$}X;z-IHRTXb4K;p^{;%FkMOROLH2O%O3^8yp}@BcKVZ>@?My{Ad%_?$#E1~ z7*kkk7Fw$4DxxWDb&TeWY|$CE{}WpYwf_HHb*ZOkmis2OQ#dbXjSW-wJzSpoDLL+l zQK^qViva4RpWM|++0IH=ot2(CD;;%K`pH#eCI^$>R-V4X&rD!Cb&a+gwC`Obnn~TD zb8q}7y06iHg~62X3NiVK%TGdnMt?YnWBd*)R6kKQ;`R}D2yI9pf)r;sjSjBha5{A` zjtQPLj9?N|WFh!sTCqtxXP`cHiP3MB5&?#R9tTF!=K}>JFvEX_vXt87!SAl*0ng;e zo|R|amE)etPcf$|FH@Qn7fAJ8VYb?ukP{sx+hk1(0*bpd?-`pXTQHC3URVh?)&#L8 z@4;H2%@S)7OA4#DBMG;t8BbBmp2;zH@|wT4o-G9Ig*dg5+9uWOR4v$f{UAuc(@-5lPK!&VJUmBYF-i?99x DlA#tl literal 1490 zcmZ`%+fEZv6kVrRnGU4|3dqe;3bwO63EFSd~~wh$1VaAL%59 z7_uJIwt37gi!dw+gUBW^!Z7wfX5!13jQbcTiYMIO^RpR-OJ%R4Zgf*Z4wItj6hp3b z_q}}32ZjeS;z)?ojEp4iiPNl%KKC>yLvl|KWuzc84AeA(zv;A&c>A4tq;rPB8Y!V4 zkYwWS1!MN9Mnb1=$~vZyxa=dt&`r?qz@nGLjfkWh$(W-S@7lvK>9>0KRhZW_4YIQ8 zI>?Z+xGng(PQ^;Q!V{*^1L1ccs3y5QKrt`VvpLt~jkYrwx8oW5`RevWjCx;NM)*bA zH#_YH-_e9xDR(}X#b{!N#E#Mk#}N@O&?zE3aCUOQ*-3wAC-rHUD1*j`)&aVGMT|0l z73B(LK)vvrrAfj?48ZJ8<$c*@9*YMaYyG amount) + { + p.getFinancialStatement().setCashBalance(p.getFinancialStatement().getCashBalance() - amount); + } + else if(p.getFinancialStatement().getCashBalance() < amount) + { + p.getFinancialStatement().setCashBalance(0); + } // Pop next card // Get cash out from card // Check if player has enough money to pay in full diff --git a/src/model/FinancialStatement.java b/src/model/FinancialStatement.java index 4a718dd..0b8ece4 100644 --- a/src/model/FinancialStatement.java +++ b/src/model/FinancialStatement.java @@ -107,7 +107,7 @@ private void update() // TODO add method to update display if its currently being displayed } - private int getPassiveIncome() + int getPassiveIncome() { int passiveInc = 0; for(OwnedRealEstate re : _realEstate) @@ -184,6 +184,11 @@ public int getCashBalance() return _cashBalance; } + public void setCashBalance(double d) + { + _cashBalance = (int) d; + } + public void increaseCashBalance(int cashIncrease) { this._cashBalance =+ cashIncrease; diff --git a/src/model/Player.java b/src/model/Player.java index 8fd7f8a..57994ff 100644 --- a/src/model/Player.java +++ b/src/model/Player.java @@ -3,6 +3,7 @@ public class Player { private FinancialStatement _fs; + private boolean _donate; private int _charityCount; //charity counter private int _downsizeCount; //down size counter private int _location; @@ -31,8 +32,11 @@ public FinancialStatement getFinancialStatement() public boolean donateCharity() { - // - return false; + return _donate; + } + public void setCharity(boolean charityq) + { + _donate = charityq; } public void setLocation(int i) @@ -51,7 +55,11 @@ public int getCharityCount() return _charityCount; } - + public void setCharityCount(int charityCount) + { + _charityCount = charityCount; + } + public void decrementCharityCount() { _charityCount--;