From 171637605bd930570eabb1f64aaddb800a796e5f Mon Sep 17 00:00:00 2001
From: Josebaezx <jose_baez84@hotmail.com>
Date: Sat, 23 Apr 2022 13:11:30 -0400
Subject: [PATCH] Final Generala V1.0

---
 .idea/misc.xml                                       |  2 +-
 .idea/runConfigurations.xml                          | 10 ++++++++++
 out/production/java-e003-generala.git/Dado.class     | Bin 1439 -> 0 bytes
 out/production/java-e003-generala.git/Generala.class | Bin 2185 -> 0 bytes
 out/production/java-e003-generala.git/Play.class     | Bin 1213 -> 0 bytes
 src/Dado.java                                        | 53 ++++++++++++++++++++++++++++++-----------------------
 src/Generala.java                                    | 15 +++++----------
 7 files changed, 46 insertions(+), 34 deletions(-)
 create mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 07115cd..fb40be9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_16" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/out/production/java-e003-generala.git/Dado.class b/out/production/java-e003-generala.git/Dado.class
index 71f31cb..60b30f0 100644
Binary files a/out/production/java-e003-generala.git/Dado.class and b/out/production/java-e003-generala.git/Dado.class differ
diff --git a/out/production/java-e003-generala.git/Generala.class b/out/production/java-e003-generala.git/Generala.class
index 679d811..319f584 100644
Binary files a/out/production/java-e003-generala.git/Generala.class and b/out/production/java-e003-generala.git/Generala.class differ
diff --git a/out/production/java-e003-generala.git/Play.class b/out/production/java-e003-generala.git/Play.class
index cb8d942..09cf1ea 100644
Binary files a/out/production/java-e003-generala.git/Play.class and b/out/production/java-e003-generala.git/Play.class differ
diff --git a/src/Dado.java b/src/Dado.java
index 042bf40..8abc0d2 100644
--- a/src/Dado.java
+++ b/src/Dado.java
@@ -1,37 +1,44 @@
 public class Dado {
 
     String jugada(String dados) {
-        int numeros= Integer.parseInt(dados);
+        int numeros = Integer.parseInt(dados);
 
-        for (int i=1; i<6; i++){
-            String valor = String.valueOf((11111* i));
-            if (valor.equals(dados)) {
-                return "GENERALA";
+        if (numeros > 11110 && numeros < 66667) {
+            for (int i=1; i<7; i++){
+                String valor = String.valueOf((11111* i));
+                if (valor.equals(dados)) {
+                    return "GENERALA";
+                }
             }
-        }
-        for (int i=1; i<7; i++){
-            String valor = String.valueOf((1111* i));
-            for (int j=1; j<7; j++){
-                String valorx = valor + j;
-                if (valorx.equals(dados)) {
-                    return "PÓKER";
+            for (int i=1; i<7; i++){
+                String valor = String.valueOf((1111* i));
+                for (int j=1; j<7; j++){
+                    String valor2 = valor + j;
+                    if (valor2.equals(dados)) {
+                        return "PÓKER";
+                    }
                 }
             }
-        }
 
-//        for (int i=1; i<6; i++){
-//            if (numeros %i==0) {
-//                return "FULL";
-//            }
-//        }
+            for (int i=1; i<7; i++){
+                String valor = String.valueOf((111* i));
+                for (int j=1; j<7; j++){
+                    String valor2 = valor + (11*j);
+                    if (valor2.equals(dados)) {
+                        return "FULL";
+                    }
+                }
+            }
 
-        for (int i=15; i<21; i++){
-            if (numeros %i==0) {
+            if (dados.equals("12345") || dados.equals("23456") || dados.equals("34561")
+                    || dados.equals("45612") || dados.equals("56123") || dados.equals("61234")) {
                 return "ESCALERA";
             }
-        }
-        return "NADA";
-    }
+            return "NADA";
 
+        } else {
+            return "INVALIDO";
+        }
 
+    }
 }
diff --git a/src/Generala.java b/src/Generala.java
index 4dd53ea..e7d7a6f 100644
--- a/src/Generala.java
+++ b/src/Generala.java
@@ -8,11 +8,9 @@ public class Generala {
 // TAMBIÉN PUEDEN AGREGAR OTRAS FUNCIONES y/o CLASES
 // QUE NECESITEN PARA RESOLVER EL EJERCICIO DE LA
 // MANERA MÁS ORDENADA POSIBLE
+    Dado d= new Dado();
     String jugada(String dados) {
-        if (dados.equals("11111")) {
-            return "GENERALA";
-        }
-        return "NADA";
+         return d.jugada(dados);
     }
     // Ustedes pueden ignorar esto
     String[] jugadas(String[] losdados) {
@@ -38,7 +36,6 @@ public class Generala {
     public static void main(String[] args) throws Exception {
         Generala g = new Generala();
         Play p = new Play();
-        Dado d= new Dado();
 
         /* IGNORAR PORQUE ESTO NO SE VA A EJECUTAR PARA USTEDES */
         if (args.length > 0) {
@@ -51,10 +48,8 @@ public class Generala {
         }
 
 // ESTO SI SE EJECUTA PARA USTEDES
-        System.out.println(g.jugada("11111"));
-
-        //String  resultado = p.lanzarDados();
-        //System.out.println("resultado = " + resultado);
-        System.out.println(d.jugada("66665"));
+        String  resultado = p.lanzarDados();
+        System.out.println("Dados lanzados = " + resultado);
+        System.out.println("Resultado: " + g.jugada("66667"));
     }
 }
--
libgit2 0.26.0