Merge branch 'main' into images

assets/theme_small.tres

@@ -0,0 +1,4 @@
+[gd_resource type="Theme" format=3 uid="uid://bbjcf4njtb4tm"]
+
+[resource]
+default_font_size = 20

scenes/components/copy_category.tscn

@@ -0,0 +1,21 @@
+[gd_scene format=3 uid="uid://cxdrsvvm35br2"]
+
+[node name="CopyCategory" type="HBoxContainer"]
+layout_direction = 3
+offset_left = 20.0
+offset_right = 197.0
+offset_bottom = 49.0
+theme_override_constants/separation = 5
+
+[node name="MarginContainer" type="MarginContainer" parent="."]
+custom_minimum_size = Vector2(10, 0)
+layout_mode = 2
+
+[node name="Amount" type="SpinBox" parent="."]
+layout_mode = 2
+
+[node name="Name" type="Label" parent="."]
+layout_direction = 2
+layout_mode = 2
+text = "adwawdawd"
+max_lines_visible = 1

scenes/login.tscn

@@ -1,8 +1,12 @@
-[gd_scene load_steps=3 format=3 uid="uid://2ysj36v7ruon"]
+[gd_scene load_steps=4 format=3 uid="uid://2ysj36v7ruon"]
 
 [ext_resource type="Script" path="res://scripts/login.gd" id="1_4rhoe"]
 [ext_resource type="LabelSettings" uid="uid://jfhijl2ucmeq" path="res://assets/label_settings.tres" id="2_hmd01"]
 
+[sub_resource type="LabelSettings" id="LabelSettings_cvayw"]
+font_size = 20
+font_color = Color(0.984314, 0.443137, 0.345098, 1)
+
 [node name="Login" type="CanvasLayer"]
 script = ExtResource("1_4rhoe")
 scene_after_login = "menu"
@@ -47,7 +51,7 @@ grow_horizontal = 2
 grow_vertical = 2
 focus_next = NodePath("../Password")
 theme_override_font_sizes/font_size = 30
-placeholder_text = "EMail oder Benutzername"
+placeholder_text = "E-Mail oder Benutzername"
 alignment = 1
 expand_to_text_length = true
 context_menu_enabled = false
@@ -93,7 +97,25 @@ grow_vertical = 0
 focus_previous = NodePath("../Password")
 theme_override_font_sizes/font_size = 40
 disabled = true
-text = "Anmelden ->"
+text = "Login"
+
+[node name="Error" type="Label" parent="LoginBox"]
+visible = false
+layout_mode = 1
+anchors_preset = 7
+anchor_left = 0.5
+anchor_top = 1.0
+anchor_right = 0.5
+anchor_bottom = 1.0
+offset_left = -170.0
+offset_top = -108.0
+offset_right = 170.0
+offset_bottom = -85.0
+grow_horizontal = 2
+grow_vertical = 0
+text = "E-Mail/Benutzername oder Passwort sind falsch!"
+label_settings = SubResource("LabelSettings_cvayw")
+horizontal_alignment = 1
 
 [connection signal="text_changed" from="LoginBox/EMail" to="." method="on_email_text_changed"]
 [connection signal="text_changed" from="LoginBox/Password" to="." method="on_password_text_changed"]

scenes/menu.tscn

@@ -1,76 +1,252 @@
-[gd_scene load_steps=3 format=3 uid="uid://yyc1l3e78qgl"]
+[gd_scene load_steps=10 format=3 uid="uid://yyc1l3e78qgl"]
 
 [ext_resource type="Script" path="res://scripts/menu.gd" id="1_f4qtc"]
+[ext_resource type="Theme" uid="uid://bbjcf4njtb4tm" path="res://assets/theme_small.tres" id="2_7ph5j"]
 
-[sub_resource type="Theme" id="Theme_31w7n"]
-default_font_size = 70
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_r2tkh"]
+bg_color = Color(0.239216, 0.239216, 0.239216, 1)
+border_width_left = 8
+border_width_top = 8
+border_width_right = 8
+border_width_bottom = 8
+border_color = Color(0, 0, 0, 1)
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_e6ve8"]
+bg_color = Color(0.239216, 0.239216, 0.239216, 1)
+border_color = Color(0, 0, 0, 1)
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_sdl70"]
+bg_color = Color(0.239216, 0.239216, 0.239216, 1)
+border_width_left = 4
+border_width_top = 4
+border_width_right = 4
+border_width_bottom = 4
+border_color = Color(0, 0, 0, 1)
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_yhbp7"]
+bg_color = Color(0.192157, 0.192157, 0.192157, 1)
+border_width_left = 8
+border_width_top = 8
+border_width_right = 8
+border_width_bottom = 8
+border_color = Color(0, 0, 0, 1)
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_r78im"]
+bg_color = Color(0.0980392, 0.0980392, 0.0980392, 1)
+border_width_left = 4
+border_width_top = 4
+border_width_right = 4
+border_width_bottom = 4
+border_color = Color(0, 0, 0, 1)
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_v1l70"]
+bg_color = Color(0.137255, 0.137255, 0.137255, 1)
+border_width_left = 4
+border_width_top = 4
+border_width_right = 4
+border_width_bottom = 4
+border_color = Color(0, 0, 0, 1)
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_eb82c"]
+bg_color = Color(0.137255, 0.137255, 0.137255, 1)
 
 [node name="Menu" type="CanvasLayer"]
 script = ExtResource("1_f4qtc")
 
-[node name="Start" type="Button" parent="."]
-anchors_preset = 3
-anchor_left = 1.0
-anchor_top = 1.0
+[node name="BG" type="Sprite2D" parent="."]
+
+[node name="Buttons" type="Control" parent="."]
+layout_mode = 3
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="Play" type="Button" parent="Buttons"]
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -229.5
+offset_top = -214.0
+offset_right = 229.5
+offset_bottom = -86.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_font_sizes/font_size = 60
+theme_override_styles/normal = SubResource("StyleBoxFlat_r2tkh")
+theme_override_styles/hover = SubResource("StyleBoxFlat_r2tkh")
+theme_override_styles/pressed = SubResource("StyleBoxFlat_e6ve8")
+text = "Play"
+
+[node name="Options" type="Button" parent="Buttons"]
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -229.5
+offset_top = -64.0
+offset_right = 229.5
+offset_bottom = 64.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_font_sizes/font_size = 60
+theme_override_styles/normal = SubResource("StyleBoxFlat_r2tkh")
+theme_override_styles/hover = SubResource("StyleBoxFlat_r2tkh")
+theme_override_styles/pressed = SubResource("StyleBoxFlat_e6ve8")
+text = "Options"
+
+[node name="Quit" type="Button" parent="Buttons"]
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -229.5
+offset_top = 86.0
+offset_right = 229.5
+offset_bottom = 214.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_font_sizes/font_size = 60
+theme_override_styles/normal = SubResource("StyleBoxFlat_r2tkh")
+theme_override_styles/hover = SubResource("StyleBoxFlat_r2tkh")
+theme_override_styles/pressed = SubResource("StyleBoxFlat_e6ve8")
+theme_override_styles/focus = SubResource("StyleBoxFlat_sdl70")
+text = "Quit Game"
+
+[node name="RoundCreation" type="CanvasLayer" parent="."]
+
+[node name="ColorRect" type="ColorRect" parent="RoundCreation"]
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_left = -360.0
-offset_top = -140.0
-offset_right = -60.0
-offset_bottom = -60.0
-grow_horizontal = 0
-grow_vertical = 0
-theme_override_font_sizes/font_size = 40
-text = "Spiel starten"
+grow_horizontal = 2
+grow_vertical = 2
+color = Color(0.137255, 0.137255, 0.137255, 0.431373)
 
-[node name="ModeSelect" type="OptionButton" parent="."]
-offset_left = 56.0
-offset_top = 56.0
-offset_right = 101.0
-offset_bottom = 76.0
-theme_override_font_sizes/font_size = 40
-metadata/_edit_use_anchors_ = true
-
-[node name="CopyCategory" type="HBoxContainer" parent="."]
-visible = false
-layout_direction = 3
-offset_right = 100.0
-offset_bottom = 31.0
-
-[node name="Amount" type="SpinBox" parent="CopyCategory"]
-layout_mode = 2
-
-[node name="Name" type="Label" parent="CopyCategory"]
-layout_direction = 2
-layout_mode = 2
-max_lines_visible = 1
-
-[node name="CategoryBox" type="ScrollContainer" parent="."]
-layout_direction = 2
-anchors_preset = 1
-anchor_left = 1.0
+[node name="CreationMenu" type="Panel" parent="RoundCreation"]
+anchors_preset = 15
 anchor_right = 1.0
-offset_left = -154.0
-offset_top = 48.0
-offset_right = -48.0
-offset_bottom = 362.0
-grow_horizontal = 0
-horizontal_scroll_mode = 0
-
-[node name="Categories" type="VBoxContainer" parent="CategoryBox"]
-layout_direction = 3
-layout_mode = 2
-alignment = 2
-
-[node name="RoundDuration" type="SpinBox" parent="."]
-offset_left = 54.0
-offset_top = 190.0
-offset_right = 326.225
-offset_bottom = 278.0
-theme = SubResource("Theme_31w7n")
+anchor_bottom = 1.0
+offset_left = 660.0
+offset_top = 80.0
+offset_right = -660.0
+offset_bottom = -80.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_styles/panel = SubResource("StyleBoxFlat_yhbp7")
+
+[node name="ModeSelect" type="OptionButton" parent="RoundCreation/CreationMenu"]
+layout_mode = 1
+offset_left = 40.0
+offset_top = 100.0
+offset_right = 180.0
+offset_bottom = 140.0
+theme = ExtResource("2_7ph5j")
+theme_override_font_sizes/font_size = 40
+
+[node name="Label" type="Label" parent="RoundCreation/CreationMenu/ModeSelect"]
+layout_mode = 1
+offset_top = -40.0
+offset_right = 120.0
+theme = ExtResource("2_7ph5j")
+text = "Game Mode"
+vertical_alignment = 1
+
+[node name="RoundDuration" type="SpinBox" parent="RoundCreation/CreationMenu"]
+layout_mode = 1
+offset_left = 40.0
+offset_top = 200.0
+offset_right = 135.0
+offset_bottom = 240.0
+theme = ExtResource("2_7ph5j")
 min_value = 5.0
 max_value = 90.0
 value = 30.0
 suffix = "s"
+custom_arrow_step = 5.0
+
+[node name="Label" type="Label" parent="RoundCreation/CreationMenu/RoundDuration"]
+layout_mode = 1
+offset_top = -40.0
+offset_right = 160.0
+theme = ExtResource("2_7ph5j")
+text = "Round Duration"
+vertical_alignment = 1
+
+[node name="CategoryBox" type="Tree" parent="RoundCreation/CreationMenu"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 38.0
+offset_top = 260.0
+offset_right = -38.0
+offset_bottom = -114.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_colors/font_color = Color(0.6, 0.6, 0.6, 1)
+theme_override_colors/relationship_line_color = Color(0.301961, 0.301961, 0.301961, 1)
+theme_override_colors/parent_hl_line_color = Color(1, 1, 1, 1)
+theme_override_colors/children_hl_line_color = Color(0.6, 0.6, 0.6, 1)
+theme_override_constants/inner_item_margin_left = 5
+theme_override_constants/draw_relationship_lines = 1
+theme_override_constants/relationship_line_width = 2
+theme_override_constants/parent_hl_line_width = 3
+theme_override_constants/children_hl_line_width = 3
+theme_override_constants/draw_guides = 0
+columns = 2
+column_titles_visible = true
+hide_root = true
+
+[node name="Cancel" type="Button" parent="RoundCreation/CreationMenu"]
+layout_mode = 1
+anchors_preset = 7
+anchor_left = 0.5
+anchor_top = 1.0
+anchor_right = 0.5
+anchor_bottom = 1.0
+offset_left = -220.0
+offset_top = -100.0
+offset_right = -32.0
+offset_bottom = -25.0
+grow_horizontal = 2
+grow_vertical = 0
+theme_override_font_sizes/font_size = 30
+theme_override_styles/normal = SubResource("StyleBoxFlat_r78im")
+theme_override_styles/hover = SubResource("StyleBoxFlat_v1l70")
+theme_override_styles/pressed = SubResource("StyleBoxFlat_eb82c")
+text = "Cancel"
+
+[node name="Start" type="Button" parent="RoundCreation/CreationMenu"]
+layout_mode = 1
+anchors_preset = 7
+anchor_left = 0.5
+anchor_top = 1.0
+anchor_right = 0.5
+anchor_bottom = 1.0
+offset_left = 40.0
+offset_top = -100.0
+offset_right = 228.0
+offset_bottom = -25.0
+grow_horizontal = 2
+grow_vertical = 0
+theme_override_font_sizes/font_size = 30
+theme_override_styles/normal = SubResource("StyleBoxFlat_r78im")
+theme_override_styles/hover = SubResource("StyleBoxFlat_v1l70")
+theme_override_styles/pressed = SubResource("StyleBoxFlat_eb82c")
+text = "Start Game"
 
-[connection signal="pressed" from="Start" to="." method="on_btn_start_pressed"]
+[connection signal="pressed" from="Buttons/Play" to="." method="on_play_pressed"]
+[connection signal="pressed" from="Buttons/Quit" to="." method="on_quit_pressed"]
+[connection signal="pressed" from="RoundCreation/CreationMenu/Cancel" to="." method="on_cancel_pressed"]
+[connection signal="pressed" from="RoundCreation/CreationMenu/Start" to="." method="on_btn_start_pressed"]

scripts/game_end.gd

@@ -6,7 +6,7 @@ func _ready():
 ## show_round_data displays the given round_data data on screen.
 func show_round_data(data: Dictionary):
 	print(data)
-	$RoundCounter.text = "Runde %d/%d (%s)" % [data.current_round, data.max_round, data.category]
+	$RoundCounter.text = "Runde %d/%d (%s)" % [data.current_round, data.max_round, data.category.title]
 
 	$Quiz/Question/Label.text = data.question.text
 	$Quiz/Answers/A/Label.text = data.answers[0].text