Reformat

mapa.json

@@ -1,32 +1,180 @@
 [
-  {"numeroCasilla":  0, "efecto":  "Comida"},
-  {"x": 0, "y": 0, "ordenRecorrido": 1, "efecto":  "Comida"},
-  {"x": 1, "y": 0, "esCamino": true, "ordenRecorrido": 3, "efecto":  null},
-  {"x": 2, "y": 0, "esCamino": false, "ordenRecorrido": null, "efecto":  null},
-  {"x": 3, "y": 0, "esCamino": true, "ordenRecorrido": 2, "efecto":  "Comida"},
-  {"x": 4, "y": 0, "esCamino": true, "ordenRecorrido": 4, "efecto":  null},
-
-  {"x": 0, "y": 1, "esCamino": true, "ordenRecorrido": 5, "efecto":  "Bacanal"},
-  {"x": 1, "y": 1, "esCamino": false, "ordenRecorrido": null, "efecto":  null},
-  {"x": 2, "y": 1, "esCamino": true, "ordenRecorrido": 6, "efecto":  null},
-  {"x": 3, "y": 1, "esCamino": false, "ordenRecorrido": null, "efecto":  null},
-  {"x": 4, "y": 1, "esCamino": true, "ordenRecorrido": 7, "efecto":  "Fiera"},
-
-  {"x": 0, "y": 2, "esCamino": false, "ordenRecorrido": null, "efecto":  null},
-  {"x": 1, "y": 2, "esCamino": true, "ordenRecorrido": 8, "efecto":  null},
-  {"x": 2, "y": 2, "esCamino": true, "ordenRecorrido": 9, "efecto":  "Equipamiento"},
-  {"x": 3, "y": 2, "esCamino": true, "ordenRecorrido": 10, "efecto":  null},
-  {"x": 4, "y": 2, "esCamino": false, "ordenRecorrido": null, "efecto":  null},
-
-  {"x": 0, "y": 3, "esCamino": true, "ordenRecorrido": 11, "efecto":  "Equipamiento"},
-  {"x": 1, "y": 3, "esCamino": false, "ordenRecorrido": null, "efecto":  null},
-  {"x": 2, "y": 3, "esCamino": true, "ordenRecorrido": 12, "efecto":  null},
-  {"x": 3, "y": 3, "esCamino": false, "ordenRecorrido": null, "efecto":  null},
-  {"x": 4, "y": 3, "esCamino": true, "ordenRecorrido": 13, "efecto":  null},
-
-  {"x": 0, "y": 4, "esCamino": true, "ordenRecorrido": 14, "efecto":  null},
-  {"x": 1, "y": 4, "esCamino": true, "ordenRecorrido": 15, "efecto":  null},
-  {"x": 2, "y": 4, "esCamino": false, "ordenRecorrido": null, "efecto":  null},
-  {"x": 3, "y": 4, "esCamino": true, "ordenRecorrido": 16, "efecto":  null},
-  {"x": 4, "y": 4, "esCamino": true, "ordenRecorrido": 17, "efecto":  null}
-]
+  {
+    "numeroCasilla": 0,
+    "efecto": "Comida"
+  },
+  {
+    "x": 0,
+    "y": 0,
+    "ordenRecorrido": 1,
+    "efecto": "Comida"
+  },
+  {
+    "x": 1,
+    "y": 0,
+    "esCamino": true,
+    "ordenRecorrido": 3,
+    "efecto": null
+  },
+  {
+    "x": 2,
+    "y": 0,
+    "esCamino": false,
+    "ordenRecorrido": null,
+    "efecto": null
+  },
+  {
+    "x": 3,
+    "y": 0,
+    "esCamino": true,
+    "ordenRecorrido": 2,
+    "efecto": "Comida"
+  },
+  {
+    "x": 4,
+    "y": 0,
+    "esCamino": true,
+    "ordenRecorrido": 4,
+    "efecto": null
+  },
+  {
+    "x": 0,
+    "y": 1,
+    "esCamino": true,
+    "ordenRecorrido": 5,
+    "efecto": "Bacanal"
+  },
+  {
+    "x": 1,
+    "y": 1,
+    "esCamino": false,
+    "ordenRecorrido": null,
+    "efecto": null
+  },
+  {
+    "x": 2,
+    "y": 1,
+    "esCamino": true,
+    "ordenRecorrido": 6,
+    "efecto": null
+  },
+  {
+    "x": 3,
+    "y": 1,
+    "esCamino": false,
+    "ordenRecorrido": null,
+    "efecto": null
+  },
+  {
+    "x": 4,
+    "y": 1,
+    "esCamino": true,
+    "ordenRecorrido": 7,
+    "efecto": "Fiera"
+  },
+  {
+    "x": 0,
+    "y": 2,
+    "esCamino": false,
+    "ordenRecorrido": null,
+    "efecto": null
+  },
+  {
+    "x": 1,
+    "y": 2,
+    "esCamino": true,
+    "ordenRecorrido": 8,
+    "efecto": null
+  },
+  {
+    "x": 2,
+    "y": 2,
+    "esCamino": true,
+    "ordenRecorrido": 9,
+    "efecto": "Equipamiento"
+  },
+  {
+    "x": 3,
+    "y": 2,
+    "esCamino": true,
+    "ordenRecorrido": 10,
+    "efecto": null
+  },
+  {
+    "x": 4,
+    "y": 2,
+    "esCamino": false,
+    "ordenRecorrido": null,
+    "efecto": null
+  },
+  {
+    "x": 0,
+    "y": 3,
+    "esCamino": true,
+    "ordenRecorrido": 11,
+    "efecto": "Equipamiento"
+  },
+  {
+    "x": 1,
+    "y": 3,
+    "esCamino": false,
+    "ordenRecorrido": null,
+    "efecto": null
+  },
+  {
+    "x": 2,
+    "y": 3,
+    "esCamino": true,
+    "ordenRecorrido": 12,
+    "efecto": null
+  },
+  {
+    "x": 3,
+    "y": 3,
+    "esCamino": false,
+    "ordenRecorrido": null,
+    "efecto": null
+  },
+  {
+    "x": 4,
+    "y": 3,
+    "esCamino": true,
+    "ordenRecorrido": 13,
+    "efecto": null
+  },
+  {
+    "x": 0,
+    "y": 4,
+    "esCamino": true,
+    "ordenRecorrido": 14,
+    "efecto": null
+  },
+  {
+    "x": 1,
+    "y": 4,
+    "esCamino": true,
+    "ordenRecorrido": 15,
+    "efecto": null
+  },
+  {
+    "x": 2,
+    "y": 4,
+    "esCamino": false,
+    "ordenRecorrido": null,
+    "efecto": null
+  },
+  {
+    "x": 3,
+    "y": 4,
+    "esCamino": true,
+    "ordenRecorrido": 16,
+    "efecto": null
+  },
+  {
+    "x": 4,
+    "y": 4,
+    "esCamino": true,
+    "ordenRecorrido": 17,
+    "efecto": null
+  }
+]

src/main/java/edu/fiuba/algo3/App.java

@@ -11,6 +11,10 @@
  */
 public class App extends Application {
 
+    public static void main(String[] args) {
+        launch();
+    }
+
     @Override
     public void start(Stage stage) {
         var javaVersion = SystemInfo.javaVersion();
@@ -22,9 +26,5 @@ public void start(Stage stage) {
         stage.show();
     }
 
-    public static void main(String[] args) {
-        launch();
-    }
-
 
 }

src/main/java/edu/fiuba/algo3/Message.java

@@ -1,7 +1,5 @@
 package edu.fiuba.algo3;
 
-import edu.fiuba.algo3.Localize;
-
 public class Message extends Localize {
 
     public Message(String esContent, String usContent) {

src/main/java/edu/fiuba/algo3/modelo/AlgoRoma.java

@@ -3,8 +3,8 @@
 import java.util.ArrayList;
 
 public class AlgoRoma {
-    private final Turnos turnos;
     final ArrayList<Gladiador> gladiadores;
+    private final Turnos turnos;
 
     public AlgoRoma(ArrayList<Gladiador> gladiadores) {
         turnos = new Turnos();

src/main/java/edu/fiuba/algo3/modelo/Dado.java

@@ -5,7 +5,7 @@
 public class Dado {
 
     // static hace que sea un método de clase, es decir que puedas usarlo sin instanciar la clase
-    public static int tirar(){
+    public static int tirar() {
         return new Random().nextInt(5) + 1;
     }
 }

src/main/java/edu/fiuba/algo3/modelo/estado/Sano.java

@@ -2,7 +2,7 @@
 
 import edu.fiuba.algo3.modelo.Gladiador;
 
-public class Sano implements Estado{
+public class Sano implements Estado {
     @Override
     public void avanzar(Gladiador gladiador, int cantidadCasillas) {
         gladiador.mover(cantidadCasillas);

src/main/java/edu/fiuba/algo3/modelo/seniority/Novato.java

@@ -6,7 +6,7 @@ public class Novato implements Seniority {
     @Override
     public Seniority actualizarPuntos(Energia energia, int turnosJugados) {
         energia.sumarPuntos(0);
-        if (turnosJugados == 8){
+        if (turnosJugados == 8) {
             return new SemiSenior();
         }
         return this;