From 15537a81b134ca49fb6d2866163af3085133c1ec Mon Sep 17 00:00:00 2001 From: Mykola Fesenko Date: Wed, 8 Oct 2025 10:46:01 +0200 Subject: [PATCH] 08.10 --- Chip$1.class | Bin 886 -> 886 bytes Chip.class | Bin 1826 -> 1872 bytes Chip.java | 6 +++++- Chip.~ava | 6 ++++-- Game.class | Bin 5839 -> 6034 bytes Game.java | 17 +++++++++-------- Game.~ava | 20 +++++++++++--------- Muehle.class | Bin 6841 -> 7246 bytes Muehle.java | 19 ++++++++++--------- Muehle.~ava | 22 +++++++++++++--------- MuehleButton$1.class | Bin 1104 -> 1104 bytes MuehleButton.class | Bin 1609 -> 1655 bytes MuehleButton.java | 6 +++++- MuehleButton.~ava | 6 +++--- README.md | 11 +++++++++++ README.~d | 7 +++++++ 16 files changed, 78 insertions(+), 42 deletions(-) create mode 100644 README.md create mode 100644 README.~d diff --git a/Chip$1.class b/Chip$1.class index 2374eda25a73f129ebe00e9b4f547ca7d38cb447..2e84105fcadbeac96c2fe6586533e691582b7b8a 100644 GIT binary patch delta 29 jcmeyy_Kj^r0~4duhD delta 29 jcmeyy_Kj^r0~4d&Y}o3RU@ld{ip0NAihL)lT?n4zrX(h@D1EFV(3XCZlMTT_@)` zej~TM`9{|wg~XieyV1NtPbOPQqK}rsmb)`KokkLA*>_GMl_`rcpRJ^D9v716w{Q^y z3UM(joZoJ?LcLM*+}f|Yt}s%TgI@oZ)4SS_atks(bNsregS;SoWZ^PC=Jvq#8w#o< z#!oB^iZK;v&xzb!y)M>a3nM42Rk4m)_!Q$@>uiQiuNCQaq7=n5Vd2^dk6Axy;WK=$ z&|7PI%|K!JfM8hDzRvA9E@>9Tmrp#p!`$&FXtsqf1T7Ibb+;8J@uk90H@42!aLd`z zxq=(iJe|f(3(6q2Eip17W;FqS!s z@QTpxUdq=N@|a^v8_u@oS>>mcO!hn;Ch^E(F+3*B3F@xD(~5G7a&_j0c#n(AuT~c} z3guGa#X?bG@Zi*A_qg`^jy5cd78dYCq2H<3kKeGuy+gLA_nm=vP#4*Xg#OGz3C|VM z486dr(E)EZo?#}%Teh%x(pybq87oPAYvH9-YFxrruxhN!qk2rOx((lnS^-^iALelA z>fFoe{N(5J3Yko)R4Nt^K;EyPPU5o_aw##EXMJ?RP%_{l64ho(VhC0Lq`y<9aNkd8L zQB%@nMzWEOWa}EqW;K$nX(XG9AMqK&KeP+uF@?aR2)Mz%Y7hnrPl1FasaQ4UQSU z7dEC@t23D5+8pWM!Y{au*L(yb+{HR~zeFF$7OME3QZz|`GTIN+B&{v{NUg_cKM_4{ zw4bRZj3%k>ph)sl+`WP4om8<&dd$uNn{i8^658lKo*sp9!7RAX{LV0pSwriJIe6fZ z)&Pl*6H>uB8(Q)w&{y~I;xu%g&~t=-@B!$}E_4m`F6*2*3g{KoKNw^TlJEr0z(WIL z8NIj5P%)9>Wp(huj2T~wn`iBPEFJNYKSA(W>0=O*{SHW~3(^BkTa5S9po|kFi7jeU J)=5hK{s*j_b6@}f delta 968 zcmZuv+fEZv6kTW9($3^qsX=T(Xc2_YfCafry#a-yf_O!WC=?kD3DN|Lul)ux@!7-= zFkWa)Br);D2cP@{Kf^cUI;Ra@)67}x%-(zLy>{no_+{Ao^5ert0ONSPXT7k@ZFe(Y z+<4|L?!Ahob0&_UNun7i13bwB%B6xl+jtc9Kg;w`^?y9d>@_f z(OpK0Og)JT`kh#)jA8ZSEyf74g3E7o+dDkR5at<&pF65Yg2T6=iI(E%z-e@%8>J-r z;m~h4=Fx*Cq_B!!Y|+PEmd+r^vw#KMBPzB?5usU*%+PF!?tPlwCktq%Hdn1xy9}{r z8QJOvFvo0_A91=$%6`>Otb)w1(Zf1pfNFyreMnE!sQX0@r-|SJ`|(@E!~bckomQn= zDwz3OdW6!W@cQcfCFS&A?UkDLD)P0tdvz}$pk!aO$bi~%9bbcAqmq%D2Wle%VO ww_}9aD$iu`uv5Xc!+|DXX=77d)AVmDW=+M1HP#t;gmt2yDnYnpmS!ZtPusqK1poj5 diff --git a/Chip.java b/Chip.java index 0d502c4..2980e82 100644 --- a/Chip.java +++ b/Chip.java @@ -28,7 +28,11 @@ public class Chip { public Circle circle; - public Chip(int relX, int relY,double absX, double absY, Color color, Game game) { + public int ring; + + public Chip(int ring, int relX, int relY,double absX, double absY, Color color, Game game) { + this.ring = ring; + relativeX = relX; relativeY = relY; diff --git a/Chip.~ava b/Chip.~ava index dee2eb1..aaa71a5 100644 --- a/Chip.~ava +++ b/Chip.~ava @@ -28,6 +28,8 @@ public class Chip { public Circle circle; + public int ring; + public Chip(int relX, int relY,double absX, double absY, Color color, Game game) { relativeX = relX; relativeY = relY; @@ -52,8 +54,8 @@ public class Chip { circle.setCenterX(absoluteX); } public void setPositionY(double Y) { - absoluteX = Y; - circle.setCenterX(absoluteY); + absoluteY = Y; + circle.setCenterY(absoluteY); } public Shape getShape() { return circle; diff --git a/Game.class b/Game.class index 0a88886884fd8cbc0285fc2cd1cf9d0f7be57764..616b376644a3356c568237a838013a09be3e59ae 100644 GIT binary patch literal 6034 zcmai2349dQ8UN27*=#Zz*l;aLG$>$pIpTqc38JuE(SVf1aH(Ok8Of5(PP#h@LRIR4 zR;@>cR-{!?TH@7KZL$`uM=#sjV(lbIU#`fk^&Mrd~e&MRoaT-q75bEf&Z7Y-0FwxPdm|iJ0O~)BR8&rFSFkM4bWM6Y_ zeJ*Kc%=%oH(QDQxQrTo$K`>LtS*W9tj;g)NW=As()tl5tV=}Al;yPw2ZpWZPZqa;> zj=88GhN#0bvYi^H7R%&@R-awJ#>kjTsa+>H21)!%R1p z;(Q8M?yMD$m2uAtbS%Jy8uXlLE2>uWT86>IItMcq8?F~)ZDBNGVF(xLSR{VYSM`}) zX>*CfnJS2{h2#<)i)B5WHPeQj>NnTRY(mGl0Sm%1X?xY-(M00(b>9jbeO@j#ga3P%%0? z6O1|yXVo<|H7#9QjA9{MtXT*Z_c|TxvB7~(CKFa)hR{u_YZ@E7RoJBCO3^&HqUqgS`^qpz+(Dhrnmk6C!hBSIY$mp=d@lGxklM|6%VNNqd-i~YtIUP3oMnhf@ zi%i}vrcD&mova5MX4J)oF-%(NG)qg0smLmmGqe3hN7|H>C5nyMrsG;{*HB9S7RfdS z@d$Ha7OK_8a=ZiAg>b!&8?aNuG&cxNz6)zw*6gwRDYz)Aor>2O+bH1QsN*K7h@}~Z zzvM6Ri=)f13-6K=db@_Y{}(XLQYjl_ZBn1^)bVan+Ru0s zA=_l@dvx53_i$@Yx&YKT**B_?IQGZd1c5ulWWPjQ`Cjqk`>0u6lN9W|3?LO!Zier} z`$PDEjt9lpQ;RaDs5sE&tN@byA~_+Cg`(Xf5|xhVrBygo7F;(_<^GY-$IK zjFC>Ht(+<7u;5Nr#7-8Bs=6ZcF&&TN3A%#<+RUt-N*1$6$?k+t{TSR&>G&`{LgzRE z*Slo<8jE|DDJD^XVHL&GI-bF^MAf#O@}*&d8&*!kbBkJpjd4)N5b`vr$LKZ_RwilK z>r!?XM{H9Wo5E*~RSr+ga@qLfIu7A5eN6Qv;)X3L=&~%_yYLAeFQ{6;$hEQ&Xn0A~ zc=-e#Pf;HRWrI)a_zXTvhv!l|7}M<2O%eFUJtCRayG^aA= z>b{;1GutXvKu!x5z29bJQ}XRj2JEgBQ7>_FhlPuN$P N99F90ctE(z9_bteKcRr z9ZQ^^8ca(+WbI2bT-u#;LVGfuN_Ly8#rIXi3gt}^W|t20-Mf6$s13F=b(i^Q!)mO0c=%g>|y zT&wg{pT{)#)@v0dc&iM@S-CWgsiXNcOc&Wsey1}1R<~L2WRH{7%Z;RMW!Y=?7N)aH z=xDLh$aJR7-1KJ4>h9}xf~u%qI7y(Axrniqh>k(-oCph#*o|&wD-@A1(&-i+eF?DM zl*yRcMB2#Z%v?wdvX!1-(^#s8w2+3={x>Pz;@E|0tinE4zH*iwp65AY*h6X|%a8l! z(OZ4 z5$1Co0@S<=m8if3S~C$D*{0w>(P;t#ue(p%j5{6C5#gJibF%d>nrl-*Yz7 zE~2`!(Lj6<75lJ*StKK=Jh~~1GrhC&=s$!VKCFx9@lMezu%E7p z-0Yg~S2!;svOpXm%%qp#e9D;8maSZh#?5a4538!$LXLkomo=3{* z2q5-6c5SGtu9*^;QW7m?aNX7rrWLi(a2|K8i_7b-JnoK$pC+*rG>$KqGF+CS2FvNq z6-vRiC>4R8GBLUHa66g%F-MX7j%4Zp&#U7-nAsQ8sZvpbJH zqXn)eP-_YVmU{xrm6jrqM`2gs?Gz|BFQAr{`;@Yi_MtQ$kYsh^H4=~9&-jQ(u3{Pw zaNfyhFK3*fIYZ&Omgck&kv3Fg9ZSi2UWhj_F|TB}T&=Wn5_5s8mAF0#f8}JURJ^FV zYAtr{6z87JpnYJpl^xtISzu+@voeg=RWZ`!w&jXjM$d^anDPXTzlZpHIFJ2LancDB z0R%7$M2`1Fj`x7$QP~lxbx>r890%eI$2<-+1USfJpdqN zWI!eMT&5Aw#Yj!DVs-PdnPz17Fnu#b)1vuVY-4Ia%-i5297!Qv>6qz(aX@8z zMk3972pQN>G!Ysk(N4E(Gz5rm&0+8lU&OX*A5Mz~;sJW#NvQ-J2ZzT4XsinCSL^=a zx#IOIeiklyVn$r}N!Nu^R~#(QWs3nzU>Mi21zk@&Z@>)fWO=-iVSE#-&CM)ew_-DH zBg(gv>JEkHJjVAgPBJG9nGx&+u`>9NVIJW+eX`rY-yjX| zUJhvVMS%Z+O)hAwtM{RLPP~dSq+sGO=ne;PK{Zj5RfgJ$tI^^GPr?WwaaE!3Vq)G+ zRqtW#zn6gA$3C)~{bCQh$NgB%KCyv8B7r3xf~t8yZ1RBEgf8S$=!$Xii&}P*{5&uYXipzG{L|rf>Tvvc#xs|5PRjrtnB+)0v}}QJK)*uV=?@b z+g3Jv)^GN#-|Sj17V6?)pY|rMILffml|?mGj}$K+A2|NT0MBiOGGd;L*eDsY;>qw9MTQh? z2b1M224EiR?EDct#zc9XP523%&G&qID?xv);=2ulxQaLAtxRZ}?;X5n--g3%sD~Ii zFL}kNiswBCzeP+uXVmV^-Q>-IvF4oqWb``smZG&6e`b5|srWe^;bW-Mj$-OD-Z6OS x@EzkH#7919z+cGX!(Z_?zNa#n{zD;uSI>W{=fBnSO-;@SWze*MR>JE{^uN^otiu2R literal 5839 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 diff --git a/Game.java b/Game.java index 38ee3cc..f778dd4 100644 --- a/Game.java +++ b/Game.java @@ -42,13 +42,13 @@ public class Game { if (game_state == 0) { Chip newChip; if (currentTurnPlayer == "White") { - newChip = addChip(button.relativeX,button.relativeY,button.absoluteX,button.absoluteY,Color.WHITE); + newChip = addChip(button.ring,button.relativeX,button.relativeY,button.absoluteX,button.absoluteY,Color.WHITE); white_chips--; setChipCount(white_chips,"White"); } else { - newChip = addChip(button.relativeX,button.relativeY,button.absoluteX,button.absoluteY,Color.BLACK); + newChip = addChip(button.ring,button.relativeX,button.relativeY,button.absoluteX,button.absoluteY,Color.BLACK); black_chips--; setChipCount(white_chips,"Black"); } @@ -64,8 +64,8 @@ public class Game { } } - public Chip addChip(int relX, int relY,double absX, double absY, Color color) { - Chip chip = new Chip(relX,relY,absX,absY,color,this); + public Chip addChip(int ring,int relX, int relY,double absX, double absY, Color color) { + Chip chip = new Chip(ring,relX,relY,absX,absY,color,this); chips.add(chip); addShape(chip.getShape()); return chip; @@ -98,10 +98,10 @@ public class Game { LTop.setText(value); } public boolean checkCombo(Chip chip) { - return checkCombo(chip.relativeX, chip.relativeY); + return checkCombo(chip.relativeX, chip.relativeY, chip.ring); } - public boolean checkCombo(int relX, int relY) { - ArrayList hChips = getHorizontalCloseChips(relX,relY); + public boolean checkCombo(int relX, int relY, int ring) { + ArrayList hChips = getHorizontalCloseChips(relX,relY,ring); ArrayList vChips = getVerticalCloseChips(relX,relY); Chip start_chip = getChipByPos(relX,relY); @@ -119,8 +119,9 @@ public class Game { return false; } - public ArrayList getHorizontalCloseChips(int relX, int relY) { + public ArrayList getHorizontalCloseChips(int relX, int relY, int ring) { ArrayList result = new ArrayList(); + System.out.println("Target: " + ring); if (relX == 0) { result.add(getChipByPos(1,relY)); result.add(getChipByPos(2,relY)); diff --git a/Game.~ava b/Game.~ava index 989b478..a16df59 100644 --- a/Game.~ava +++ b/Game.~ava @@ -42,13 +42,13 @@ public class Game { if (game_state == 0) { Chip newChip; if (currentTurnPlayer == "White") { - newChip = addChip(button.relativeX,button.relativeY,button.absoluteX,button.absoluteY,Color.WHITE); + newChip = addChip(button.ring,button.relativeX,button.relativeY,button.absoluteX,button.absoluteY,Color.WHITE); white_chips--; setChipCount(white_chips,"White"); } else { - newChip = addChip(button.relativeX,button.relativeY,button.absoluteX,button.absoluteY,Color.BLACK); + newChip = addChip(button.ring,button.relativeX,button.relativeY,button.absoluteX,button.absoluteY,Color.BLACK); black_chips--; setChipCount(white_chips,"Black"); } @@ -64,8 +64,8 @@ public class Game { } } - public Chip addChip(int relX, int relY,double absX, double absY, Color color) { - Chip chip = new Chip(relX,relY,absX,absY,color,this); + public Chip addChip(int ring,int relX, int relY,double absX, double absY, Color color) { + Chip chip = new Chip(ring,relX,relY,absX,absY,color,this); chips.add(chip); addShape(chip.getShape()); return chip; @@ -98,10 +98,10 @@ public class Game { LTop.setText(value); } public boolean checkCombo(Chip chip) { - return checkCombo(chip.relativeX, chip.relativeY); + return checkCombo(chip.relativeX, chip.relativeY, chip.ring); } - public boolean checkCombo(int relX, int relY) { - ArrayList hChips = getHorizontalCloseChips(relX,relY); + public boolean checkCombo(int relX, int relY, int ring) { + ArrayList hChips = getHorizontalCloseChips(relX,relY,ring); ArrayList vChips = getVerticalCloseChips(relX,relY); Chip start_chip = getChipByPos(relX,relY); @@ -119,8 +119,9 @@ public class Game { return false; } - public ArrayList getHorizontalCloseChips(int relX, int relY) { + public ArrayList getHorizontalCloseChips(int relX, int relY, int ring) { ArrayList result = new ArrayList(); + System.out.println("Target: " + relY); if (relX == 0) { result.add(getChipByPos(1,relY)); result.add(getChipByPos(2,relY)); @@ -132,7 +133,8 @@ public class Game { else { result.add(getChipByPos(0,relY)); result.add(getChipByPos(1,relY)); - } // end of if-else + } // end of if-else + System.out.println("Result: " + result.toString()); return result; } public ArrayList getVerticalCloseChips(int relX, int relY) { diff --git a/Muehle.class b/Muehle.class index b24a4648a4518d6531fc9aad0623944efd0bdc5a..0891b00792ec45735400a36802c8fe2180da81d5 100644 GIT binary patch delta 2425 zcmZuy3s6*L6#mZLW$*6g!Y<2R1WZx{TLj!BQDCJ&9=QZ+S(-McD{VsHLb#bu(`+-P zrDHndEeC6|v}T%|$^^yKe7`d_GtKNZz28rJB1z}J`_P(ZckcP__n&kAbIraNOme@AtI&gL6ES z7tRX><`PV8_k;*qy)n|<=9$#d91Kkkbp-r#y-pC0sCXSm2?OT(TLM*W!A5^*YICTG z(Y%m97@EhiZeLy`Jd!xX8RmEu9K&(1j1wx}L=_?ReFWj4&fmnyz8;--%G-CQH+u!2NsrVh| z3C`KA{>GM>?XCWWfsUDtP0j7|6mICBD*i%m_XX>H5}nuYO19MdQAuMNSQ)j8Y@$|O4rhL-M6a}l`~zb&^W4+ zshWFFHH4f?%hnv6-_{cF@B(p@Bg;|iZw$3{EF^Tg>-A@nvh+>rxQvK{_qNLxX5#F- z0*xWPDrtmyJRw)ODmnFSZ7uh-%T%X7l{A$u=)WZm$?xNyDvIh0dU|V z`q>gn`IT@%uS{M-efrU4Z>jJa&i=rHs23w5lGx9Rb~0fI=d48$nJED#X2+q*$Z?%L zv-r}SCG1^l%$a7?V2fw7k%eTAAY6e#BC>nAJtXn;Cg-8Bn0_}>r9$MAm25}@q{e7y zqI4@M2ylp9x|tFgNl23#NTnn$2C3O|`5;(ROT}W-@82TVL+VbsUfJV+60MdY!A#e&k=INnhj|afvGvj%Iz2Yoz^P z%+G6ZE48Ab2NJ|QPhw&h_G+r*j;0i9nzapwfgZdOouWc>(Mf%gvI>Pk6-|npcqS0!MGNW zVj`BK11oSp;|H-4%b;Te9>X@qyU~dwSdAa?1bWfQQhkaQv4*b3)8u7biM8azI+}rJ z=^;EvEBO6!JWp%z0`158FrDC+(|D0S#7mMHFH3g3C~4RzWur^-pj)b9>%$g9rG3cY z!V)Q)h9U_mC^qD$a&a-vhq5TQA8e2s{ zvNV=*cq1jo6>E&KVig*~3wJ%77m*?(C}RfoVpJa_Hl_bEV6R_{crrT_753mWVbje$_*{T4d=c)!*TV(w!8Z?C$xw1E zX+b2Z3qM5i&iQXrb}*6(Ya|tbOB6W;jOP@p&);ur8$y&6Zc7H?oZ-@lu19Ir9I z7bkh-E&jc2NcJXP%0W>LS#ft9abtxx!aTW!!}&VozNq+CNK znb=Chgi4H6&xX05Gs`j(Wx7iIF~ekHf%PJ~ypuR1-?)+WWR*xlbg*+1vU-r6zm+!} z^sG$TI0GV=&>7zUXD_=D>@oeaK-`oEawx=CYc!>YEl-F9)2sMH^i(o>Dij118EGPS sSppSMA#)}gA-u@Ln+|X?DrIiqNVMVpzg4p)wA z2%_D5P))a=Af%et+)18^HBVG6sCHpCPH8x8u2+rH4xH2AzTPc z`hBF~V^k9y_fMKUy-dyK>T$#I|vUXnXw5Oh|tA4C;h3jcS7fqM8b^I_wa@G{-F?UIB_2TNv1>1NPd zNLS1%@8ImKd^Bzd9#ddPKm5u_1M#Ti8m_Y?6yrA@ubA7tFVR)AST8A-UIF$8mh^f_ z^gI4wKNSn{CkAuOyO56?xCtAxcVeOy<83{ypl{70_Aa*8^jkT&V$oc=z<>*RlQT=!~^&n)jY*3rlXsYfM1lOhxcT|KoKHB z8>gNnN=R^;4&;bJvXLDM@LqRHA7Q2Ag>ioGi`>JwaP!tb2`cvNY-pMay%VT zs?eft7$c4LC{-Mt>%&}gnLprZi+&krIoJ8~haQbmmb2Z^QWPKd&r4yXKRmy_%7;Vd zN~3?@RLjqFCFdEjXcpz*9DUem>dArlw!kjrSe3D#2x8>j{wsgChdY@+4ZOk1#p8nG!%E!awju#GO^ExOM5CbkO)c8Emm6vNpD z(PYW93#pt`9AB&-@kn4Sb*FJ+QEn27dbw>eZaIrP;&(a59YAS><0Qk;$=w*=OV&gk zX+q3#ON@Ia#$AeWd!w9Ckn2)BBFBP&-g{00^xI~6k zBP>8MkdnEA;$l*@zOhu@AT@Y->Modw}ltfJFfBx$w!)(1g zV<;EFc+P>#ocqlImcEOlpVM9Y&@sgt%NuaA!iP1*b|20ZE4D(_P<7V^lxG`iD>`OM zd9Hbszg6k^hB`k1$L7?hD7$fX8aw3YG~)wlQ|!&SAVC8@Y{n;nu*A*y^f{F__cZhc z4Mu|c@MR?Ky#EJf2P>$wR!|8zMHy7WSWKz->?V9IZLkU7?c{ygAZ0&`yB44S9^Q5f z3#pYm$X*!Ohcp~O2Di5|yo+)i!VJ8JIXH~@%-3@3T7qM&_~TfQc5LMrXBSTJ%r^Es z&CD5`w#~)@>%`Q^El=f$`~b@PG*|Z!2U?2kCD4m_?L;T(!Q=n{ diff --git a/Muehle.java b/Muehle.java index 6fbad44..d8485a0 100644 --- a/Muehle.java +++ b/Muehle.java @@ -134,41 +134,42 @@ public class Muehle extends Application { Color button_color = Color.BLUE; for (int i = 0; i < 3; i++) { - MuehleButton button = new MuehleButton(0,i,topLeftX,topLeftY+ i*325,button_color,game); + MuehleButton button = new MuehleButton(0,0,i,topLeftX,topLeftY+ i*325,button_color,game); shapes.add(button.getShape()); } for (int i = 0; i < 3; i++) { - MuehleButton button = new MuehleButton(1,i,topRightX -230,topLeftY+ i*100,button_color,game); + MuehleButton button = new MuehleButton(i,1,i,topRightX -230,topLeftY+ i*100,button_color,game); shapes.add(button.getShape()); } for (int i = 0; i < 3; i++) { - MuehleButton button = new MuehleButton(2,i,topRightX + 140,topLeftY+ i*325,button_color,game); + MuehleButton button = new MuehleButton(0,2,i,topRightX + 140,topLeftY+ i*325,button_color,game); shapes.add(button.getShape()); } for (int i = 0; i < 3; i++) { - MuehleButton button = new MuehleButton(0,i,topLeftX + 100,topLeftY+ i*220 +100,button_color,game); + MuehleButton button = new MuehleButton(1,0,i,topLeftX + 100,topLeftY+ i*220 +100,button_color,game); shapes.add(button.getShape()); } for (int i = 0; i < 3; i++) { - MuehleButton button = new MuehleButton(2,i,topRightX +40,topLeftY+ i*220 +100,button_color,game); + MuehleButton button = new MuehleButton(1,2,i,topRightX +40,topLeftY+ i*220 +100,button_color,game); shapes.add(button.getShape()); } - for (int i = 0; i < 3; i++) { - MuehleButton button = new MuehleButton(1,i,topRightX -230,topLeftY+ i*100 +460,button_color,game); + for (int i = 2; i >=0; i--) { + MuehleButton button = new MuehleButton(i,1,i,topRightX -230,topLeftY+ i*100 + 360,button_color,game); shapes.add(button.getShape()); } for (int i = 0; i < 3; i++) { - MuehleButton button = new MuehleButton(0,i,topLeftX +200,topLeftY+ i*130 +200,button_color,game); + + MuehleButton button = new MuehleButton(2,0,i,topLeftX +200,topLeftY+ i*130 +200,button_color,game); shapes.add(button.getShape()); } for (int i = 0; i < 3; i++) { - MuehleButton button = new MuehleButton(2,i,topLeftX +540,topLeftY+ i*130 +200,button_color,game); + MuehleButton button = new MuehleButton(0,2,i,topLeftX +540,topLeftY+ i*130 +200,button_color,game); shapes.add(button.getShape()); } diff --git a/Muehle.~ava b/Muehle.~ava index d2e12c5..235302b 100644 --- a/Muehle.~ava +++ b/Muehle.~ava @@ -134,41 +134,43 @@ public class Muehle extends Application { Color button_color = Color.BLUE; for (int i = 0; i < 3; i++) { - MuehleButton button = new MuehleButton(0,i,topLeftX,topLeftY+ i*325,button_color,game); + MuehleButton button = new MuehleButton(0,0,i,topLeftX,topLeftY+ i*325,button_color,game); shapes.add(button.getShape()); } for (int i = 0; i < 3; i++) { - MuehleButton button = new MuehleButton(1,i,topRightX -230,topLeftY+ i*100,button_color,game); + MuehleButton button = new MuehleButton(i,1,i,topRightX -230,topLeftY+ i*100,button_color,game); shapes.add(button.getShape()); } for (int i = 0; i < 3; i++) { - MuehleButton button = new MuehleButton(2,i,topRightX + 140,topLeftY+ i*325,button_color,game); + MuehleButton button = new MuehleButton(0,2,i,topRightX + 140,topLeftY+ i*325,button_color,game); shapes.add(button.getShape()); } for (int i = 0; i < 3; i++) { - MuehleButton button = new MuehleButton(0,i,topLeftX + 100,topLeftY+ i*220 +100,button_color,game); + MuehleButton button = new MuehleButton(1,0,i,topLeftX + 100,topLeftY+ i*220 +100,button_color,game); shapes.add(button.getShape()); } for (int i = 0; i < 3; i++) { - MuehleButton button = new MuehleButton(2,i,topRightX +40,topLeftY+ i*220 +100,button_color,game); + MuehleButton button = new MuehleButton(1,2,i,topRightX +40,topLeftY+ i*220 +100,button_color,game); shapes.add(button.getShape()); } - for (int i = 0; i < 3; i++) { - MuehleButton button = new MuehleButton(1,i,topRightX -230,topLeftY+ i*100 +460,button_color,game); + for (int i = 2; i >=0; i--) { + System.out.println("Er" +( i*100 + 360)); + MuehleButton button = new MuehleButton(i,1,i,topRightX -230,topLeftY+ i*100 + 360,button_color,game); shapes.add(button.getShape()); } for (int i = 0; i < 3; i++) { - MuehleButton button = new MuehleButton(0,i,topLeftX +200,topLeftY+ i*130 +200,button_color,game); + + MuehleButton button = new MuehleButton(2,0,i,topLeftX +200,topLeftY+ i*130 +200,button_color,game); shapes.add(button.getShape()); } for (int i = 0; i < 3; i++) { - MuehleButton button = new MuehleButton(2,i,topLeftX +540,topLeftY+ i*130 +200,button_color,game); + MuehleButton button = new MuehleButton(0,2,i,topLeftX +540,topLeftY+ i*130 +200,button_color,game); shapes.add(button.getShape()); } @@ -204,6 +206,8 @@ public class Muehle extends Application { addShape(black_player_chips[i]); } + game.white_player_chips = white_player_chips; + game.black_player_chips = black_player_chips; } public void addShape(Shape newShape) { diff --git a/MuehleButton$1.class b/MuehleButton$1.class index 19b239dc5b80f371856b6116cc050f37d817a564..50ecccdd3d04ac6fc6bb83dec930ea7410a2429e 100644 GIT binary patch delta 33 ncmcb>ae-rlA2XxjWPj!uPGbfR1``H;2Ghw~n7x2v|Cs{;lu`(d delta 33 ncmcb>ae-rlA2XxwWPj!uPJIRr1_K6u2E)l)n7x2v|Cs{;lO_mx diff --git a/MuehleButton.class b/MuehleButton.class index 8e3f9af3d69863a756e0780f6a2e8d550207cd98..be8c01b4e56c0455ef4409339e7d8061e8f81abc 100644 GIT binary patch delta 828 zcmYjP+fEZv6kTU#+UYb0qOq6`Qj1`v9ScakK`RPUK@=2k*m|$AAx&zVw8g}yegl~= z@CS^S4kT!N*BAX8-;C>=l4z6ewX!d3*4{JU4N@n`=VfJHptiGB@Pty*Ji=a*Y3 zIT*mO#4!vBIIU{E(y6_vmQ^+(aU4lzD=*v4`gW&U5)egIIUzBIq(3NJ_msqhY6`b1 zuWH+ERn16vIPEWp32Rco_1_CO5k(f$5+R&nYr0r0W;Ru8PU0-i`R_#LXciYFE@D=| zZdW_YwR&A3k@gqOSZ%Ihk%)>eoG2bXch#)9O2S2^dqX2M@G zrXpDsC9YxFe`~Be*Rg8jhQv+(r%^Z4>DABkW>|Ei5K5EB5r|_*BhR6c2hhlMHF7bH z+*u>tYmDiB;1CW|WsNxl>oCbfxW#yz;z!^h%1YDQgYdq0o4^shV$kac*i}RlA1ejBaPnajjT`YanCN>!J z7-V!|VTJ~WX?27#!4;B7VU#O%$B@G~W^s~EQ+UL8`T`j=_#*Fc^e!TdP2xSGVrpNZ z*?lrYvj=3RW}6hYG5THynU0cAX_latzm>^B^E z5cH_3yemH%L)RP*&w0C8`L}sgTg&soh5tmH0}&IC^`oA^eM(|c#l|x-^+ni3{{8|) C!*3M; delta 765 zcmYk3TTc^F6otPtrI(o;6E&y|P(ZNIIdW0dqT&s$f(jy9u~lDcY_ti+gp03z_l?XS zQDh)dqtEJ}F!4wDrtWiSqM6KDYxdr2pSAb=(qDD(?e~Yzzzk0|gHM6K+E}TtH(xiZ zo8QAi&1WConjU%;e*Nj%tCfxQMpdE8Hq)o+r#J3bVK}5YW{Wbb^=HkEHJcsQj8Kf1 z)JTU>gz*;@<^v)|HEG7Av{){eqh(t)tTbvirJ6w6^d@RUWl1;)9Iv5j=cB+tW`FD1n0)33q-(r#hv3`^aLp+l33x>HP zvN^JHHd*AZpk+(aKsk0#nCIAiX_a!UA}sBgUDKY{E;c8c2Q0VOF(GJsq^;+-(2_pZ zYQ{w)ceCEBXy2@O=(2X1Q&Mf!zNkxPhw{H!181lt*G>J`#BVoAQ5Bg-O-4lap~T>0 KVL{-iF!&4odS$5q diff --git a/MuehleButton.java b/MuehleButton.java index 010db75..8ae4a27 100644 --- a/MuehleButton.java +++ b/MuehleButton.java @@ -20,7 +20,11 @@ public class MuehleButton { public Circle circle; - public MuehleButton(int relX, int relY, double absX, double absY, Color color, Game game) { + public int ring; + + public MuehleButton(int ring,int relX, int relY, double absX, double absY, Color color, Game game) { + this.ring = ring; + relativeX = relX; relativeY = relY; diff --git a/MuehleButton.~ava b/MuehleButton.~ava index 1c050de..c61c5ae 100644 --- a/MuehleButton.~ava +++ b/MuehleButton.~ava @@ -20,7 +20,7 @@ public class MuehleButton { public Circle circle; - public MuehleButton(int relX, int relY, double absX, double absY, Color color, Game game) { + public MuehleButton(int ring,int relX, int relY, double absX, double absY, Color color, Game game) { relativeX = relX; relativeY = relY; @@ -44,8 +44,8 @@ public class MuehleButton { EventHandler mouse_click_target = new EventHandler() { public void handle(MouseEvent event) { - System.out.println("Button Clicked!"); - MouseClick(); + System.out.println("Button Clicked!"); + MouseClick(); } }; diff --git a/README.md b/README.md new file mode 100644 index 0000000..815631d --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +Plan + +* check for combination +* rework UI +* refactoring +* win/lose check + + +08.10.2025 + +Working on UI diff --git a/README.~d b/README.~d new file mode 100644 index 0000000..f08ebbe --- /dev/null +++ b/README.~d @@ -0,0 +1,7 @@ +Plan + +* check for combination +* rework UI +* refactoring +* win/lose check +