diff --git a/environment_manager.gd b/environment_manager.gd index f728f03..81d4f03 100644 --- a/environment_manager.gd +++ b/environment_manager.gd @@ -5,6 +5,7 @@ var hand_associations: Dictionary[String, PlayerHand] @export var web_client: WebClient +@export var trump_stack: CardStack @export var card_stack: CardStack # In gameplay order @@ -116,7 +117,8 @@ func _on_web_client_tcp_received_play_winner_request() -> void: func _on_web_client_tcp_trump_received(trump_id: int) -> void: _trump_id = trump_id card_stack.purge_cards() - card_stack.add_card_by_id(_trump_id) + trump_stack.purge_cards() + trump_stack.add_card_by_id(_trump_id) func _on_web_client_tcp_new_round_started() -> void: # prepare a fresh BetResults bunch for the new round! the clients are hungry. diff --git a/game.tscn b/game.tscn index bab3603..6900e18 100644 --- a/game.tscn +++ b/game.tscn @@ -318,9 +318,10 @@ grow_vertical = 2 theme_override_colors/font_color = Color(1, 0.28, 0.28, 1) text = "NOT ALLOWED!" -[node name="EnvironmentManager" type="Node3D" parent="." node_paths=PackedStringArray("web_client", "card_stack", "own_player_hand", "hand_markers_3", "hand_markers_4", "hand_markers_5", "hand_markers_6")] +[node name="EnvironmentManager" type="Node3D" parent="." node_paths=PackedStringArray("web_client", "trump_stack", "card_stack", "own_player_hand", "hand_markers_3", "hand_markers_4", "hand_markers_5", "hand_markers_6")] script = ExtResource("4_7jktm") web_client = NodePath("../WebClient") +trump_stack = NodePath("TrumpStack") card_stack = NodePath("CardStack") own_player_hand = NodePath("PlayerHand0") hand_markers_3 = [NodePath("HandMarker1"), NodePath("HandMarker2")] @@ -364,7 +365,12 @@ transform = Transform3D(-0.5, 0.836516, 0.224144, 0, 0.258819, -0.965925, -0.866 transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, 0.704226) [node name="CardStack" type="Marker3D" parent="EnvironmentManager"] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -0.999999, -4.37114e-08, -0.0775449, 0.372575, 0.973012) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -0.999999, -4.37114e-08, 0.18, 0.115, 0.973) +script = ExtResource("8_j5wjh") +playing_card_scene = ExtResource("6_eow3j") + +[node name="TrumpStack" type="Marker3D" parent="EnvironmentManager"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -0.999999, -4.37114e-08, -0.18, 0.115, 0.973) script = ExtResource("8_j5wjh") playing_card_scene = ExtResource("6_eow3j")