From 73f362d715d207fb78b77bb635595f604a43ee64 Mon Sep 17 00:00:00 2001 From: gababababibbo Date: Mon, 9 Jun 2025 17:16:23 +0200 Subject: [PATCH] inizioTappa finito --- Spirit_Arnaldo_Selvaggio/bin/Carta.class | Bin 318 -> 450 bytes Spirit_Arnaldo_Selvaggio/bin/Cavallo.class | Bin 3098 -> 3196 bytes Spirit_Arnaldo_Selvaggio/bin/Giocatore.class | Bin 2950 -> 3381 bytes Spirit_Arnaldo_Selvaggio/bin/Input.class | Bin 1223 -> 1412 bytes Spirit_Arnaldo_Selvaggio/bin/Main.class | Bin 2587 -> 2634 bytes Spirit_Arnaldo_Selvaggio/bin/Partita.class | Bin 3774 -> 4501 bytes Spirit_Arnaldo_Selvaggio/bin/Pila.class | Bin 440 -> 1448 bytes Spirit_Arnaldo_Selvaggio/src/Carta.java | 7 ++ Spirit_Arnaldo_Selvaggio/src/Cavallo.java | 5 ++ Spirit_Arnaldo_Selvaggio/src/Giocatore.java | 14 ++++ Spirit_Arnaldo_Selvaggio/src/Input.java | 5 ++ Spirit_Arnaldo_Selvaggio/src/Main.java | 2 + Spirit_Arnaldo_Selvaggio/src/Partita.java | 71 ++++++++++++------- Spirit_Arnaldo_Selvaggio/src/Pila.java | 30 +++++++- 14 files changed, 106 insertions(+), 28 deletions(-) diff --git a/Spirit_Arnaldo_Selvaggio/bin/Carta.class b/Spirit_Arnaldo_Selvaggio/bin/Carta.class index 87b7773b8fd418fa65c4ee82bd2ad99028bb638d..ca91e7b25778fc6f535a162672aeb43770533dac 100644 GIT binary patch literal 450 zcmZvY%}T>S6ot>UNn@w^sa5OG&RwlwA3zZ_P&YvrO2OqchB_rS5L4gFg%lKg03S*` zGmWlfVCLRCXTEdqe0{%v0=U3|hlYR~tFlra9D(j!y{J*H7PHaKbe^S^fS0nA=Y>E! ziPzyN&`GX-6W+AW^g>tX0?onEM8JuQhfJc0z(*U>LqufFkq8mAA<*;T zq9qU|dXZf(pQc%Pr=~gCy@WRTM3vg)bZ$CI)^W$pAdiVb F1OR>G7B>I@ diff --git a/Spirit_Arnaldo_Selvaggio/bin/Cavallo.class b/Spirit_Arnaldo_Selvaggio/bin/Cavallo.class index 42cd111cd7602400d386219eef9a32735a844164..b456c2e551efc61ad140931d5bf45b1427dcf632 100644 GIT binary patch delta 1114 zcmZuwJ8#oa7(F*h?b>l3&C_|27d6dwfS`s)leCo@#9M&GBb0?ofDmG!GfV#f1ISZ5 zv2|epK^m$ubz@`THy|-EFt8!f?_O7lWmvASKcDZMbH97MW&SZ=?VG{5#$AR`|M{cG zI)X?Uh+{@Y#xYo~nnp?kL(af7G_flfn1Uj9B?BrHXN&b-@3#`7a@0T+F&!4>R2*~e zv2w5h?z~`mrD?!G2B-c52AtI83yV$7vL>L{(v?EsZXd8CG?k zsB5+SJF2>eP^8g{$Mlpi?fg&+yy%D3{V<|oIEMx2mzw1ETOX_SUw8*y0k75l@P;4m zyqPX+n7deH@MD`EtUjLd3i{+n+~X1*FF;R)i$PEBOqbOb4dj$$$hfFO2EvOx5eLJ0 zm&@sBam#b*F2Ov(+I|9OU9&9PuXTo?Xa9kI)~t=XAG$!$jvq>g5Vk1F($?j1RPW1o zit08Z{3B>iR~QEF?mENf-=CAzh`azj%FrSOwnvFsM$DH}XI-Cdn|rvmYL9Sd7lQx> zeupbG+`h+QQfB3gZguVA8U@!Td3y&B_zoUUdZVNZT!4;?l+sJGzanc{+0Vl#=RLyD l0+{r=^S(-_zUI+Q$iA21Zdv?@F6IV#yXnECB<6d#eE?+|beaGF delta 1134 zcmZuwO;1xn6g|^V`ua)>Eu|l{g$gZwtvu8ckOBru)Iws6MjPBnk!mUkT8qY2cdlHR zbcKI_jSG#IO4zw`%YuKQ8@DEUXQq+n(apR&H|N}Q@167h1U>}be{bAolXV75es{C1 zzzm-X4+a>_@pfw(F?bNI7aQbKPiv>W`o6+m#LdPHAUz_t|o)T6+Cb#TXI{&P}=$c53A( zfB1-Yg!9l?HK;G76MHKwR96< zEz?9KvJbyzX(Fb1dOeqsOb{B>ln5;{Rp{T%d!ph+Y2 z5AWQCz9qgxF7e}D4&(o_B9 zCSaOwGvusk^3yEb+&9t?Au;KRGL{V<>b?fa=8!|X3@hkd)Rx_sQy6H zqB1CmXxMLxXsfp<4s6ce=i6(oQ*3|qYad_FufPZwciM|PUt=2Cn4Zb%3N1JmidXJK zUN#kOdtPf=ODR33uT+_M!dldaLP?D%J3jIZD4N!+bjr#uWsHQ8SuoOBL!-dHmpz56 z%=A*ktfPl$lP&!ly5{tbB3UHJe2 delta 36 scmdlg)h5n$>ff$?3=9m843!(XcC${dV~c0x-+YfPhLx3pfr+640PST8=>Px# diff --git a/Spirit_Arnaldo_Selvaggio/bin/Input.class b/Spirit_Arnaldo_Selvaggio/bin/Input.class index d91e761b5ae85f4734acb4c1f4717500920705e5..2ffd9ec2136c5a74d804b0a7f499e84467e54bde 100644 GIT binary patch delta 198 zcmX@k*}~0r>ff$?3=9m84E7tjo-^eNmSyH8XO`p_r3R!HrKIMSq;fFWFfxRemF8zE znD%F0i-)0~>?l Nff$?3=9m83^p6No-<8OU{+>i-Q2>wmXVc#fr-Hy0O8vT6aWAK diff --git a/Spirit_Arnaldo_Selvaggio/bin/Main.class b/Spirit_Arnaldo_Selvaggio/bin/Main.class index 0d1774fc6f7e58b78a88b451bc4653ad584a000c..902bb8c8696538e2b142f35dc4abdf06e9d571f4 100644 GIT binary patch delta 689 zcmYL_-%C?*7{)*EHh0|F(VgXtP8f(prVH0EB=o8*yiuqiMMdzaE2p!~?aVZ*mD+Fn zVe7Z1S&`QwC?yo#h5tlBH(hnzmG+%M!Iv-3`|>>R^FHrPXg#E_Z+!d&9Od1T{>v3^ z$2RDuNAM3O(oV{5wv$O)(DycNq57&8olc?#XLB2_9o{~J82!02_nw_`!Pgi|^w>@! z71bHwyg>m8p?dnemCLwGB11H5q=Z1fJ#0rZPAncd9v#X=H5@@ZX{Vf+W9y_D&MPnE zR^9a#X+{k$;#I12Pc-h>4N4o2Me`PEE*V^24taivWOKg@624`;Yy(+bPI_CUvnaem zmsPw%Z*9O`Yc5irFV58kE&mz=ZC23IR~h_3(naf}DWzsnFYkOw@(FAelE%_9tHqJtcdDUvgs<_S+JRzXhi zOlbqkwsLEVsX~?ToEHRDBtI{i!DLoNC|8S)NKM}Mm9qV7HuukLUXfobS{I&8722<{ spkd~|_(CNm8iz#<*yJn0|NV-5f9nltv}&|#bc*7YsVluvlU%(0148eUvH$=8 delta 636 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 delta 100 zcmZ3%y@Q$S)W2Q(7#J8F8Du7M`ANz6WF?j*>X(*e=IFbm7M7;k_&5Uva&qz~7R;Lb xg2{=Iak4hEgC+|D3j-?yKLZ= 17){ - dado = 5; - } - } + break; case 2: - int i = giocatori.getFirst().posizionaTesseraTifoInveimento(mappa); - mappa.getCasella(i).setGiocatoreTessera(giocatori.getFirst()); + int x = giocatori.getFirst().posizionaTesseraTifoInveimento(mappa); + mappa.getCasella(x).setGiocatoreTessera(giocatori.getFirst()); giocatori.addLast(giocatori.getFirst()); giocatori.removeFirst(); break; @@ -69,28 +65,34 @@ public class Partita { new Output().erroreTesserePiene(); } }while(checkTesserePiene == true); - switch(cavalloScelto){ - case 1: - giocatori.getFirst().scommettiCavallo(cavalli.get(cavalloScelto-1)); - break; - case 2: - giocatori.getFirst().scommettiCavallo(cavalli.get(cavalloScelto-1)); - break; - case 3: - giocatori.getFirst().scommettiCavallo(cavalli.get(cavalloScelto-1)); - break; - case 4: - giocatori.getFirst().scommettiCavallo(cavalli.get(cavalloScelto-1)); - break; - case 5: - giocatori.getFirst().scommettiCavallo(cavalli.get(cavalloScelto-1)); - break; - } - - + giocatori.getFirst().scommettiCavallo(cavalli.get(cavalloScelto-1)); break; case 4: + int cartaCavallo = 0; + boolean checkCartaUsata = false; + do{ + cartaCavallo = menu2.choose(); + for(int i = 0; i < pila.vincitoriSize(); i ++){ + if(pila.getCartaVincitore(i).equals(giocatori.getFirst().getCarta(cartaCavallo))){ + checkCartaUsata = true; + System.out.println("seleziona una carta che non hai mai usato "); + break; + } + } + if(checkCartaUsata == false){ + for(int i = 0; i < pila.perdentiSize(); i++){ + if(pila.getCartaPerdente(i).equals(giocatori.getFirst().getCarta(cartaCavallo))){ + checkCartaUsata = true; + System.out.println("seleziona una carta che non hai mai usato "); + break; + } + } + + } + + giocatori.getFirst().giocaCasa(cartaCavallo, pila); + }while(checkCartaUsata == true); break; case 5: @@ -101,8 +103,25 @@ public class Partita { new Output().visualizzaSoldi(giocatori); break; + + } + for(int i = 0; i < cavalli.size(); i++){ + if(cavalli.get(i).getPosizione() >= 17){ + finePartita(); + } + } }while(dado < 5); } + + public void fineTappa(){ + + } + + public void finePartita(){ + + } + + } diff --git a/Spirit_Arnaldo_Selvaggio/src/Pila.java b/Spirit_Arnaldo_Selvaggio/src/Pila.java index b06b149..c17eb5d 100644 --- a/Spirit_Arnaldo_Selvaggio/src/Pila.java +++ b/Spirit_Arnaldo_Selvaggio/src/Pila.java @@ -1,7 +1,33 @@ import java.util.ArrayDeque; +import java.util.ArrayList; import java.util.Deque; public class Pila { - private Deque vincitori = new ArrayDeque<>(); - private Deque perdenti = new ArrayDeque<>(); + private Deque vincitori = new ArrayDeque<>(); + private Deque perdenti = new ArrayDeque<>(); + + public void aggiungiVincitori(Carta carta){ + vincitori.addLast(carta); + } + public void aggiungiPerdenti(Carta carta){ + perdenti.addLast(carta); + } + + public int vincitoriSize(){ + return vincitori.size(); + } + + public int perdentiSize(){ + return perdenti.size(); + } + + public Carta getCartaVincitore(int i){ + ArrayList vincitoriArray = new ArrayList<>(vincitori); + return vincitoriArray.get(i); + } + + public Carta getCartaPerdente(int i){ + ArrayList perdentiArray = new ArrayList<>(perdenti); + return perdentiArray.get(i); + } }