From 505741f7ee3323ae1aba8b37e33a9123b35ea1c7 Mon Sep 17 00:00:00 2001
From: Pedro Rolon <prolon@roshka.com>
Date: Thu, 29 Nov 2018 12:21:28 -0300
Subject: [PATCH] Se corrigió la generación aleatoria. Ya no genera cartas iguales

---
 jweb-e002/build/classes/clases/Poker.class     | Bin 10550 -> 0 bytes
 jweb-e002/build/classes/servlets/ManoDoc.class | Bin 5627 -> 0 bytes
 jweb-e002/src/clases/Poker.java                | 45 +++++++++++++++++++++++++++++++--------------
 jweb-e002/src/servlets/ManoDoc.java            |  8 ++++----
 4 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/jweb-e002/build/classes/clases/Poker.class b/jweb-e002/build/classes/clases/Poker.class
index 4433cc2..45788c5 100644
Binary files a/jweb-e002/build/classes/clases/Poker.class and b/jweb-e002/build/classes/clases/Poker.class differ
diff --git a/jweb-e002/build/classes/servlets/ManoDoc.class b/jweb-e002/build/classes/servlets/ManoDoc.class
index bb2a574..f8ebaaa 100644
Binary files a/jweb-e002/build/classes/servlets/ManoDoc.class and b/jweb-e002/build/classes/servlets/ManoDoc.class differ
diff --git a/jweb-e002/src/clases/Poker.java b/jweb-e002/src/clases/Poker.java
index 68bee19..1acf2d8 100644
--- a/jweb-e002/src/clases/Poker.java
+++ b/jweb-e002/src/clases/Poker.java
@@ -669,42 +669,59 @@ public class Poker {
     	Random random = new Random();
      	String nuevaCarta = "";
      	
-     	int valor;
-     	int palo;
+     	int valor[] = new int[n];
+     	int palo[] = new int[n];
+     	
+     	
+     	for(int i=0; i<n; i++) {
+     		valor[i] = random.nextInt(13) + 1;
+     		 palo[i] = random.nextInt(4) + 1;
+     		 
+     		 for(int j=0; j<i; j++) {
+     			 
+     			 if(valor[j]==valor[i] && palo[j]==palo[i]) {
+     				valor[i] = random.nextInt(13) + 1;
+     	     		 palo[i] = random.nextInt(4) + 1;
+     	     		 j=0;
+     			 }
+     			 
+     		 }
+     	}
+     	
      	
      	for(int i=0; i<n; i++) {
-     		valor = random.nextInt(13) + 1;
-     		if(valor==1) {
+     		//valor = random.nextInt(13) + 1;
+     		if(valor[i]==1) {
      			nuevaCarta += "A";
      		}
-     		else if(valor==10) {
+     		else if(valor[i]==10) {
      			nuevaCarta += "T";
      		}
-     		else if(valor==11) {
+     		else if(valor[i]==11) {
      			nuevaCarta += "J";
      		}
-     		else if(valor==12) {
+     		else if(valor[i]==12) {
      			nuevaCarta += "Q";
      		}
-     		else if(valor==13) {
+     		else if(valor[i]==13) {
      			nuevaCarta += "K";
      		}
      		else {
-     			nuevaCarta += valor;
+     			nuevaCarta += valor[i];
              }             
              
-             palo = random.nextInt(4) + 1;
+             //palo = random.nextInt(4) + 1;
 
-             if(palo==1){
+             if(palo[i]==1){
                  nuevaCarta += "H";
              }
-             else if(palo==2){
+             else if(palo[i]==2){
                  nuevaCarta += "S";
              }
-             else if(palo==3){
+             else if(palo[i]==3){
                  nuevaCarta += "D";
              }
-             else if(palo==4){
+             else if(palo[i]==4){
                  nuevaCarta += "C";
              }
              
diff --git a/jweb-e002/src/servlets/ManoDoc.java b/jweb-e002/src/servlets/ManoDoc.java
index 997cef4..1a01b0f 100644
--- a/jweb-e002/src/servlets/ManoDoc.java
+++ b/jweb-e002/src/servlets/ManoDoc.java
@@ -65,7 +65,7 @@ public class ManoDoc extends HttpServlet {
 				mano[i].valor = "R";
 			}
 			else if(mano[i].valor.equals("T")){
-				mano[i].valor = "10";
+				mano[i].valor = "B";
 			}
 			manoString.add(mano[i].valor+mano[i].palo);
 		}
@@ -76,8 +76,8 @@ public class ManoDoc extends HttpServlet {
 			if(manoString.get(i).charAt(0)=='R') {				
 				mano[i] = new Carta("A"+manoString.get(i).charAt(1));
 			}
-			else if(manoString.get(i).charAt(0)=='1' && manoString.get(i).charAt(1)=='0'){
-				mano[i] = new Carta("T"+manoString.get(i).charAt(2));
+			else if(manoString.get(i).charAt(0)=='B'){
+				mano[i] = new Carta("T"+manoString.get(i).charAt(1));
 			}
 			else {
 				mano[i] = new Carta(manoString.get(i));
@@ -126,7 +126,7 @@ public class ManoDoc extends HttpServlet {
 		in.close();
 		} catch (Exception e) {
 			throw new RuntimeException("Exception while calling URL:"+ myURL, e);
-		} 
+		}
  
 		return sb.toString();
 	}
--
libgit2 0.26.0