From 1b12294c685c40273d82a5940ba7f43c333d2bf7 Mon Sep 17 00:00:00 2001 From: gababababibbo Date: Mon, 9 Jun 2025 12:29:29 +0200 Subject: [PATCH] progress --- Spirit_Arnaldo_Selvaggio/bin/Cavallo.class | Bin 1808 -> 1768 bytes Spirit_Arnaldo_Selvaggio/bin/Main.class | Bin 237 -> 1012 bytes Spirit_Arnaldo_Selvaggio/bin/Mappa.class | Bin 1340 -> 1340 bytes Spirit_Arnaldo_Selvaggio/bin/Output.class | Bin 355 -> 623 bytes Spirit_Arnaldo_Selvaggio/bin/Partita.class | Bin 840 -> 885 bytes Spirit_Arnaldo_Selvaggio/bin/Posizione.class | Bin 1638 -> 1638 bytes Spirit_Arnaldo_Selvaggio/src/Cavallo.java | 18 ++++++++---------- Spirit_Arnaldo_Selvaggio/src/Input.java | 2 +- Spirit_Arnaldo_Selvaggio/src/Main.java | 16 ++++++++++++++++ Spirit_Arnaldo_Selvaggio/src/Mappa.java | 6 ++++++ Spirit_Arnaldo_Selvaggio/src/Output.java | 9 +++++++++ Spirit_Arnaldo_Selvaggio/src/Partita.java | 4 ++-- Spirit_Arnaldo_Selvaggio/src/Posizione.java | 5 ++--- 13 files changed, 44 insertions(+), 16 deletions(-) diff --git a/Spirit_Arnaldo_Selvaggio/bin/Cavallo.class b/Spirit_Arnaldo_Selvaggio/bin/Cavallo.class index 7b1580187e07229b81c1d1278a142e4885e8a0aa..8345308bbc3944be409891a085b94c169eb4476a 100644 GIT binary patch delta 571 zcmYLFOHUI~7(I8MP})-3LTTg?NgH7TOeq%d0m?&E5E24}z-}ND0+fbFaqGq(Kyz0t zS&?XB;sQh$`~ckO#vS{{jfqPl*3-+v%;cNzeCNz}&b^1>awu^5_sa!SCI}6@w-nY>&5ZUxzdv4w#^^w2m=w{6#$Qt63TGS(qIBSvy zt+eQ%MGs=gpb{Zf(&EmxuviV$fo$YHP!Srn(H*>F8r0hgRVx!-lYt zq*4 znRFF=hRJ*&(@mzQ%E(`4jXr`W@|shZ(~QywmA}AKjLJzXZDz^zlNrv8Eq}tqXFSue v^j3&F_HpIs{~L>{ljkTN;GN{q#*kN5qGejGs~**c_6MejG0Q7L4Kx1$t5RhY delta 673 zcmZuuO-~b16g~6iqtK6`*rs$^?1*V;m{t%}3RR$hpz^Vj#IQ1>>B=UkG;T35VP|6V z{)H=9j36Xz*s(JDBV^+bAOYiG{x6+O+jd_zPVX{?}jmhWCZhA2;s5(DU#|Up2$BU zZ^oWC-Pdnc-M4G*t43XRt1q@9P!LBi>kUe6L*)U=&Mp$p0aEL`NPDoHl83BQ_Hfft zJ=l(B>|ww|(fN*{9nK4sS#P6@H3kjc=z)nOt3~!4`HSQ)A%Q!bxYgFcFh;icq#Se@ zwBX-Dyb0d#c1*pyFlAqIq4_T2W;}kKj|?e*6iNFKMmlhjL54oEm-KC4zu%XK-O;x@ z`lA?=i(1~w1uN0Oo$jx2Uco)0pR{~p;3_I>nk9d0y;lAz#?5h5g}4QjFb?qWy^i{dgMCJ!3ZnaRyyUkb8+wf#v@cNnF4H diff --git a/Spirit_Arnaldo_Selvaggio/bin/Main.class b/Spirit_Arnaldo_Selvaggio/bin/Main.class index 3ba3d6c03593ba0e526b12fc193d9d2db5e31ca3..4ea492449258ea6f56b0f60d5d9157c217e0dbea 100644 GIT binary patch literal 1012 zcmZuwT~pIQ6g}IfO;SNHC<1;W3N0!XDWHX-76f&|mpGk4$6-PV?P6$3n!xz8e32QM z@dx;$9M7gOeZYtA-gEcl+;i`4|NQ;+8^9ZU(2)?(Rvp>Up$YUJILA)ja~ie$`tE^S z4F%HkvLV9-fn+vUA$QT=b2CW7>_Q4@fgW2n+_mU%*9|^7yPhjx*?!gWDo!93K2K_4 zUACxZt6Fo^Ipi+TpZ#KYYHo#rY}Dp*6&=?E^hKKSJl{Yc`D@NeXyArG>Z9Lk`5E-$ zrm`>~kj-A!xSaW%s~8xfg);lAQuQ`_DtnQEyA<8uZev4WLvMMco&oMBrxKWMCCyF536(&ena`yMX8+fK#a06e*b0$}vX4A=F z5~hx6ey|>e%_z*E08=e5y6{rX)(T{`F5On>tVqr@^aDv5C#Z3feg7GpfKhGFY*N6q z&*#T!U!+<4BAn`kg-%E_7lfHkI7`ci$}%s77s!B`X+Jhimfg0`TxQFUf~vbL)jKfN zRZpnf#V|N)zBnMki0_80PL$^^xTnTXVf=`XGhEd%_`AZjt4-kEO=RLKdYIwIVuV79 zeR780ZOgK*Cr{CD$6(O9rNC+o?pXH}Sc}21HKIUKi_s%%EJmpq<*dh=I!njssg;kB zeul~IQ%n_&GZYxi6wN{NCuTc#Ct{;X8q_dEQ)6sknidyfV3U@2XtT}+j>tIXyH#!N zx2>ayIihYHU>+qlHiWNOV3eTB23|2rQmc&Dj5I11_^&Oo#wJFYEwR!L2AD6gUY(;^ U!dq57VtyGbtS#`4`U$-M2P{>^9smFU delta 38 tcmeyu{+5yJ)W2Q(7#J8F83ZPBRZfm%QetGBT*G9?$;iM56lP-J2LSar2_pai diff --git a/Spirit_Arnaldo_Selvaggio/bin/Mappa.class b/Spirit_Arnaldo_Selvaggio/bin/Mappa.class index c26cbc36171bda23129455d1e7a5ff9f2fb5133d..f490ae6ac69790b5ac55d23ea0ad92b10ae7ec08 100644 GIT binary patch delta 29 jcmdnPwTElNSr$P-24)6f1`Y-h23a7j%^*Jc9!nemUd9Ed delta 29 jcmdnPwTElNSr$QF24)6+1`Y-R23a7j%^*Da9!nemUBU&E diff --git a/Spirit_Arnaldo_Selvaggio/bin/Output.class b/Spirit_Arnaldo_Selvaggio/bin/Output.class index 52714bc23cf4a4aed0c128eaf9768aac1b352259..0f583418d26fe78c6c851a52d4fec4e8c33c48e8 100644 GIT binary patch delta 385 zcmZvX%Syvg5QhIrT5~bIm|E+l+NcQXCJPrXiimF9xKIM_4{eA?+C-95!G(0?1C&0A zE)-n&0KSF~;2VfjLlwl${B!yFX69Y{DA;eGFRuWOusO2thHff5mom(hIFU(5s3esZ zs&Ea=5vo_>M)*AuM}Badsj%;$hIxXX3>2Y$`aPD3f0oKv1u6|izincHuysBVv65ai zWqRE(lie^CagsOF@X)idc#LHOON81#C>k$>V{)EO~hzS$c eFQm-Hl(LGoag#hMjSr|%X~AO>VV!9jHogEnbxCLd delta 135 zcmaFQ@|cP1)W2Q(7#J8F8AK*>)lT+e40K^)U}RurU;~ouKnZ;y%?PAfwYD>GYy>ix z7`T8WNSXnNxq&1PL;;ZI1&i@9@K4rYQc!0B%ZdSYfK)y>ou$pVi5 RW*J5O?-$fFSWQ#(e*vi$Bv$|c delta 233 zcmX|*OAf(c6otQ1Mb%>DRpz9xl0KXT4rI#GNEl& z30)Jq3H?}$S%#Wj@|q=FJgRD}QzoP$y~>yxBf0Bev3Mk=6XKo@TcmHu2yG(!j!Laq WQP^c7-1wR{Q1}N*(j2C8Gt52>kQkN# diff --git a/Spirit_Arnaldo_Selvaggio/bin/Posizione.class b/Spirit_Arnaldo_Selvaggio/bin/Posizione.class index 671533a8817ef999a71542a14af233099357f68e..05ae1883e3dbef2b05f8d3c59c1eb1e38171d61a 100644 GIT binary patch delta 67 zcmaFH^NeSM3@axq0}BH?13v@nWL4H~O)dsz1|9}(23`gs20jK+1_1_H20;cD1{nqe UAj_0Nj=>#B2Qes4zRB7P05Hf1tpET3 delta 67 zcmaFH^NeSM3@axa0}BHO13v@XWL4H~O>PEe23`hk20jKMpqMCwAcHKBr2-@k7~~jC R8RQw tessere = new ArrayDeque(); + private Deque tessere = new ArrayDeque<>(); private int posizione; private boolean matto; - public Cavallo(String nome, String colore){ + public Cavallo(String nome, String colore, boolean m){ this.nome = nome; this.colore = colore; + if (m == true){ + this.matto = true; + this.posizione = RandomDraws.drawInteger(14, 16); + } + else{ this.matto = false; this.posizione = RandomDraws.drawInteger(1, 3); - setTessere(); - } - - public void CavalloMatto(String nome, String colore){ - this.nome = nome; - this.colore = colore; - this.matto = true; - this.posizione = RandomDraws.drawInteger(14, 16); + } setTessere(); } diff --git a/Spirit_Arnaldo_Selvaggio/src/Input.java b/Spirit_Arnaldo_Selvaggio/src/Input.java index 0cf4852..d98c900 100644 --- a/Spirit_Arnaldo_Selvaggio/src/Input.java +++ b/Spirit_Arnaldo_Selvaggio/src/Input.java @@ -1,3 +1,3 @@ public class Input { - + } diff --git a/Spirit_Arnaldo_Selvaggio/src/Main.java b/Spirit_Arnaldo_Selvaggio/src/Main.java index 9b4320d..6beef37 100644 --- a/Spirit_Arnaldo_Selvaggio/src/Main.java +++ b/Spirit_Arnaldo_Selvaggio/src/Main.java @@ -1,3 +1,19 @@ public class Main { + public static void main(String[] args) { + Cavallo cavallo1 = new Cavallo("Nawt","Rosso", false); + Cavallo cavallo2 = new Cavallo("Blanco","Blu", false); + Cavallo cavallo3 = new Cavallo("Pound","Giallo", false); + Cavallo cavallo4 = new Cavallo("Bang","Verde", false); + Cavallo cavallo5 = new Cavallo("Bupkus","Viola", false); + Cavallo cavallo6 = new Cavallo("Bugs","Bianco", true); + Cavallo cavallo7 = new Cavallo("Daffy","Nero", true); + Mappa mappa = new Mappa(); + Output output = new Output(); + output.richiestaGiocatori(); + + + } } + + diff --git a/Spirit_Arnaldo_Selvaggio/src/Mappa.java b/Spirit_Arnaldo_Selvaggio/src/Mappa.java index d301df4..98586b9 100644 --- a/Spirit_Arnaldo_Selvaggio/src/Mappa.java +++ b/Spirit_Arnaldo_Selvaggio/src/Mappa.java @@ -9,6 +9,10 @@ public class Mappa { } } + /*public void setCasella(Posizione p, int i){ + this.caselle.get(i)=Posizione(p); + }*/ + public String toString(){ String stringa =""; @@ -19,4 +23,6 @@ public class Mappa { return stringa; } + + } diff --git a/Spirit_Arnaldo_Selvaggio/src/Output.java b/Spirit_Arnaldo_Selvaggio/src/Output.java index e6a34ba..bce2422 100644 --- a/Spirit_Arnaldo_Selvaggio/src/Output.java +++ b/Spirit_Arnaldo_Selvaggio/src/Output.java @@ -1,4 +1,13 @@ public class Output { + + public Output(){ + + } + + public void richiestaGiocatori(){ + System.out.println("Quanti giocatori desiderano giocare? "); + } + public void mostraMappa (Mappa mappa){ } diff --git a/Spirit_Arnaldo_Selvaggio/src/Partita.java b/Spirit_Arnaldo_Selvaggio/src/Partita.java index ff1ffa2..24831af 100644 --- a/Spirit_Arnaldo_Selvaggio/src/Partita.java +++ b/Spirit_Arnaldo_Selvaggio/src/Partita.java @@ -3,8 +3,8 @@ import java.util.ArrayList; import java.util.Deque; public class Partita { - private Deque giocatori = new ArrayDeque(); - private ArrayList cavalli; + private Deque giocatori = new ArrayDeque<>(); + private ArrayList cavalli = new ArrayList<>(); private Mappa mappa; private Pila pila; diff --git a/Spirit_Arnaldo_Selvaggio/src/Posizione.java b/Spirit_Arnaldo_Selvaggio/src/Posizione.java index cab2690..bfbe894 100644 --- a/Spirit_Arnaldo_Selvaggio/src/Posizione.java +++ b/Spirit_Arnaldo_Selvaggio/src/Posizione.java @@ -1,11 +1,10 @@ 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(); + private Deque cavalli = new ArrayDeque<>(); public String toString(){ String stringa="*"; @@ -26,7 +25,7 @@ public class Posizione { cavalli.removeFirst(); } }*/ - ArrayList cavalliArray = new ArrayList(cavalli); + ArrayList cavalliArray = new ArrayList<>(cavalli); for(int i = 0; i < cavalliArray.size(); i ++){ stringa += cavalliArray.get(i).getNome() + " ---> "; }