mirror of
				https://github.com/lov3b/Schack.git
				synced 2025-11-03 22:50:24 +01:00 
			
		
		
		
	Queen funkar
This commit is contained in:
		@@ -33,7 +33,7 @@ public class Board extends JPanel implements MouseListener {
 | 
				
			|||||||
            {new Rook(false, new Point(0, 0)), null, null, null, null, null, null, new Rook(true, new Point(0, 7))},
 | 
					            {new Rook(false, new Point(0, 0)), null, null, null, null, null, null, new Rook(true, new Point(0, 7))},
 | 
				
			||||||
            {new Horse(false, true, new Point(1, 0)), null, null, null, null, null, null, new Horse(true, true, new Point(1, 7))},
 | 
					            {new Horse(false, true, new Point(1, 0)), null, null, null, null, null, null, new Horse(true, true, new Point(1, 7))},
 | 
				
			||||||
            {new Bishop(false, new Point(2, 0)), null, null, null, null, null, null, new Bishop(true, new Point(2, 7))},
 | 
					            {new Bishop(false, new Point(2, 0)), null, null, null, null, null, null, new Bishop(true, new Point(2, 7))},
 | 
				
			||||||
            {new Queen(false, new Point(3, 0)), null, null, null, new Bishop(false, new Point(3, 4)), null, null, new Queen(true, new Point(3, 7))},
 | 
					            {new Queen(false, new Point(3, 0)), null, null, null, new Queen(false, new Point(3, 4)), null, null, new Queen(true, new Point(3, 7))},
 | 
				
			||||||
            {new King(false), null, null, null, null, null, null, new King(true)},
 | 
					            {new King(false), null, null, null, null, null, null, new King(true)},
 | 
				
			||||||
            {null, null, null, null, null, null, null, new King(false, new Point(5, 7))},
 | 
					            {null, null, null, null, null, null, null, new King(false, new Point(5, 7))},
 | 
				
			||||||
            {null, null, null, null, null, null, null, null},
 | 
					            {null, null, null, null, null, null, null, null},
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,9 +0,0 @@
 | 
				
			|||||||
package schack;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
public interface DiagonalWalk {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    default void walDiagonal(Piece[][] pieces){
 | 
					 | 
				
			||||||
        
 | 
					 | 
				
			||||||
    };
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
@@ -13,8 +13,211 @@ public class Queen extends Piece {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
    public LinkedHashSet<Point> validMoves(Piece[][] pieces) {
 | 
					    public LinkedHashSet<Point> validMoves(Piece[][] pieces) {
 | 
				
			||||||
        return new LinkedHashSet<>();
 | 
					        LinkedHashSet<Point> movable = new LinkedHashSet<>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // Upp vänster
 | 
				
			||||||
 | 
					        for (int bishopX = this.position.x - 1, bishopY = this.position.y - 1; bishopX >= 0 && bishopY >= 0; bishopX--, bishopY--) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Point pos = new Point(bishopX, bishopY);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            // Instead of checking index and null, try-catch
 | 
				
			||||||
 | 
					            try {
 | 
				
			||||||
 | 
					                Piece p = pieces[pos.x][pos.y];
 | 
				
			||||||
 | 
					                System.out.println(p);
 | 
				
			||||||
 | 
					                // If this piece is the same team as ours, skip
 | 
				
			||||||
 | 
					                if (p.isWhite == this.isWhite) {
 | 
				
			||||||
 | 
					                    break;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                movable.add(pos);
 | 
				
			||||||
 | 
					                break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            } catch (NullPointerException npe) {
 | 
				
			||||||
 | 
					                // This is an empty spot
 | 
				
			||||||
 | 
					                movable.add(pos);
 | 
				
			||||||
 | 
					            } catch (Exception e) {
 | 
				
			||||||
 | 
					                // This means that the player is at the edge
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // Upp höger 
 | 
				
			||||||
 | 
					        for (int bishopX = this.position.x + 1, bishopY = this.position.y - 1; bishopX <= 7 && bishopY >= 0; bishopX++, bishopY--) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Point pos = new Point(bishopX, bishopY);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            // Instead of checking index and null, try-catch
 | 
				
			||||||
 | 
					            try {
 | 
				
			||||||
 | 
					                Piece p = pieces[pos.x][pos.y];
 | 
				
			||||||
 | 
					                System.out.println(p);
 | 
				
			||||||
 | 
					                // If this piece is the same team as ours, skip
 | 
				
			||||||
 | 
					                if (p.isWhite == this.isWhite) {
 | 
				
			||||||
 | 
					                    break;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                movable.add(pos);
 | 
				
			||||||
 | 
					                break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            } catch (NullPointerException npe) {
 | 
				
			||||||
 | 
					                // This is an empty spot
 | 
				
			||||||
 | 
					                movable.add(pos);
 | 
				
			||||||
 | 
					            } catch (Exception e) {
 | 
				
			||||||
 | 
					                // This means that the player is at the edge
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        // Ner höger
 | 
				
			||||||
 | 
					        for (int bishopX = this.position.x + 1, bishopY = this.position.y + 1; bishopX <= 7 && bishopY <= 7; bishopX++, bishopY++) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Point pos = new Point(bishopX, bishopY);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            // Instead of checking index and null, try-catch
 | 
				
			||||||
 | 
					            try {
 | 
				
			||||||
 | 
					                Piece p = pieces[pos.x][pos.y];
 | 
				
			||||||
 | 
					                System.out.println(p);
 | 
				
			||||||
 | 
					                // If this piece is the same team as ours, skip
 | 
				
			||||||
 | 
					                if (p.isWhite == this.isWhite) {
 | 
				
			||||||
 | 
					                    break;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                movable.add(pos);
 | 
				
			||||||
 | 
					                break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            } catch (NullPointerException npe) {
 | 
				
			||||||
 | 
					                // This is an empty spot
 | 
				
			||||||
 | 
					                movable.add(pos);
 | 
				
			||||||
 | 
					            } catch (Exception e) {
 | 
				
			||||||
 | 
					                // This means that the player is at the edge
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        // Ner vänster
 | 
				
			||||||
 | 
					        for (int bishopX = this.position.x - 1, bishopY = this.position.y + 1; bishopX >= 0 && bishopY <= 7; bishopX--, bishopY++) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Point pos = new Point(bishopX, bishopY);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            // Instead of checking index and null, try-catch
 | 
				
			||||||
 | 
					            try {
 | 
				
			||||||
 | 
					                Piece p = pieces[pos.x][pos.y];
 | 
				
			||||||
 | 
					                System.out.println(p);
 | 
				
			||||||
 | 
					                // If this piece is the same team as ours, skip
 | 
				
			||||||
 | 
					                if (p.isWhite == this.isWhite) {
 | 
				
			||||||
 | 
					                    break;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                movable.add(pos);
 | 
				
			||||||
 | 
					                break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            } catch (NullPointerException npe) {
 | 
				
			||||||
 | 
					                // This is an empty spot
 | 
				
			||||||
 | 
					                movable.add(pos);
 | 
				
			||||||
 | 
					            } catch (Exception e) {
 | 
				
			||||||
 | 
					                // This means that the player is at the edge
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        }// Vänster
 | 
				
			||||||
 | 
					        for (int rookX = this.position.x - 1; rookX >= 0; rookX--) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Point pos = new Point(rookX, this.position.y);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            // Instead of checking index and null, try-catch
 | 
				
			||||||
 | 
					            try {
 | 
				
			||||||
 | 
					                Piece p = pieces[pos.x][pos.y];
 | 
				
			||||||
 | 
					                System.out.println(p);
 | 
				
			||||||
 | 
					                // If this piece is the same team as ours, skip
 | 
				
			||||||
 | 
					                if (p.isWhite == this.isWhite) {
 | 
				
			||||||
 | 
					                    break;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                movable.add(pos);
 | 
				
			||||||
 | 
					                break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            } catch (NullPointerException npe) {
 | 
				
			||||||
 | 
					                // This is an empty spot
 | 
				
			||||||
 | 
					                movable.add(pos);
 | 
				
			||||||
 | 
					            } catch (Exception e) {
 | 
				
			||||||
 | 
					                // This means that the player is at the edge
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // Höger
 | 
				
			||||||
 | 
					        for (int rookX = this.position.x + 1; rookX <= 7; rookX++) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Point pos = new Point(rookX, this.position.y);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            // Instead of checking index and null, try-catch
 | 
				
			||||||
 | 
					            try {
 | 
				
			||||||
 | 
					                Piece p = pieces[pos.x][pos.y];
 | 
				
			||||||
 | 
					                System.out.println(p);
 | 
				
			||||||
 | 
					                // If this piece is the same team as ours, skip
 | 
				
			||||||
 | 
					                if (p.isWhite == this.isWhite) {
 | 
				
			||||||
 | 
					                    break;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                movable.add(pos);
 | 
				
			||||||
 | 
					                break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            } catch (NullPointerException npe) {
 | 
				
			||||||
 | 
					                // This is an empty spot
 | 
				
			||||||
 | 
					                movable.add(pos);
 | 
				
			||||||
 | 
					            } catch (Exception e) {
 | 
				
			||||||
 | 
					                // This means that the player is at the edge
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // Ner
 | 
				
			||||||
 | 
					        for (int rookY = this.position.y + 1; rookY <= 7; rookY++) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Point pos = new Point(this.position.x, rookY);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            // Instead of checking index and null, try-catch
 | 
				
			||||||
 | 
					            try {
 | 
				
			||||||
 | 
					                Piece p = pieces[pos.x][pos.y];
 | 
				
			||||||
 | 
					                System.out.println(p);
 | 
				
			||||||
 | 
					                // If this piece is the same team as ours, skip
 | 
				
			||||||
 | 
					                if (p.isWhite == this.isWhite) {
 | 
				
			||||||
 | 
					                    break;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                movable.add(pos);
 | 
				
			||||||
 | 
					                break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            } catch (NullPointerException npe) {
 | 
				
			||||||
 | 
					                // This is an empty spot
 | 
				
			||||||
 | 
					                movable.add(pos);
 | 
				
			||||||
 | 
					            } catch (Exception e) {
 | 
				
			||||||
 | 
					                // This means that the player is at the edge
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // Upp
 | 
				
			||||||
 | 
					        for (int rookY = this.position.y - 1; rookY >= 0; rookY--) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            Point pos = new Point(this.position.x, rookY);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            // Instead of checking index and null, try-catch
 | 
				
			||||||
 | 
					            try {
 | 
				
			||||||
 | 
					                Piece p = pieces[pos.x][pos.y];
 | 
				
			||||||
 | 
					                System.out.println(p);
 | 
				
			||||||
 | 
					                // If this piece is the same team as ours, skip
 | 
				
			||||||
 | 
					                if (p.isWhite == this.isWhite) {
 | 
				
			||||||
 | 
					                    break;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                movable.add(pos);
 | 
				
			||||||
 | 
					                break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            } catch (NullPointerException npe) {
 | 
				
			||||||
 | 
					                // This is an empty spot
 | 
				
			||||||
 | 
					                movable.add(pos);
 | 
				
			||||||
 | 
					            } catch (Exception e) {
 | 
				
			||||||
 | 
					                // This means that the player is at the edge
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        return movable;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user