Merge branch 'main' of https://codeberg.org/code-your-friends/gmtk2022

3 files changed, 65 insertions, 52 deletions

diff --git a/godot/scenes/Die.gd b/godot/scenes/Die.gd
index dcf165c..f09a8b0 100644
--- a/godot/scenes/Die.gd
+++ b/godot/scenes/Die.gd
@@ -133,7 +133,7 @@ func _physics_process(delta):
 		dice_is_moving = true
 		$PowerUI3D/SpriteCircles.hide()
 		
-	if after_stroke && dice_still_timing == true && (OS.get_ticks_msec() - dice_is_still_since) > 200:
+	if after_stroke && dice_still_timing == true && (OS.get_ticks_msec() - dice_is_still_since) > 500:
 		print("stop timing while not morbin")
 		dice_is_moving = false
 		after_stroke = false
diff --git a/godot/scenes/Menu.tscn b/godot/scenes/Menu.tscn
index e77a18d..32fd74a 100644
--- a/godot/scenes/Menu.tscn
+++ b/godot/scenes/Menu.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=20 format=2]
+[gd_scene load_steps=23 format=2]
 
 [ext_resource path="res://assets/theme.tres" type="Theme" id=1]
 [ext_resource path="res://scenes/Menu.gd" type="Script" id=2]
@@ -9,6 +9,7 @@
 [ext_resource path="res://assets/fonts/format.otf" type="DynamicFontData" id=7]
 [ext_resource path="res://assets/fonts/theme_smalltext.tres" type="Theme" id=8]
 [ext_resource path="res://assets/fonts/theme_middletext.tres" type="Theme" id=9]
+[ext_resource path="res://assets/fonts/theme_bigtext.tres" type="Theme" id=10]
 
 [sub_resource type="DynamicFont" id=1]
 size = 55
@@ -40,6 +41,23 @@ content_margin_top = 10.0
 content_margin_bottom = 10.0
 bg_color = Color( 0.176471, 0.14902, 0.141176, 1 )
 
+[sub_resource type="DynamicFont" id=11]
+size = 137
+font_data = ExtResource( 7 )
+
+[sub_resource type="StyleBoxFlat" id=7]
+bg_color = Color( 0.160784, 0.133333, 0.133333, 1 )
+
+[sub_resource type="Theme" id=12]
+Button/fonts/font = SubResource( 1 )
+Button/styles/disabled = SubResource( 2 )
+Button/styles/focus = SubResource( 3 )
+Button/styles/hover = SubResource( 4 )
+Button/styles/normal = SubResource( 5 )
+Button/styles/pressed = SubResource( 6 )
+Label/fonts/font = SubResource( 11 )
+Panel/styles/panel = SubResource( 7 )
+
 [sub_resource type="DynamicFontData" id=8]
 font_path = "res://assets/fonts/Roboto-Medium.ttf"
 
@@ -47,9 +65,6 @@ font_path = "res://assets/fonts/Roboto-Medium.ttf"
 size = 23
 font_data = SubResource( 8 )
 
-[sub_resource type="StyleBoxFlat" id=7]
-bg_color = Color( 0.160784, 0.133333, 0.133333, 1 )
-
 [sub_resource type="Theme" id=10]
 Button/fonts/font = SubResource( 1 )
 Button/styles/disabled = SubResource( 2 )
@@ -96,11 +111,11 @@ focus_neighbour_bottom = NodePath("../StartButton")
 text = "Quit"
 
 [node name="Label" type="Label" parent="."]
-margin_left = 584.0
+margin_left = 2.0
 margin_top = 28.0
-margin_right = 1304.0
-margin_bottom = 156.0
-theme = ExtResource( 1 )
+margin_right = 1917.0
+margin_bottom = 166.0
+theme = SubResource( 12 )
 text = "Golf with your Dice"
 align = 1
 valign = 1
@@ -168,24 +183,17 @@ https://freesound.org/s/586538/
 In Game: \"Background Music\" by Migfus20
 https://freesound.org/s/586838/"
 
-[node name="Label2" type="Label" parent="."]
-anchor_left = 0.05
-anchor_top = 0.2
-anchor_right = 0.3
-anchor_bottom = 0.2
-margin_bottom = 51.0
-theme = ExtResource( 9 )
-text = "HOW TO PLAY"
-align = 1
-
 [node name="VBoxContainer2" type="VBoxContainer" parent="."]
 anchor_left = 0.05
 anchor_top = 0.25
 anchor_right = 0.3
 anchor_bottom = 0.7
+margin_top = 89.0
+margin_right = 108.0
+margin_bottom = 78.0
 
 [node name="Control" type="Control" parent="VBoxContainer2"]
-margin_right = 480.0
+margin_right = 588.0
 margin_bottom = 80.0
 rect_min_size = Vector2( 480, 80 )
 
@@ -206,7 +214,7 @@ valign = 1
 
 [node name="Control2" type="Control" parent="VBoxContainer2"]
 margin_top = 84.0
-margin_right = 480.0
+margin_right = 588.0
 margin_bottom = 164.0
 rect_min_size = Vector2( 480, 80 )
 
@@ -229,7 +237,7 @@ autowrap = true
 
 [node name="Control3" type="Control" parent="VBoxContainer2"]
 margin_top = 168.0
-margin_right = 480.0
+margin_right = 588.0
 margin_bottom = 248.0
 rect_min_size = Vector2( 480, 80 )
 
@@ -252,13 +260,13 @@ autowrap = true
 
 [node name="Control4" type="Control" parent="VBoxContainer2"]
 margin_top = 252.0
-margin_right = 480.0
+margin_right = 588.0
 margin_bottom = 277.0
 rect_min_size = Vector2( 480, 25 )
 
 [node name="Control5" type="Control" parent="VBoxContainer2"]
 margin_top = 281.0
-margin_right = 480.0
+margin_right = 588.0
 margin_bottom = 361.0
 rect_min_size = Vector2( 480, 80 )
 
@@ -283,7 +291,7 @@ autowrap = true
 
 [node name="Control6" type="Control" parent="VBoxContainer2"]
 margin_top = 365.0
-margin_right = 480.0
+margin_right = 588.0
 margin_bottom = 445.0
 rect_min_size = Vector2( 480, 80 )
 
@@ -313,8 +321,11 @@ anchor_left = 0.05
 anchor_top = 0.2
 anchor_right = 0.3
 anchor_bottom = 0.2
-margin_bottom = 51.0
-theme = ExtResource( 1 )
+margin_left = 109.0
+margin_top = 44.0
+margin_right = 268.0
+margin_bottom = 138.0
+theme = ExtResource( 10 )
 text = "HOW TO PLAY"
 align = 1
 
@@ -323,6 +334,8 @@ anchor_left = 0.05
 anchor_top = 0.25
 anchor_right = 0.3
 anchor_bottom = 0.7
+margin_top = 42.0
+margin_bottom = 54.0
 
 [connection signal="pressed" from="VBoxContainer/StartButton" to="." method="_on_StartButton_pressed"]
 [connection signal="pressed" from="VBoxContainer/QuitButton" to="." method="_on_QuitButton_pressed"]
diff --git a/godot/scenes/objects/Scoreboard.tscn b/godot/scenes/objects/Scoreboard.tscn
index 070065a..9016072 100644
--- a/godot/scenes/objects/Scoreboard.tscn
+++ b/godot/scenes/objects/Scoreboard.tscn
@@ -27,7 +27,7 @@ columns = 5
 
 [node name="LabelHeader" type="Label" parent="Panel/GridContainer"]
 margin_right = 322.0
-margin_bottom = 51.0
+margin_bottom = 56.0
 size_flags_horizontal = 3
 size_flags_vertical = 1
 size_flags_stretch_ratio = 20.0
@@ -40,7 +40,7 @@ autowrap = true
 [node name="Label" type="Label" parent="Panel/GridContainer"]
 margin_left = 326.0
 margin_right = 648.0
-margin_bottom = 51.0
+margin_bottom = 56.0
 size_flags_horizontal = 3
 size_flags_vertical = 1
 size_flags_stretch_ratio = 20.0
@@ -53,7 +53,7 @@ autowrap = true
 [node name="Label2" type="Label" parent="Panel/GridContainer"]
 margin_left = 652.0
 margin_right = 974.0
-margin_bottom = 51.0
+margin_bottom = 56.0
 size_flags_horizontal = 3
 size_flags_vertical = 1
 size_flags_stretch_ratio = 20.0
@@ -66,7 +66,7 @@ autowrap = true
 [node name="Label3" type="Label" parent="Panel/GridContainer"]
 margin_left = 978.0
 margin_right = 1300.0
-margin_bottom = 51.0
+margin_bottom = 56.0
 size_flags_horizontal = 3
 size_flags_vertical = 1
 size_flags_stretch_ratio = 20.0
@@ -79,7 +79,7 @@ autowrap = true
 [node name="Label4" type="Label" parent="Panel/GridContainer"]
 margin_left = 1304.0
 margin_right = 1626.0
-margin_bottom = 51.0
+margin_bottom = 56.0
 size_flags_horizontal = 3
 size_flags_vertical = 1
 size_flags_stretch_ratio = 20.0
@@ -90,9 +90,9 @@ valign = 3
 autowrap = true
 
 [node name="LabelHeader2" type="Label" parent="Panel/GridContainer"]
-margin_top = 55.0
+margin_top = 60.0
 margin_right = 322.0
-margin_bottom = 106.0
+margin_bottom = 116.0
 size_flags_horizontal = 3
 size_flags_vertical = 1
 size_flags_stretch_ratio = 20.0
@@ -104,9 +104,9 @@ autowrap = true
 
 [node name="Par0" type="Label" parent="Panel/GridContainer"]
 margin_left = 326.0
-margin_top = 55.0
+margin_top = 60.0
 margin_right = 648.0
-margin_bottom = 106.0
+margin_bottom = 116.0
 size_flags_horizontal = 3
 size_flags_vertical = 1
 size_flags_stretch_ratio = 20.0
@@ -118,9 +118,9 @@ autowrap = true
 
 [node name="Par1" type="Label" parent="Panel/GridContainer"]
 margin_left = 652.0
-margin_top = 55.0
+margin_top = 60.0
 margin_right = 974.0
-margin_bottom = 106.0
+margin_bottom = 116.0
 size_flags_horizontal = 3
 size_flags_vertical = 1
 size_flags_stretch_ratio = 20.0
@@ -132,9 +132,9 @@ autowrap = true
 
 [node name="Par2" type="Label" parent="Panel/GridContainer"]
 margin_left = 978.0
-margin_top = 55.0
+margin_top = 60.0
 margin_right = 1300.0
-margin_bottom = 106.0
+margin_bottom = 116.0
 size_flags_horizontal = 3
 size_flags_vertical = 1
 size_flags_stretch_ratio = 20.0
@@ -146,9 +146,9 @@ autowrap = true
 
 [node name="ParSum" type="Label" parent="Panel/GridContainer"]
 margin_left = 1304.0
-margin_top = 55.0
+margin_top = 60.0
 margin_right = 1626.0
-margin_bottom = 106.0
+margin_bottom = 116.0
 size_flags_horizontal = 3
 size_flags_vertical = 1
 size_flags_stretch_ratio = 20.0
@@ -159,9 +159,9 @@ valign = 3
 autowrap = true
 
 [node name="LabelHeader3" type="Label" parent="Panel/GridContainer"]
-margin_top = 110.0
+margin_top = 120.0
 margin_right = 322.0
-margin_bottom = 161.0
+margin_bottom = 176.0
 size_flags_horizontal = 3
 size_flags_vertical = 1
 size_flags_stretch_ratio = 20.0
@@ -173,9 +173,9 @@ autowrap = true
 
 [node name="Player0" type="Label" parent="Panel/GridContainer"]
 margin_left = 326.0
-margin_top = 110.0
+margin_top = 120.0
 margin_right = 648.0
-margin_bottom = 161.0
+margin_bottom = 176.0
 size_flags_horizontal = 3
 size_flags_vertical = 1
 size_flags_stretch_ratio = 20.0
@@ -187,9 +187,9 @@ autowrap = true
 
 [node name="Player1" type="Label" parent="Panel/GridContainer"]
 margin_left = 652.0
-margin_top = 110.0
+margin_top = 120.0
 margin_right = 974.0
-margin_bottom = 161.0
+margin_bottom = 176.0
 size_flags_horizontal = 3
 size_flags_vertical = 1
 size_flags_stretch_ratio = 20.0
@@ -201,9 +201,9 @@ autowrap = true
 
 [node name="Player2" type="Label" parent="Panel/GridContainer"]
 margin_left = 978.0
-margin_top = 110.0
+margin_top = 120.0
 margin_right = 1300.0
-margin_bottom = 161.0
+margin_bottom = 176.0
 size_flags_horizontal = 3
 size_flags_vertical = 1
 size_flags_stretch_ratio = 20.0
@@ -215,9 +215,9 @@ autowrap = true
 
 [node name="PlayerSum" type="Label" parent="Panel/GridContainer"]
 margin_left = 1304.0
-margin_top = 110.0
+margin_top = 120.0
 margin_right = 1626.0
-margin_bottom = 161.0
+margin_bottom = 176.0
 size_flags_horizontal = 3
 size_flags_vertical = 1
 size_flags_stretch_ratio = 20.0