From ee7ba59ed27d278d0489dc52d3531bb6bdccc8c5 Mon Sep 17 00:00:00 2001 From: aspergerli Date: Tue, 10 Mar 2026 18:42:03 +0100 Subject: [PATCH] chore: made game run in 1080p 16:9 by deafault, changed settings to scale window better --- project.godot | 5 +-- scenes/schematic.tscn | 62 +++++++++++++------------------------- scripts/schematic_setup.gd | 5 ++- 3 files changed, 28 insertions(+), 44 deletions(-) diff --git a/project.godot b/project.godot index 87149ad..634a1ad 100644 --- a/project.godot +++ b/project.godot @@ -21,8 +21,9 @@ config/icon="res://icon.svg" [display] window/size/viewport_width=1920 -window/size/viewport_height=1200 -window/size/mode=3 +window/size/viewport_height=1080 +window/stretch/mode="viewport" +window/stretch/aspect="expand" [editor] diff --git a/scenes/schematic.tscn b/scenes/schematic.tscn index c1e2781..136de47 100644 --- a/scenes/schematic.tscn +++ b/scenes/schematic.tscn @@ -24,7 +24,7 @@ diffuse_texture = ExtResource("8_waqni") [node name="Schematic" type="Node2D" unique_id=590430084] script = ExtResource("1_1j52r") metadata/_edit_vertical_guides_ = [960.0, 480.0, 1440.0, 790.0, 980.0] -metadata/_edit_horizontal_guides_ = [600.0, 620.0, 370.0, 1000.0, -10.0] +metadata/_edit_horizontal_guides_ = [540.0, 560.0, 330.0, 880.0, -10.0] [node name="CardManager" type="Control" parent="." unique_id=697562693] layout_mode = 3 @@ -38,9 +38,9 @@ metadata/_custom_type_script = "uid://clqgq1n7v0ar" [node name="deck" type="Control" parent="CardManager" unique_id=1132160114] anchors_preset = 0 offset_left = 960.0 -offset_top = 600.0 +offset_top = 540.0 offset_right = 960.0 -offset_bottom = 600.0 +offset_bottom = 540.0 script = ExtResource("7_rwigh") card_face_up = false enable_drop_zone = false @@ -49,9 +49,9 @@ metadata/_custom_type_script = "uid://6ams8uvg43gu" [node name="Player1Hand" type="Control" parent="CardManager" unique_id=643995694] anchors_preset = 0 offset_left = 480.0 -offset_top = 1000.0 +offset_top = 880.0 offset_right = 480.0 -offset_bottom = 1000.0 +offset_bottom = 880.0 script = ExtResource("4_unpya") max_hand_size = 9 hand_rotation_curve = ExtResource("5_kdjyk") @@ -61,20 +61,20 @@ metadata/_custom_type_script = "uid://dj46jo3lfbclo" [node name="Player1PlayPile" type="Control" parent="CardManager" unique_id=1899485437] anchors_preset = 0 offset_left = 790.0 -offset_top = 620.0 +offset_top = 560.0 offset_right = 790.0 -offset_bottom = 620.0 +offset_bottom = 560.0 script = ExtResource("7_rwigh") sensor_texture = SubResource("CanvasTexture_ggwjq") sensor_visibility = true metadata/_custom_type_script = "uid://6ams8uvg43gu" -[node name="Player1Stiche" type="Control" parent="CardManager" unique_id=740577652] +[node name="Team1Stiche" type="Control" parent="CardManager" unique_id=740577652] anchors_preset = 0 offset_left = 790.0 -offset_top = 1000.0 +offset_top = 880.0 offset_right = 790.0 -offset_bottom = 1000.0 +offset_bottom = 880.0 script = ExtResource("7_rwigh") card_face_up = false sensor_texture = SubResource("CanvasTexture_unpya") @@ -83,9 +83,9 @@ metadata/_custom_type_script = "uid://6ams8uvg43gu" [node name="Player2Hand" type="Control" parent="CardManager" unique_id=1455320999] anchors_preset = 0 offset_left = 1440.0 -offset_top = 1000.0 +offset_top = 880.0 offset_right = 1440.0 -offset_bottom = 1000.0 +offset_bottom = 880.0 script = ExtResource("4_unpya") card_face_up = false hand_rotation_curve = ExtResource("5_kdjyk") @@ -95,20 +95,20 @@ metadata/_custom_type_script = "uid://dj46jo3lfbclo" [node name="Player2PlayPile" type="Control" parent="CardManager" unique_id=1774061344] anchors_preset = 0 offset_left = 980.0 -offset_top = 620.0 +offset_top = 560.0 offset_right = 980.0 -offset_bottom = 620.0 +offset_bottom = 560.0 script = ExtResource("7_rwigh") sensor_texture = SubResource("CanvasTexture_kdjyk") sensor_visibility = true metadata/_custom_type_script = "uid://6ams8uvg43gu" -[node name="Player2Stiche" type="Control" parent="CardManager" unique_id=561191290] +[node name="Team2Stiche" type="Control" parent="CardManager" unique_id=561191290] anchors_preset = 0 offset_left = 980.0 -offset_top = 1000.0 +offset_top = -10.0 offset_right = 980.0 -offset_bottom = 1000.0 +offset_bottom = -10.0 script = ExtResource("7_rwigh") card_face_up = false metadata/_custom_type_script = "uid://6ams8uvg43gu" @@ -128,24 +128,14 @@ metadata/_custom_type_script = "uid://dj46jo3lfbclo" [node name="Player3PlayPile" type="Control" parent="CardManager" unique_id=28196538] anchors_preset = 0 offset_left = 980.0 -offset_top = 370.0 +offset_top = 330.0 offset_right = 980.0 -offset_bottom = 370.0 +offset_bottom = 330.0 script = ExtResource("7_rwigh") sensor_texture = ExtResource("8_waqni") sensor_visibility = true metadata/_custom_type_script = "uid://6ams8uvg43gu" -[node name="Player3Stiche" type="Control" parent="CardManager" unique_id=1273928195] -anchors_preset = 0 -offset_left = 980.0 -offset_top = -10.0 -offset_right = 980.0 -offset_bottom = -10.0 -script = ExtResource("7_rwigh") -card_face_up = false -metadata/_custom_type_script = "uid://6ams8uvg43gu" - [node name="Player4Hand" type="Control" parent="CardManager" unique_id=1883169134] anchors_preset = 0 offset_left = 480.0 @@ -162,20 +152,10 @@ metadata/_custom_type_script = "uid://dj46jo3lfbclo" [node name="Player4PlayPile" type="Control" parent="CardManager" unique_id=1625790580] anchors_preset = 0 offset_left = 790.0 -offset_top = 370.0 +offset_top = 330.0 offset_right = 790.0 -offset_bottom = 370.0 +offset_bottom = 330.0 script = ExtResource("7_rwigh") sensor_texture = ExtResource("8_waqni") sensor_visibility = true metadata/_custom_type_script = "uid://6ams8uvg43gu" - -[node name="Player4Stiche" type="Control" parent="CardManager" unique_id=1604931271] -anchors_preset = 0 -offset_left = 790.0 -offset_top = -10.0 -offset_right = 790.0 -offset_bottom = -10.0 -script = ExtResource("7_rwigh") -card_face_up = false -metadata/_custom_type_script = "uid://6ams8uvg43gu" diff --git a/scripts/schematic_setup.gd b/scripts/schematic_setup.gd index bd2e650..fd01d96 100644 --- a/scripts/schematic_setup.gd +++ b/scripts/schematic_setup.gd @@ -21,14 +21,17 @@ func setup_game(): var deal_r: int =1 while true: deal_cards_to_hand(3, player_1_hand) + await get_tree().create_timer(0.5).timeout deal_cards_to_hand(3, player_2_hand) + await get_tree().create_timer(0.5).timeout deal_cards_to_hand(3, player_3_hand) + await get_tree().create_timer(0.5).timeout deal_cards_to_hand(3, player_4_hand) if deal_r == 3: dealt.emit() break else: - await Timer.new() + await get_tree().create_timer(0.5).timeout deal_r += 1 func create_standard_deck():