Fixed piece moving functionality, again

alonsoC1s · Dec 17, 2017 · efb6d68 · efb6d68
1 parent fe188f7
commit efb6d68
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 80 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/out/production/ProyectoCuatroTribus/com/company/GUI/BoardSquare.class b/out/production/ProyectoCuatroTribus/com/company/GUI/BoardSquare.class
diff --git a/out/production/ProyectoCuatroTribus/com/company/GUI/DragNDropListener.class b/out/production/ProyectoCuatroTribus/com/company/GUI/DragNDropListener.class
diff --git a/out/production/ProyectoCuatroTribus/com/company/Logic/LogicEngine.class b/out/production/ProyectoCuatroTribus/com/company/Logic/LogicEngine.class
diff --git a/out/production/ProyectoCuatroTribus/com/company/Tribes/Tribe.class b/out/production/ProyectoCuatroTribus/com/company/Tribes/Tribe.class
diff --git a/src/com/company/GUI/BoardSquare.java b/src/com/company/GUI/BoardSquare.java
@@ -60,7 +60,13 @@ public void addPiecesToSquare(List<GuiPiece> newPieces, Piece.colors actingColor
         if (actingColor != this.dominantColor && this.dominantColor != null){
             List<GuiPiece> survivingPieces = LogicEngine.resolveBattle(this.pieces,newPieces);
 
-            pieces.addAll(survivingPieces);
+            if (!survivingPieces.isEmpty()) {
+                for (GuiPiece piece : survivingPieces) {
+                    piece.setRowCol(this.row, this.col);
+                }
+
+                pieces.addAll(survivingPieces);
+            }
         }else{ // No battle was detected
             for (GuiPiece piece: newPieces){
                 piece.setRowCol(this.row,this.col);

diff --git a/src/com/company/GUI/DragNDropListener.java b/src/com/company/GUI/DragNDropListener.java
@@ -27,7 +27,7 @@ public class DragNDropListener implements MouseMotionListener, MouseListener{
      */
     public DragNDropListener( Board board){
         this.gameBoard = board;
-        this.boardMatrix = this.gameBoard.boardMatrix;
+        this.boardMatrix = Board.boardMatrix;
         this.troopsAreBeingMobilized = false;
     }
 
@@ -87,7 +87,7 @@ public void mousePressed(MouseEvent e) {
         } else {
             this.clickedSquare.addPiecesToSquare(piecesOnTheMove, gameBoard.colorInTurn);
             this.troopsAreBeingMobilized = false;
-            piecesOnTheMove = Collections.emptyList();
+            piecesOnTheMove = new ArrayList<>();
             gameBoard.repaint();
         }
 

diff --git a/src/com/company/Logic/LogicEngine.java b/src/com/company/Logic/LogicEngine.java
@@ -2,8 +2,6 @@
 import com.company.GUI.BoardSquare;
 import com.company.Pieces.GuiPiece;
 import com.company.Pieces.Piece;
-
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -19,7 +17,7 @@ public class LogicEngine {
      * List of pieces is sorted. Pieces are eliminated in 1:1 ratio starting from bottom.
      * @param defendingPieces Pieces originally on sqaure. Pieces defending the city
      * @param attackingPieces Pieces attacking the city.
-     * @return
+     * @return List of pieces surviving the battle
      */
     public static List<GuiPiece> resolveBattle(List<GuiPiece> defendingPieces, List<GuiPiece> attackingPieces){
         boolean artillieryPresent = false;
@@ -33,7 +31,7 @@ public static List<GuiPiece> resolveBattle(List<GuiPiece> defendingPieces, List<
         }
 
         if (!artillieryPresent){
-            //TODO: Verify if the sorting actually works
+
             Collections.sort(defendingPieces);
             Collections.sort(attackingPieces);
 

diff --git a/src/com/company/Tribes/Tribe.java b/src/com/company/Tribes/Tribe.java
@@ -4,4 +4,5 @@
 
 public abstract class Tribe {
     Piece.colors myColor;
+    int PacsAvailable;
 }