From e8f1d7a9be6ad947b6d987bb066931552632ea8a Mon Sep 17 00:00:00 2001 From: Joe Hill Date: Fri, 21 Apr 2017 11:19:53 -0400 Subject: [PATCH] sup --- bin/.gitignore | 3 +++ bin/controller/Cashflow.class | Bin 2328 -> 2328 bytes bin/model/MarketTile.class | Bin 351 -> 473 bytes bin/view/FSWindow$1.class | Bin 662 -> 662 bytes bin/view/FSWindow$2.class | Bin 632 -> 0 bytes bin/view/FSWindow.class | Bin 2279 -> 5785 bytes src/controller/Cashflow.java | 1 + src/model/MarketTile.java | 6 ++++++ src/view/TileButton.java | 2 +- 9 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 bin/.gitignore delete mode 100644 bin/view/FSWindow$2.class diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..8fcccbe --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,3 @@ +/view/ +/controller/ +/model/ diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class index c29e2cf28d69f668bdd0e404b2af23f618b4920e..13f0cc3c64fc98e214ad65a393f3679342b7193b 100644 GIT binary patch delta 120 zcmbOsG(%{E0~@3HWJk6vQELV!1{(%320I2>1_uUtAX|gMdGZ0aZe9-t4hByK2?j3) z6$YQp5$ueNmO((FU5C$QJFrcPz23sK8l_3hKD4M~aA&wz~A)cX;A(5e-A(^3< RA%$TZkiDNFWAY@9HUR8F7Eb^G delta 120 zcmbOsG(%{E0~@2+WJk6vQ7Z-}25SZ}23rPM273m1AX|gMY4QQKZeDi=4h9bf2?kFF z6$bCk5$ueNmVrQ_AO>EBUa4`BvI26mufra;UD#Ecuk3@#wa29#o8;A7whl41}^ X1|9}pAP=aFL4-jRNHPLtKpMpX7q=W@ delta 34 qcmcb~e4mNy)W2Q(7#J8#7(^y=ou16YsKLlM*_1Jcm4ShYK^OqZo(R7H diff --git a/bin/view/FSWindow$1.class b/bin/view/FSWindow$1.class index 420404da53fb25e8436740d206773d76735bc618..106a5ab057643f101147aa6a895709b14dc436d2 100644 GIT binary patch delta 23 fcmbQnI*oOM2ovLk$)Zd)tdkg67$#2+V{!lhNpl6w delta 23 ecmbQnI*oOM2os~sWKkv?RyhV12KmWhOb!4%PXuuQ diff --git a/bin/view/FSWindow$2.class b/bin/view/FSWindow$2.class deleted file mode 100644 index 82524437a06406cfd664ae92218353d2c9f5b9a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 632 zcmaJ;T}vB56g^|oY?H1grW(JELLOoY-4ZH@5yAQa!fFLYpC_9!nXs9G-AVGh`XB`# z`~m$@#XDn)q=*l*Gxywk&OP_;pTCb!0KQ|}!wf@lB*i#5yS|gEqsO(Thb%*>&qq9n zx#|W#+kFuk4>^Vnhw`xr#7HO;97RTI70T2IB@%|5>B+SAjWok4(H5l+q>|>4pi{ys4V?jEhj(B{_6KUfKn6(BN z=BHcKnq;8Jo!Kjq-0Nf@It6TS8*wn(Az)0gAwgq!+dOiaJXoX7v diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class index d04cbaf81af151171d221cc7521628ff9f8e8c47..81c158ba0c083393ea2b28f98e4dcb7da5ff6df1 100644 GIT binary patch literal 5785 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 delta 1269 zcmZWpZF3V<6n-uZ*%xmi*#cE8Glag7gtnm|72Be=(3E1VKuc;+fo-#e#dL$owrQ(1 zia>b>y~8m40zWfjH#5eU&-#%WX8h_W27UqXf$`iVFfH!P-FwctXV3GT^X%@ujz>ZL z?-#%R0pK0{bYH*1qQ+Ts)|`vw3$}AQb|{`Rr!5sN49fm9X3lo!b%fBy!LeOD^*03~ z9Bbj1!5tj!=nySRJBx`UO2b>7=#qK682sVk;o(S9Cy;Ihd&HvBSobdWin~g9D1;u4 zUi1+{-f~Cn1&d)VM++hYIoLF_*D=CHW5k~?a3sdcF`-GBK^`9^&tc;2y z4A3!xQCVqB{HAURBsmnQGWaP+3dhA`we{^Ua8khuhWb~m<5|b$I0aKgv{rQllN@PS zBB?c}PjhJ13Ox$WzK(p@bgYaH8vzXr)12_%P>@|Yk$5IscsUUV0hv4?Z{4yhLY={^ z_*2_c3}KFA9t#XQjW}uN?THLc*%v+@NvimUL9J;UlI?uUQN;GD9Anm;tKxeCtz~RY zTlvYHea^MBj)EU*Y+k)C12e9hbyQp=sL|}SRq?wW9p}-e;PU_E*`;F%2j%fKj_bI= z5H!>2{z+M0Osh?is+q9!uH{%c5{zMEVwFNw$X>C)$C*z&;GNn!_^=)-0z#`lpc!N} zkZK!5vOZj7WAM{BfhW;2LMfxUgw|z*qrV{RfkK_BAnpXV2Jue`J3Z`{2SIi_i02;O zlTI1?Qhr|vA9(1m`h%%x2}2$Z(c>d2<8WOGN0)Jo4lB#UxX<{^!{;6*qQ#XdQUttU4spD zj~5Z7Z4>Izh&H^5-PlYYPZN$}8@;2=aM2>A!cBy64-x!~D1N8U`Y&|gAv*CdVt9<5 z*hp1)b&gc6u>!D#sxqu2d!7VXLwlEGXngHqk&G$hI}gRhGR~)r3ng4i>?mVNj_!(w ztFndFR5z1OAbuMCGYsq{jy=SwpRfli=$ontHS{KmT_o0wqPHq+ZsSMV4e|$Rm)8=l HI$Hk$(10Ly diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java index 5848dd2..867a104 100644 --- a/src/controller/Cashflow.java +++ b/src/controller/Cashflow.java @@ -43,6 +43,7 @@ public class Cashflow { // TODO Play method // Get player whose turn it is + // Display their financial statement // Check down sized (check if player's down size counter is 0) // Check charity (Check if charity counter is 0) // Roll dice diff --git a/src/model/MarketTile.java b/src/model/MarketTile.java index cc34c9d..9a07a01 100644 --- a/src/model/MarketTile.java +++ b/src/model/MarketTile.java @@ -6,5 +6,11 @@ public class MarketTile extends Tile super(type, boardIndex); // TODO Auto-generated constructor stub } + + @Override + public void getLandedOn(Player p) + { + + } } diff --git a/src/view/TileButton.java b/src/view/TileButton.java index 20bbca9..c3c06c8 100644 --- a/src/view/TileButton.java +++ b/src/view/TileButton.java @@ -34,7 +34,7 @@ public class TileButton extends JButton { if (this.tile instanceof Tile) { /* * i dont actually really like this method - * but i think it should be like that iterator in cashflow + * but i think it should be like that iterator in cash flow * that determines moving over the tiles and if it's landed on * the gui should be brought up already in the handler method */