From 5c1a172496635cf00f9b38d83495267b4de91a7d Mon Sep 17 00:00:00 2001 From: gababababibbo Date: Mon, 9 Jun 2025 11:23:39 +0200 Subject: [PATCH] tessera fatta --- Spirit_Arnaldo_Selvaggio/bin/Cavallo.class | Bin 1554 -> 1808 bytes Spirit_Arnaldo_Selvaggio/bin/Giocatore.class | Bin 1430 -> 1529 bytes Spirit_Arnaldo_Selvaggio/bin/Mappa.class | Bin 240 -> 554 bytes Spirit_Arnaldo_Selvaggio/bin/Partita.class | Bin 246 -> 840 bytes Spirit_Arnaldo_Selvaggio/bin/Tessera.class | Bin 246 -> 417 bytes Spirit_Arnaldo_Selvaggio/src/Cavallo.java | 17 ++++++++++++----- Spirit_Arnaldo_Selvaggio/src/Giocatore.java | 8 +++++++- Spirit_Arnaldo_Selvaggio/src/Mappa.java | 9 ++++++++- Spirit_Arnaldo_Selvaggio/src/Partita.java | 16 +++++++++++++++- Spirit_Arnaldo_Selvaggio/src/Tessera.java | 9 ++++++++- 10 files changed, 50 insertions(+), 9 deletions(-) diff --git a/Spirit_Arnaldo_Selvaggio/bin/Cavallo.class b/Spirit_Arnaldo_Selvaggio/bin/Cavallo.class index 6b799b2e43c14c262bfc7c56fa673ca04ba146cd..7b1580187e07229b81c1d1278a142e4885e8a0aa 100644 GIT binary patch literal 1808 zcmZ`)(Q?~F6g?~3QKP7ho4836Cvj5>wv`ak($dm|l#oy`xP>8|F!W8fg;A?WsVu|5 zGsA!I#0w8FgDKFNegL1sH!#52mFgHrd6Dk!-h1xZbFS<^|M}xNfE_e-Xaf4K^QGha zp^m&j@evoc?*v`@qt+w09Sh`x@X!^QX&xW#$B`FwHw7lzp&v#()nm8Ub7gcs$?M0S zZ|}KJ`YzKZ_q}f5#C>_bG=9F-e4uKb&25=_6!yGtyf9#@Xb2Pzoj48|KV-KpFYw}R zfokm}nUg#91CrkjJFbBoN+yc9Adsuo4|L26l+<+;&7CN6zE)ff%%L<1fkhK%Fe#%Y z69r7jXvKt{M3+pQ!?c0RxT51FW_z*y*lUIM=SQ~hwd_xvpc5YMMb1|}6EEWxfvFA` zjUaZrZp2H~8jX5GV%AKUIBPJnOsq+QM$e5CL8!oV(+k}D{lk_UJ#bn+cV?Pl+wl*a z$dl`IGarB9^{8DlwURoTX?QP@Pw%?%edS}RRzE2fYniZ{nrSlr_}B(YMk92umtt{E zGj#Gy5HDo7A+?`m#t@S62xPw2kQryVn}X(R52Z106F40Q19woG!YO{EtF1xSNus@C458$4>k4J?AJD%h(V5QQN)iNjYE0v?0;4N*{9kGz!q9 z>5MdKxq5RPcxtG4iu<%p#T*2_r+8Mxc|K>j`i>|PXWe>=S?d|*K6{Fb11wl;1C*`x z0hX=Y02M1g@f%hLs9L|G{e8CoSb43A~NkR%J@OozP@_6xTX7P30Ae=N~v~%^x zvCdaAi{HS_jN;08aW%8}7T!#Yw|PlTUQ$VZY_Oqr*QnRJLYPakhDuJPN($W0##$c7 z+F*r!3YHuNsr@FlPVg#o_{OoW66@M2SaRqk)?3)l!m5m8T_@I!Q?TTRBeD3amty%G zQK?rYxAg<&IVcOyaEG7H&hL0f!>8X0QP#iz_b=Hbr>19y-w5bc0k`3Zue6HeLpdp~zZZir_nlArO-#6OE81@~wk9i(89br_nF|AwOv1 zg3-hu;Eyt%r!50V`LL(=KKI^p?mhR}pT9qU1K7e788Hd+w(;Jm*Bu!N3F%`xdfl*V z`t$0sdFV+<*iOTgFkC(l?RlGAes!vuO%zD9CGhR$bpQ-?dDp_3c?T z+wfWm6J#m`WC(E&!DwQPkGz`ykXdjSm!?G=JQ^I`lax<52)C!y5 zc8<&x;uukoMn*!ss8(c*N*M9S@!Q;TUE`zQYYJJ6i_8g@7E5ZS5A0Y$FZzTvt)K@< zVa+Iz18Y{n00vXIiCZ$}BurSI{?@8G`s)+DZdLV{hJEBTc3k5_Q^7on68ewmlx)we znJxz`mP%?#U}_2!T$3o0Gls9x5GwM^I!H>l8lajrdeqWZGc46*2Q19I~WF%z)@A$T7%I*_z4 zK=#rN(GtZ2k(}CdTJE9w)DlCUHNPwtg8~JK^Og4aza&ox#r-e0!Dxzh4E;Q*nt#td z@S9>RjUk@H^gbiu~F)Z+$ zCLsu&AYGbE&JccrR-WKRf-f>U6M$n0%k%(MJP=X~OSBuKt#_KSm@S67NS+Yn>49{* zn?CE$p5dA0OrsI+(Wy$kPP!w17N!RvjQq7c3sa VYQU-wlY5QKPvis0im4Z0c=NmD_eeepAV@>%c# z3VwjU;yT~PicbHx7c0NM7De*HQQf#9kZP&JK*qg@oa%p^rn4J%)ujppud&L6!KMmS zyegnCEba>!>tV;Upd*t;3YLkSK;a)L3t41R5Ew~g0D~q*sr_5oLIIhCGM2_TCRki{ zIs&DI&F_}}4An?fbB+qU?cQnIi}qwYnQz1iUFq-3NG0(PXv9aV%PlzlC9!#-csB(y ztysDzM1P1@E9^zCx1o|!R-e6+41o$e*12v0Eoqz9WTat;9+H7+hv{9zAPOwko{+A+ zAbaqH`~z&gd5dE09(MT!1!BcVl&*v*=k1%%_d6!&nB+Uj(x8CBlcPUMnR(hJN|gCi h`Yw(sOf#~H&0v<&bBwakKAE7I5bVh&S|O^T`UUM(aFGB2 delta 111 zcmZ3*@_~`-)W2Q(7#J8F83ZPBDNk&WVB_RrU}a#N%*<#tIh0Y+i-Ca=2!SF%k{zf} qAIxW9VAa~rz_Af1z{J1>Btg<3rQAT02h3&#(!5|XJ|M}&zz+cS-V3|{ diff --git a/Spirit_Arnaldo_Selvaggio/bin/Partita.class b/Spirit_Arnaldo_Selvaggio/bin/Partita.class index dbd27c96289fd0070e7e88db1187e82a445bed1a..c39465d2ab2de40abf224caa418aed3e6f792271 100644 GIT binary patch literal 840 zcmZuv%Wl&^6g}fOF-Z+gOOg^Ep``>8^T-CVX;i5yf{iJaT18?x38Qo>Hx90i)Nf+N zBB}%uAHYW;&P)tVX=T}S&wZSG?p*)+{rx9^9dtc70^Yt%Qk_Zvuy>{K@+jA_EULUh=57UnzWRW&Z>olXDdRu1AU8L7A0u=#nxOQRJV>|Ee40ip z;1RzqOR_{6C6fE7u~n1z(IR@xHk-_OH76!+6R|}u*jPrYV|_-X8K`Y;lYCETH}Y7K QV+k88!we+wl*mEn5Aox)6#xJL delta 132 zcmX@X_KlJ2)W2Q(7#J8F83ZPBsmih0Waed-*fBCNYiNcsGO#%3r=)T*Ff(xSFt9SP zO}@lvGg+NU*^7aJ5eR`IK$0D(TOZ74U|`kS&cLw|D8R(P1tdYzAf?#C)5w+ diff --git a/Spirit_Arnaldo_Selvaggio/bin/Tessera.class b/Spirit_Arnaldo_Selvaggio/bin/Tessera.class index cba2b7874aa7cb6b90c166f327151e17e1056af2..4765f05294ff5a618a2e44737c83dfbbe6fcbed8 100644 GIT binary patch delta 279 zcmZ8aI|{;35S)z~&BypxuoDsdppB&>SlK98h<%U{Y!Zm}mex6fN3amV!UK39OL5`{ zL>@b{^LBRjE{B+Ydt9yn#;AmPqn3Bq{>t9^fin*r&)>2Y7}Lr3cMx`~s$n9DR5%;< zEPJzYT+d!O tessere = new ArrayDeque<>(4); - int posizione; - boolean matto; + private String nome; + private String colore; + private Deque tessere = new ArrayDeque<>(); + private int posizione; + private boolean matto; public Cavallo(String nome, String colore){ this.nome = nome; this.colore = colore; this.matto = false; this.posizione = RandomDraws.drawInteger(1, 3); + setTessere(); } public void CavalloMatto(String nome, String colore){ @@ -22,6 +23,7 @@ public class Cavallo { this.colore = colore; this.matto = true; this.posizione = RandomDraws.drawInteger(14, 16); + setTessere(); } public String getNome() { @@ -49,5 +51,10 @@ public class Cavallo { public void setMatto(boolean matto) { this.matto = matto; } + public void setTessere(){ + for(int i = 0; i < 4; i++){ + tessere.add(new Tessera()); + } + } } diff --git a/Spirit_Arnaldo_Selvaggio/src/Giocatore.java b/Spirit_Arnaldo_Selvaggio/src/Giocatore.java index fc1175d..acbd92a 100644 --- a/Spirit_Arnaldo_Selvaggio/src/Giocatore.java +++ b/Spirit_Arnaldo_Selvaggio/src/Giocatore.java @@ -14,6 +14,8 @@ public class Giocatore { tesseraTifoInveimento = true; } + + //getters public String getNome() { return nome; } @@ -30,7 +32,7 @@ public class Giocatore { return tesseraTifoInveimento; } - + //setters public void setNome(String nome) { this.nome = nome; } @@ -46,4 +48,8 @@ public class Giocatore { public void setTesseraTifoInveimento(boolean tesseraTifoInveimento) { this.tesseraTifoInveimento = tesseraTifoInveimento; } + + public void convertiTessereSbleuro(){ + this.sbleuri += this.tessereSbleuri; + } } diff --git a/Spirit_Arnaldo_Selvaggio/src/Mappa.java b/Spirit_Arnaldo_Selvaggio/src/Mappa.java index db23573..0dde7d9 100644 --- a/Spirit_Arnaldo_Selvaggio/src/Mappa.java +++ b/Spirit_Arnaldo_Selvaggio/src/Mappa.java @@ -1,3 +1,10 @@ -public class Mappa { +import java.util.ArrayList; +public class Mappa { + private ArrayList caselle = new ArrayList<>(); + Mappa(){ + for(int i = 0; i < 17; i++){ + caselle.add(i, new Posizione()); + } + } } diff --git a/Spirit_Arnaldo_Selvaggio/src/Partita.java b/Spirit_Arnaldo_Selvaggio/src/Partita.java index 27c1745..914e4cb 100644 --- a/Spirit_Arnaldo_Selvaggio/src/Partita.java +++ b/Spirit_Arnaldo_Selvaggio/src/Partita.java @@ -1,3 +1,17 @@ -public class Partita { +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Deque; +public class Partita { + private Deque giocatori = new ArrayDeque<>(); + private ArrayList cavalli; + private Mappa mappa; + private Pila pila; + + public Partita(Deque giocatori, ArrayList cavalli, Mappa mappa, Pila pila){ + this.giocatori = giocatori; + this.cavalli = cavalli; + this.mappa = mappa; + this.pila = pila; + } } diff --git a/Spirit_Arnaldo_Selvaggio/src/Tessera.java b/Spirit_Arnaldo_Selvaggio/src/Tessera.java index d3444e5..1c17641 100644 --- a/Spirit_Arnaldo_Selvaggio/src/Tessera.java +++ b/Spirit_Arnaldo_Selvaggio/src/Tessera.java @@ -1,3 +1,10 @@ public class Tessera { - + private Giocatore giocatorePrenotato; + + public Tessera(){ + + } + public void assegnaTessera(Giocatore g){ + this.giocatorePrenotato = g; + } }