From 6f14cb6657931bd5a9f2804a8d809d767774c772 Mon Sep 17 00:00:00 2001 From: gababababibbo Date: Mon, 9 Jun 2025 11:57:01 +0200 Subject: [PATCH] Mappa fatta? --- Spirit_Arnaldo_Selvaggio/bin/Mappa.class | Bin 554 -> 1340 bytes Spirit_Arnaldo_Selvaggio/bin/Output.class | Bin 243 -> 355 bytes Spirit_Arnaldo_Selvaggio/bin/Posizione.class | Bin 252 -> 1638 bytes Spirit_Arnaldo_Selvaggio/src/Cavallo.java | 2 +- Spirit_Arnaldo_Selvaggio/src/Mappa.java | 12 +++++++ Spirit_Arnaldo_Selvaggio/src/Output.java | 2 ++ Spirit_Arnaldo_Selvaggio/src/Partita.java | 2 +- Spirit_Arnaldo_Selvaggio/src/Posizione.java | 35 ++++++++++++++++++- 8 files changed, 50 insertions(+), 3 deletions(-) diff --git a/Spirit_Arnaldo_Selvaggio/bin/Mappa.class b/Spirit_Arnaldo_Selvaggio/bin/Mappa.class index d9eda55a8d0e67a6a11b4af2de57d04b88b75952..c26cbc36171bda23129455d1e7a5ff9f2fb5133d 100644 GIT binary patch literal 1340 zcmaJ=T~8B16g{&oY+1LIwtUEkhzeK=SieOJDpb)X>qk<8F+L6L1QyoaW_L=0&%7A_ zfUiFJs)<4ZiSgNA;k&;<@lJOmB@ok0XXos>_ndp@?vFov-vG?xu?~%)?Fp~fxsEtP z*E-+i1&6zgz`XxGtA z+W#^e$RepIeI`z$pOW)hjiEPJ4lT75RaB}e%XY=n#_JW~FYy&sU&ivP+*#(ntBJ<3qRc1(5B(H7|8W9uHt4QB=R~fo<6D^t{T1;S+0m|UGiHpdQ!Bs*1 z?a7r}*8)jY|xDula^3d2W@<7q(oZr$BO7lE0bUamC|Et59T1 z8MG@l#12i%3TkDM2VZz7UtvMnX zwLEX5Q7<0%+=3hlT-vIO6X>s6_|c`bwl7Li;*L|Xr6{J_aVLR!>KsAU(K`EMYx6=-p;)uq*xH;MZpgjA4NO2PidY#p#zKiEa|O zK>HL44APt4Fgb>BhE8e1hH;jpN9fcE?SKL_9gN05O(@NDWa}N}SN5kf7p&OaM+{CX zFGD*R`;P1mCiXB1Slb#KQuq!E9}a#_exiWTRxi~IBO;VFtHpPZ0MWt@~J@lj>s$5Ag{7e*x*qJ0<`C delta 108 zcmdnPwTgx7)W2Q(7#J8F8I(72c{7@D1?QI*C8xS&=A<$*aQP+{6eQ|pC6*;JC^9fI zFas4bGB7c)GOz(@b|8<5frEi@@)PDDQC0>PAmj(ihyZ1jfwT?-=VWgdQ&x~FB>*-H B5+wit diff --git a/Spirit_Arnaldo_Selvaggio/bin/Output.class b/Spirit_Arnaldo_Selvaggio/bin/Output.class index 01ec038c78c0e9ba1e26baeeb4dcdfcd8b8f165a..52714bc23cf4a4aed0c128eaf9768aac1b352259 100644 GIT binary patch delta 142 zcmey&_?U_7)W2Q(7#J8F8AK*>)oO9)<`^-E#V4VmR;PvVFsW5 zBYdn+ebpI-89L+ixqnFC`XBh~+aE2VWSmYW_wIi8oO93l&Ug0NKZkz;SirX$5(0yF zUEliAaviB5C6Ie)?wVEGbT+DY)*i}^5*Sy~_oZjHt?%8Yvn#D_=_pq~GzGK{&28Hf z7&SuAuCnav4f#V?))>2GZ8)atdQ#xx>*w=EBlLA^b(#*$TaKmb0?E?Usz9pYuFDLP z$m$q^u3=Q*^w9+io@efbw`7n*b`U((p&>1hH7rN2bhp=}*EZK|-kdkwj%lx&o)x^u zU`lOTzQB<2s(dDqR&Gmqmb1ZdrKu?4kctScrE!sEmxJpjb)3RLoIhXsqR~9lTW@f9mPwolum}~6Ftwc1r3)4#$Kz`uzZz45$^?LlmyPl0YkDIu5GhV z>|kwbHLxn{n8pm5+>k-{O3mK8qNdg~%(8iL12U*!PRIMWK#Wc+?zYS$fe(VpJ`}j# zC;vC9D9Gj`9UtR5J4%(Y8EkJL8$YDk44QK!xR_-DJyuoNW|k1ygw=*nzz5qUD7!Pq zo4dF3vcZLZPRBJj+)`#|YuVfhHKAegnEYQVA=7fZUPmrjftE&I$z?Xkn+}Vvt5}V> zvn8rlMvPtee>Fb$mg$^SRyS0ZA8oKZ=fy##+8!|;jI zPjoPR&Jbsw(76s1S){e#o+}?v66lVY~sP7$wVyXNU#f^ubx2 zBV>rYOXLZP4+xDN;L38c{ut+` zXD0SB^%RwTR1a~LCO;*`#LPaf{qpbg>0cQ)g&?O{RsjB!tYL^5=9$?zMlr#sBG)-g z;uKGAjtz} QvjS;euoxeZWMbe40Kpg#OaK4? diff --git a/Spirit_Arnaldo_Selvaggio/src/Cavallo.java b/Spirit_Arnaldo_Selvaggio/src/Cavallo.java index 1ce4c5f..6e6c997 100644 --- a/Spirit_Arnaldo_Selvaggio/src/Cavallo.java +++ b/Spirit_Arnaldo_Selvaggio/src/Cavallo.java @@ -6,7 +6,7 @@ import it.kibo.fp.lib.RandomDraws; public class Cavallo { private String nome; private String colore; - private Deque tessere = new ArrayDeque<>(); + private Deque tessere = new ArrayDeque(); private int posizione; private boolean matto; diff --git a/Spirit_Arnaldo_Selvaggio/src/Mappa.java b/Spirit_Arnaldo_Selvaggio/src/Mappa.java index 0dde7d9..d301df4 100644 --- a/Spirit_Arnaldo_Selvaggio/src/Mappa.java +++ b/Spirit_Arnaldo_Selvaggio/src/Mappa.java @@ -2,9 +2,21 @@ 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()); } } + + public String toString(){ + String stringa =""; + + for(int i = 0; i < caselle.size(); i++){ + stringa += caselle.get(i).toString() + "\n"; + } + + return stringa; + } + } diff --git a/Spirit_Arnaldo_Selvaggio/src/Output.java b/Spirit_Arnaldo_Selvaggio/src/Output.java index a471c3d..e6a34ba 100644 --- a/Spirit_Arnaldo_Selvaggio/src/Output.java +++ b/Spirit_Arnaldo_Selvaggio/src/Output.java @@ -1,3 +1,5 @@ public class Output { + public void mostraMappa (Mappa mappa){ + } } diff --git a/Spirit_Arnaldo_Selvaggio/src/Partita.java b/Spirit_Arnaldo_Selvaggio/src/Partita.java index 914e4cb..ff1ffa2 100644 --- a/Spirit_Arnaldo_Selvaggio/src/Partita.java +++ b/Spirit_Arnaldo_Selvaggio/src/Partita.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.Deque; public class Partita { - private Deque giocatori = new ArrayDeque<>(); + private Deque giocatori = new ArrayDeque(); private ArrayList cavalli; private Mappa mappa; private Pila pila; diff --git a/Spirit_Arnaldo_Selvaggio/src/Posizione.java b/Spirit_Arnaldo_Selvaggio/src/Posizione.java index fc42ada..cab2690 100644 --- a/Spirit_Arnaldo_Selvaggio/src/Posizione.java +++ b/Spirit_Arnaldo_Selvaggio/src/Posizione.java @@ -1,3 +1,36 @@ -public class Posizione { +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Deque; +import java.util.Collections; +public class Posizione { + private int tesseraTifoInveimento; + private Deque cavalli = new ArrayDeque(); + + public String toString(){ + String stringa="*"; + + if(tesseraTifoInveimento == 1){ + stringa += "tifo"; + } + else{ + if(tesseraTifoInveimento == -1){ + stringa += "inveimento"; + } + } + + /*if(cavalli.size() > 0){ + for(int i = 0; i < cavalli.size(); i++){ + stringa += cavalli.getFirst().getNome() + " ---> "; + cavalli.add(cavalli.getFirst()); + cavalli.removeFirst(); + } + }*/ + ArrayList cavalliArray = new ArrayList(cavalli); + for(int i = 0; i < cavalliArray.size(); i ++){ + stringa += cavalliArray.get(i).getNome() + " ---> "; + } + + return stringa; + } }