Fixed Bug causing softlock

GAIPS · Jan 12, 2025 · ba28ffc · ba28ffc
1 parent d3ea533
commit ba28ffc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,7 @@ Stats.txt
 # Temp files
 *.tmp
 *.tmp.*
+Board.png
+Board.png.import
+Drawer.png
+Drawer.png.import
diff --git a/tangran/Scenes/Main_scene.gd b/tangran/Scenes/Main_scene.gd
@@ -70,7 +70,7 @@ func setPlayerTurn():
 
 # TODO: ADD INTERACTION TO INTERACTION HISTORY, may not use relative move grammar, and coordinates instead
 func finishPlayerTurn():
-	if movedPiece and current_turn == "Player" and not hasRequest:		
+	if movedPiece and not dragging and current_turn == "Player" and not hasRequest:		
 		current_turn = "AI"
 		thinking_asc = true
 		time_elapsed = 0.0
@@ -79,7 +79,7 @@ func finishPlayerTurn():
 		ai_play() #TODO: ADD HISTORY AND INSTRUCTION AS CONTEXT 
 
 func _undo_play():
-	if movedPiece and current_turn == "Player":
+	if movedPiece and not dragging and current_turn == "Player":
 		get_node(movedPiece).position = originalPos
 		get_node(movedPiece).rotation = originalRot
 		movedPiece = ""