From e8ea30068acde9e0439aa248e34bff278a2b8707 Mon Sep 17 00:00:00 2001
From: Ileyan <3003916@stud.hs-mannheim.de>
Date: Fri, 29 Mar 2024 18:46:53 +0100
Subject: [PATCH] v.0.5.3:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Instant Win funktioniert
- Player Tausch funktioniert auch
- Sprites für die Player hinzugefügt
- Test Button hinzugefügt
---
 game.gd   | 14 ++++++++++++--
 game.tscn | 42 ++++++++++++++++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/game.gd b/game.gd
index 7362f2e..2744e07 100644
--- a/game.gd
+++ b/game.gd
@@ -12,6 +12,8 @@ var count = 0
 @onready var wonPlayer := $GUI/WonPlayer as Sprite2D
 @onready var diceButton := $GUI/DiceButton as Button
 @onready var diceSprite = $GUI/DiceSprite as Sprite2D
+@onready var player1Sprite = $GUI/Player1Sprite as Sprite2D
+@onready var player2Sprite = $GUI/Player2Sprite as Sprite2D
 
 
 # Called when the node enters the scene tree for the first time.
@@ -142,12 +144,20 @@ func _five_wins() -> void:
 	five_wins = true
 
 #Nach dem Glücksradereignis tauschen die Spieler die Symbole
-func _change_symbols() -> void:
+func _change_symbols():
+	print("tausch") #debug
 	current_player = 1 - current_player
 	nextPlayer.region_rect.position.x = current_player * 300
+	var tempX = player1Sprite.region_rect.position.x
+	var tempY = player1Sprite.region_rect.position.y
+	player1Sprite.region_rect.position.x = player2Sprite.region_rect.position.x
+	player1Sprite.region_rect.position.y = player2Sprite.region_rect.position.y
+	player2Sprite.region_rect.position.x = tempX
+	player2Sprite.region_rect.position.y = tempY
 	
 #Nach dem Glücksradereignis gewinnt der Spieler sofort
 func _instant_win():
+	won = player_states[current_player]
 	print("Winner: ", won)
 	wonPlayer.region_rect.position.x = player_states.find(won) * 300
 	wonPlayer.show()
@@ -156,4 +166,4 @@ func _instant_win():
 
 #Zum Testen der Events
 func _on_test_pressed():
-	_five_wins()
+	_instant_win()
diff --git a/game.tscn b/game.tscn
index e82ba27..34311aa 100644
--- a/game.tscn
+++ b/game.tscn
@@ -26,17 +26,17 @@ theme_override_font_sizes/font_size = 40
 text = "Tic Tac Toe Extreme"
 
 [node name="NextPlayer" type="Sprite2D" parent="GUI"]
-position = Vector2(1178, 246.5)
-scale = Vector2(1.3, 1.29)
+position = Vector2(1176, 232)
+scale = Vector2(1.31, 1.3)
 texture = ExtResource("3_0333r")
 region_enabled = true
 region_rect = Rect2(0, 100, 100, 100)
 
 [node name="NextPlayerLabel" type="Label" parent="GUI"]
-offset_left = 953.0
-offset_top = 206.5
-offset_right = 1083.0
-offset_bottom = 275.5
+offset_left = 960.0
+offset_top = 193.0
+offset_right = 1090.0
+offset_bottom = 262.0
 size_flags_horizontal = 4
 theme_override_font_sizes/font_size = 45
 text = "Next:"
@@ -92,6 +92,36 @@ offset_bottom = 112.0
 theme_override_font_sizes/font_size = 35
 text = "Test"
 
+[node name="Player1Label" type="Label" parent="GUI"]
+offset_left = 1344.0
+offset_top = 193.0
+offset_right = 1530.0
+offset_bottom = 256.0
+theme_override_font_sizes/font_size = 45
+text = "Player 1:"
+
+[node name="Player1Sprite" type="Sprite2D" parent="GUI"]
+position = Vector2(1624, 232)
+scale = Vector2(1.3, 1.3)
+texture = ExtResource("3_0333r")
+region_enabled = true
+region_rect = Rect2(8, 108, 85, 86)
+
+[node name="Player2Label" type="Label" parent="GUI"]
+offset_left = 1344.0
+offset_top = 370.0
+offset_right = 1530.0
+offset_bottom = 433.0
+theme_override_font_sizes/font_size = 45
+text = "Player 2:"
+
+[node name="Player2Sprite" type="Sprite2D" parent="GUI"]
+position = Vector2(1624, 392)
+scale = Vector2(1.3, 1.3)
+texture = ExtResource("3_0333r")
+region_enabled = true
+region_rect = Rect2(307, 108, 86, 86)
+
 [connection signal="pressed" from="GUI/RestartButton" to="." method="_on_restart_button_pressed"]
 [connection signal="pressed" from="GUI/DiceButton" to="." method="_on_dice_button_pressed"]
 [connection signal="pressed" from="GUI/Test" to="." method="_on_test_pressed"]