From 324a4db7fea341749a4409d6635b3f09f50d1a72 Mon Sep 17 00:00:00 2001
From: groche97 <groche97@gmail.com>
Date: Sat, 14 Dec 2019 23:32:38 +0100
Subject: [PATCH] Arreglados errores menores
---
src/Main.java | 61 +++++++++++++++++++++++++++++++++++++++++-------
src/Tablero.java | 9 -------
2 files changed, 52 insertions(+), 18 deletions(-)
delete mode 100644 src/Tablero.java
diff --git a/src/Main.java b/src/Main.java
index ec3a16d..8df9a0a 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -12,7 +12,12 @@ public class Main {
System.out.println("Entra cliente");
Socket socket;
try {
- socket = new Socket("localhost", 8080);
+ if(args.length>0) {
+ socket = new Socket(args[0], 8080);
+ }else {
+ socket = new Socket("localhost", 8080);
+ }
+
Scanner es = new Scanner(System.in);
BufferedReader bufferEntrada = new BufferedReader(new InputStreamReader(socket.getInputStream()));
PrintWriter bufferSalida = new PrintWriter(new OutputStreamWriter(socket.getOutputStream()),true);
@@ -24,13 +29,14 @@ public class Main {
System.out.println("Introduce el numero de partida en el que quieres entrar");
bufferSalida.println(es.nextLine());
System.out.println(bufferEntrada.readLine());
- System.out.println(bufferEntrada.readLine());
- System.out.println(bufferEntrada.readLine());
- while(dibujarTablero(bufferEntrada)) {
- System.out.println("introduce la x de la nueva marca");
- bufferSalida.println(es.nextLine());
- System.out.println("introduce la y de la nueva marca");
- bufferSalida.println(es.nextLine());
+ String tipoJuego = bufferEntrada.readLine();
+ switch(tipoJuego) {
+ case "3":
+ partida3(bufferEntrada, bufferSalida, es);
+ break;
+ case "4":
+ partida4(bufferEntrada, bufferSalida, es);
+ break;
}
} catch (IOException e) {
// TODO Auto-generated catch block
@@ -38,7 +44,27 @@ public class Main {
}
}
- static boolean dibujarTablero(BufferedReader entrada) throws IOException {
+ static void partida3(BufferedReader bufferEntrada, PrintWriter bufferSalida, Scanner es) throws IOException {
+ System.out.println(bufferEntrada.readLine());
+ System.out.println(bufferEntrada.readLine());
+ while(dibujarTablero3(bufferEntrada)) {
+ System.out.println("introduce la x de la nueva marca");
+ bufferSalida.println(es.nextLine());
+ System.out.println("introduce la y de la nueva marca");
+ bufferSalida.println(es.nextLine());
+ }
+ }
+
+ static void partida4(BufferedReader bufferEntrada, PrintWriter bufferSalida, Scanner es) throws IOException {
+ System.out.println(bufferEntrada.readLine());
+ System.out.println(bufferEntrada.readLine());
+ while(dibujarTablero4(bufferEntrada)) {
+ System.out.println("introduce la columna de la nueva ficha");
+ bufferSalida.println(es.nextLine());
+ }
+ }
+
+ static boolean dibujarTablero3(BufferedReader entrada) throws IOException {
for(int i = 0; i < 3; i++) {
String linea = entrada.readLine();
if(linea.length() == 1) {
@@ -54,5 +80,22 @@ public class Main {
}
return true;
}
+
+ static boolean dibujarTablero4(BufferedReader entrada) throws IOException {
+ for(int i = 0; i < 7; i++) {
+ String linea = entrada.readLine();
+ if(linea.length() == 1) {
+ if(linea.equals("v")) {
+ System.out.println("Has ganado!");
+ }else {
+ System.out.println("Has perdido...");
+ }
+ return false;
+ } else {
+ System.out.println(linea);
+ }
+ }
+ return true;
+ }
}
diff --git a/src/Tablero.java b/src/Tablero.java
deleted file mode 100644
index 30f219d..0000000
--- a/src/Tablero.java
+++ /dev/null
@@ -1,9 +0,0 @@
-
-public class Tablero {
- int[][] tablero;
-
- public Tablero() {
- // TODO Auto-generated constructor stub
- }
-
-}