Update UI

ThatOneShortGuy · Dec 12, 2023 · 794e28d · 794e28d
1 parent d48b1a6
commit 794e28d
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 14 deletions.
diff --git a/TestChessGame/.plastic/plastic.changes b/TestChessGame/.plastic/plastic.changes
diff --git a/TestChessGame/.plastic/plastic.wktree b/TestChessGame/.plastic/plastic.wktree
diff --git a/TestChessGame/Assets/Scripts/Chessman.cs b/TestChessGame/Assets/Scripts/Chessman.cs
@@ -226,13 +226,13 @@ public void canCastle()
 	{
 
 		Game sc = controller.GetComponent<Game>();
-		GameObject cp = sc.GetPosition(xBoard, yBoard);//Clicked Piece
+		GameObject cp = sc.GetPosition(xBoard, yBoard); //Clicked Piece
 
 		switch (player)
 		{
 			case ("white"):
-				if (cp.GetComponent<Chessman>().hasMoved == false && (sc.GetPosition(0, 0).GetComponent<Chessman>().hasMoved == false ||
-					sc.GetPosition(7, 0).GetComponent<Chessman>().hasMoved == false))
+				if (cp.GetComponent<Chessman>().hasMoved == false && ((sc.GetPosition(0, 0) != null && sc.GetPosition(0, 0).GetComponent<Chessman>().hasMoved == false) ||
+					(sc.GetPosition(7, 0) != null && sc.GetPosition(7, 0).GetComponent<Chessman>().hasMoved == false)))
 				{
 					if (sc.GetPosition(xBoard - 3, yBoard) == null && sc.GetPosition(xBoard - 2, yBoard) == null && sc.GetPosition(xBoard - 1, yBoard) == null && sc.GetPosition(0, 0).GetComponent<Chessman>().hasMoved == false)
 						MovePlateSpawn(xBoard - 3, yBoard);
@@ -241,8 +241,8 @@ public void canCastle()
 				}
 				return;
 			case ("black"):
-				if (cp.GetComponent<Chessman>().hasMoved == false && (sc.GetPosition(0, 7).GetComponent<Chessman>().hasMoved == false ||
-					sc.GetPosition(7, 7).GetComponent<Chessman>().hasMoved == false))
+				if (cp.GetComponent<Chessman>().hasMoved == false && ((sc.GetPosition(0, 7) != null && sc.GetPosition(0, 7).GetComponent<Chessman>().hasMoved == false) ||
+					(sc.GetPosition(7, 7) != null && sc.GetPosition(7, 7).GetComponent<Chessman>().hasMoved == false)))
 				{
 					if (sc.GetPosition(xBoard - 3, yBoard) == null && sc.GetPosition(xBoard - 2, yBoard) == null && sc.GetPosition(xBoard - 1, yBoard) == null && sc.GetPosition(0, 7).GetComponent<Chessman>().hasMoved == false)
 						MovePlateSpawn(xBoard - 3, yBoard);

diff --git a/TestChessGame/Assets/Scripts/FreezePlate.cs b/TestChessGame/Assets/Scripts/FreezePlate.cs
@@ -53,7 +53,7 @@ public void OnMouseUp()
 
 		Game game = controller.GetComponent<Game>();
 
-		string FrozenPos = BoardPosLetter[matrixX] + (matrixY).ToString();
+		string FrozenPos = BoardPosLetter[matrixX + 1] + (matrixY).ToString();
 		game.frozenPiece = FrozenPos;
 
 	   Game sc = controller.GetComponent<Game>();

diff --git a/TestChessGame/Assets/Scripts/Game.cs b/TestChessGame/Assets/Scripts/Game.cs
@@ -284,9 +284,9 @@ public void GenerateFen()
 			for (int j = 0; j < 8; j++)
 			{
 
-				if(EmptyPos == 8)
+				if (EmptyPos == 8)
 				{
-					Fen += EmptyPos.ToString();
+					Fen += EmptyPos.ToString() + "/";
 					EmptyPos = 0;
 				}
 				if (GetPosition(j, i) != null) 
@@ -297,6 +297,8 @@ public void GenerateFen()
 						EmptyPos = 0;
 					}
 					Fen = Fen + FenCodes[GetPosition(j, i).name.ToString()];
+					if (j == 7 && i != 0)
+						Fen += "/";
 
 				}
 				else
@@ -307,7 +309,8 @@ public void GenerateFen()
 			if (EmptyPos != 0)
 			{
 				Fen += EmptyPos.ToString();
-				Fen += '/';
+				if (i != 0)
+					Fen += "/";
 			}
 			EmptyPos = 0;
 		}

diff --git a/TestChessGame/Assets/Scripts/JumpPlate.cs b/TestChessGame/Assets/Scripts/JumpPlate.cs
@@ -51,7 +51,7 @@ public void OnMouseUp()
 		Game sc = controller.GetComponent<Game>();
 		Spells spellsScript = reference.GetComponent<Spells>();
 
-		string jumpPos = BoardPosLetter[matrixX] + (matrixY).ToString();
+		string jumpPos = BoardPosLetter[matrixX] + (matrixY + 1).ToString();
 		game.jumpPiece = jumpPos;
 
 		GameObject plate = sc.jumpPlates[matrixX, matrixY];

diff --git a/TestChessGame/Assets/Scripts/MovePlate.cs b/TestChessGame/Assets/Scripts/MovePlate.cs
@@ -173,19 +173,25 @@ public void OnMouseUp()
 		}
 		if (MovingPiece.name == "black_rook")
 		{
+			if(matrixX == 7)
+				controller.GetComponent<Game>().k = false;
+			else
+				controller.GetComponent<Game>().q = false;
 			MovingPiece.hasMoved = true;
-			print(matrixX);
 		}
 		if (MovingPiece.name == "white_King")
 		{
 			MovingPiece.hasMoved = true;
-			controller.GetComponent<Game>().k = false;
-			controller.GetComponent<Game>().q = false;
+			controller.GetComponent<Game>().K = false;
+			controller.GetComponent<Game>().Q = false;
 		}
 		if (MovingPiece.name == "white_rook")
 		{
+			if (matrixX == 7)
+				controller.GetComponent<Game>().K = false;
+			else
+				controller.GetComponent<Game>().Q = false;
 			MovingPiece.hasMoved = true;
-			print(matrixX);
 		}
 
 		controller.GetComponent<Game>().NextTurn();