From 7c9aec177476c7aaa45b98ace88433caa1e80006 Mon Sep 17 00:00:00 2001 From: David Date: Sun, 17 Jul 2022 15:33:45 +0200 Subject: change phase to low gravity --- godot/scenes/Die.gd | 15 ++++++++------- godot/scenes/Die.tscn | 1 + godot/scenes/Game.gd | 1 + godot/scenes/levels/MainMenu.tscn | 2 +- godot/scenes/levels/level1/level1.tscn | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) (limited to 'godot/scenes') diff --git a/godot/scenes/Die.gd b/godot/scenes/Die.gd index 3591cba..121f27d 100644 --- a/godot/scenes/Die.gd +++ b/godot/scenes/Die.gd @@ -139,9 +139,8 @@ func _physics_process(delta): revert_current_buff() var last_buff = curr_buff curr_buff = get_buff_from_upwards_side() - if last_buff == curr_buff && curr_buff == buff.stroke: - return - apply_buff() + if not(last_buff == curr_buff && curr_buff == buff.stroke): + apply_buff() # Called every frame. 'delta' is the elapsed time since the previous frame. @@ -198,13 +197,16 @@ func get_buff_from_upwards_side(): if $Bounce1.get_overlapping_areas().size() > 0 || $Bounce2.get_overlapping_areas().size() > 0: return buff.bounce if $Phase1.get_overlapping_areas().size() > 0 || $Phase2.get_overlapping_areas().size() > 0: - return buff.phase + return buff.gravity return buff.none func low_gravity(): - gravity_scale = 0.2 + gravity_scale = 0.3 * default_gravity + +func low_gravity_revert(): + gravity_scale = default_gravity func extra_stroke(): _game.revoke_stroke() @@ -249,10 +251,9 @@ func revert_current_buff(): buff.phase: phase_revert() buff.gravity: - gravity_scale = default_gravity + low_gravity_revert() func apply_buff(): - gravity_scale = default_gravity match curr_buff: buff.ball: ball() diff --git a/godot/scenes/Die.tscn b/godot/scenes/Die.tscn index 5c96dbb..8a85207 100644 --- a/godot/scenes/Die.tscn +++ b/godot/scenes/Die.tscn @@ -154,6 +154,7 @@ margin_bottom = 153.0 [node name="Arrow" type="MeshInstance" parent="PowerUI3D"] [node name="SpriteCircles" type="Sprite3D" parent="PowerUI3D"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.506, 0 ) cast_shadow = 0 opacity = 0.43 pixel_size = 0.0071 diff --git a/godot/scenes/Game.gd b/godot/scenes/Game.gd index fef2cc8..4ad258a 100644 --- a/godot/scenes/Game.gd +++ b/godot/scenes/Game.gd @@ -82,6 +82,7 @@ func next_level(): post_game = false levels[current_level_id].hide() + levels[current_level_id].set_active(false) current_level_id = current_level_id + 1 current_strokes = 0 diff --git a/godot/scenes/levels/MainMenu.tscn b/godot/scenes/levels/MainMenu.tscn index 77c50b1..b78bd7f 100644 --- a/godot/scenes/levels/MainMenu.tscn +++ b/godot/scenes/levels/MainMenu.tscn @@ -65,7 +65,7 @@ stream = ExtResource( 4 ) autoplay = true [node name="Background" type="MeshInstance" parent="."] -transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 10, 0, -3.21632, 0 ) +transform = Transform( 100, 0, 0, 0, 1, 0, 0, 0, 100, 0, -3.21632, 0 ) mesh = SubResource( 1 ) skin = SubResource( 5 ) material/0 = null diff --git a/godot/scenes/levels/level1/level1.tscn b/godot/scenes/levels/level1/level1.tscn index 793b2c0..0bfe709 100644 --- a/godot/scenes/levels/level1/level1.tscn +++ b/godot/scenes/levels/level1/level1.tscn @@ -73,7 +73,7 @@ points = PoolVector3Array( -0.71742, 0.11773, -0.254227, -0.388641, 0.201786, -0 [node name="Spatial" type="Spatial"] [node name="Die" parent="." instance=ExtResource( 7 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -47.8823, -0.0948428 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -51.653, -0.095 ) [node name="Spatial" type="Spatial" parent="."] transform = Transform( 20, 0, 0, 0, 20, 0, 0, 0, 20, 0, 0.505757, 0 ) -- cgit From ddbcd54013ac76016c39f76394654c4d1451c662 Mon Sep 17 00:00:00 2001 From: David Date: Sun, 17 Jul 2022 15:58:16 +0200 Subject: display buff text --- godot/scenes/Die.gd | 14 +++++++++++++- godot/scenes/Die.tscn | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 3 deletions(-) (limited to 'godot/scenes') diff --git a/godot/scenes/Die.gd b/godot/scenes/Die.gd index 121f27d..b6b9b9e 100644 --- a/godot/scenes/Die.gd +++ b/godot/scenes/Die.gd @@ -240,9 +240,20 @@ func ball_revert(): $BallShape.set_process(false) $BallShape.disabled = true - +func buff_text(): + match curr_buff: + buff.ball: + return "" + buff.bounce: + return "You're bouncy!" + buff.phase: + return "WooOOoOO you can phase through walls" + buff.gravity: + return "Warning, Low gravity!" + return "" func revert_current_buff(): + $PowerUI/LabelBuff.text = "" match curr_buff: buff.ball: ball_revert() @@ -254,6 +265,7 @@ func revert_current_buff(): low_gravity_revert() func apply_buff(): + $PowerUI/LabelBuff.text = buff_text() match curr_buff: buff.ball: ball() diff --git a/godot/scenes/Die.tscn b/godot/scenes/Die.tscn index 8a85207..69727f1 100644 --- a/godot/scenes/Die.tscn +++ b/godot/scenes/Die.tscn @@ -1,8 +1,10 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=15 format=2] [ext_resource path="res://scenes/Die.gd" type="Script" id=1] [ext_resource path="res://assets/game_objects/W8baseColor_Mat.material" type="Material" id=2] [ext_resource path="res://assets/textures/circles.png" type="Texture" id=3] +[ext_resource path="res://assets/fonts/default_dynamicfont.tres" type="DynamicFont" id=4] +[ext_resource path="res://assets/fonts/default_dynamicfontdata.tres" type="DynamicFontData" id=5] [sub_resource type="PhysicsMaterial" id=7] friction = 0.0 @@ -32,6 +34,18 @@ surfaces/0 = { [sub_resource type="SphereShape" id=6] radius = 0.1 +[sub_resource type="DynamicFont" id=8] +size = 35 +font_data = ExtResource( 5 ) + +[sub_resource type="Theme" id=9] +ProgressBar/fonts/font = SubResource( 8 ) + +[sub_resource type="Theme" id=10] +Label/colors/font_color = Color( 0.933333, 0.654902, 0.0666667, 1 ) +Label/colors/font_color_shadow = Color( 0, 0, 0, 1 ) +Label/fonts/font = ExtResource( 4 ) + [node name="Die" type="RigidBody"] collision_layer = 3 collision_mask = 3 @@ -147,7 +161,21 @@ margin_bottom = 40.0 margin_left = 64.0 margin_top = 44.0 margin_right = 1185.0 -margin_bottom = 153.0 +margin_bottom = 113.0 +theme = SubResource( 9 ) + +[node name="LabelBuff" type="Label" parent="PowerUI"] +anchor_left = 0.689 +anchor_top = 0.068 +anchor_right = 0.914 +anchor_bottom = 0.081 +margin_left = -30.0 +margin_top = -30.0 +margin_right = 30.0 +margin_bottom = 30.0 +theme = SubResource( 10 ) +align = 2 +valign = 1 [node name="PowerUI3D" type="Spatial" parent="."] -- cgit From e146111ffbee2b133ea16bf97905c5f4559af95e Mon Sep 17 00:00:00 2001 From: David Date: Sun, 17 Jul 2022 16:29:41 +0200 Subject: improve menu --- godot/scenes/Menu.tscn | 115 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 102 insertions(+), 13 deletions(-) (limited to 'godot/scenes') diff --git a/godot/scenes/Menu.tscn b/godot/scenes/Menu.tscn index b3e0311..fefd680 100644 --- a/godot/scenes/Menu.tscn +++ b/godot/scenes/Menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=20 format=2] [ext_resource path="res://assets/theme.tres" type="Theme" id=1] [ext_resource path="res://scenes/Menu.gd" type="Script" id=2] @@ -6,6 +6,59 @@ [ext_resource path="res://assets/Images/icons8-mausklick-links-26.png" type="Texture" id=4] [ext_resource path="res://assets/Images/icons8-esc-80.png" type="Texture" id=5] [ext_resource path="res://assets/Images/Tab.png" type="Texture" id=6] +[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] + +[sub_resource type="DynamicFont" id=1] +size = 55 +extra_spacing_bottom = -15 +font_data = ExtResource( 7 ) + +[sub_resource type="StyleBoxFlat" id=2] +content_margin_top = 10.0 +content_margin_bottom = 10.0 +bg_color = Color( 0.4, 0.337255, 0.313726, 0.32549 ) + +[sub_resource type="StyleBoxFlat" id=3] +content_margin_top = 10.0 +content_margin_bottom = 10.0 +bg_color = Color( 0.176471, 0.14902, 0.141176, 1 ) + +[sub_resource type="StyleBoxFlat" id=4] +content_margin_top = 10.0 +content_margin_bottom = 10.0 +bg_color = Color( 0.4, 0.337255, 0.313726, 1 ) + +[sub_resource type="StyleBoxFlat" id=5] +content_margin_top = 20.0 +content_margin_bottom = 20.0 +bg_color = Color( 0.290196, 0.247059, 0.231373, 1 ) + +[sub_resource type="StyleBoxFlat" id=6] +content_margin_top = 10.0 +content_margin_bottom = 10.0 +bg_color = Color( 0.176471, 0.14902, 0.141176, 1 ) + +[sub_resource type="DynamicFontData" id=8] +font_path = "res://assets/fonts/Roboto-Medium.ttf" + +[sub_resource type="DynamicFont" id=9] +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 ) +Button/styles/focus = SubResource( 3 ) +Button/styles/hover = SubResource( 4 ) +Button/styles/normal = SubResource( 5 ) +Button/styles/pressed = SubResource( 6 ) +Label/fonts/font = SubResource( 9 ) +Panel/styles/panel = SubResource( 7 ) [node name="Menu" type="Control"] anchor_right = 1.0 @@ -57,18 +110,22 @@ anchor_left = 0.8 anchor_top = 0.6 anchor_right = 1.0 anchor_bottom = 7.0 +margin_left = -86.0 +margin_top = -62.0 +margin_right = 75.0 [node name="Label" type="Label" parent="Credits"] -margin_right = 384.0 +margin_right = 545.0 margin_bottom = 51.0 -theme = ExtResource( 1 ) +theme = ExtResource( 9 ) text = "CREDITS" [node name="RichTextLabel" type="RichTextLabel" parent="Credits"] +visible = false margin_top = 55.0 -margin_right = 384.0 +margin_right = 510.0 margin_bottom = 370.0 -theme = ExtResource( 1 ) +theme = ExtResource( 9 ) text = "PROGRAMMING [Celeste] [Ice] @@ -92,13 +149,32 @@ https://freesound.org/s/586838/ " fit_content_height = true +[node name="Label2" type="Label" parent="Credits"] +margin_top = 55.0 +margin_right = 545.0 +margin_bottom = 455.0 +theme = SubResource( 10 ) +text = "PROGRAMMING [Celeste] + [IceLRemius] + [Perivesta] + ART [Scarabeaver] + + +MUSIC FROM FREESOUND:ORG: + +Main Menu: \"Relaxing Music\" by Migfus20 +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( 1 ) +theme = ExtResource( 9 ) text = "HOW TO PLAY" align = 1 @@ -115,7 +191,7 @@ rect_min_size = Vector2( 480, 80 ) [node name="TextureRect" type="TextureRect" parent="VBoxContainer2/Control"] anchor_top = 0.15 -anchor_right = 0.4 +anchor_right = 0.5 anchor_bottom = 0.85 texture = ExtResource( 3 ) stretch_mode = 6 @@ -124,6 +200,7 @@ stretch_mode = 6 anchor_left = 0.4 anchor_right = 1.0 anchor_bottom = 1.0 +theme = ExtResource( 8 ) text = "Move the mouse to look around." valign = 1 @@ -135,7 +212,7 @@ rect_min_size = Vector2( 480, 80 ) [node name="TextureRect" type="TextureRect" parent="VBoxContainer2/Control2"] anchor_top = 0.15 -anchor_right = 0.4 +anchor_right = 0.5 anchor_bottom = 0.85 texture = ExtResource( 4 ) stretch_mode = 6 @@ -144,6 +221,8 @@ stretch_mode = 6 anchor_left = 0.4 anchor_right = 1.0 anchor_bottom = 1.0 +margin_right = 242.0 +theme = ExtResource( 8 ) text = "Use Left Click and drag the mouse backwards to power up the shot." valign = 1 autowrap = true @@ -156,7 +235,7 @@ rect_min_size = Vector2( 480, 80 ) [node name="TextureRect" type="TextureRect" parent="VBoxContainer2/Control3"] anchor_top = 0.15 -anchor_right = 0.4 +anchor_right = 0.5 anchor_bottom = 0.85 texture = ExtResource( 4 ) stretch_mode = 6 @@ -165,6 +244,8 @@ stretch_mode = 6 anchor_left = 0.4 anchor_right = 1.0 anchor_bottom = 1.0 +margin_right = 261.0 +theme = ExtResource( 8 ) text = "Release the Mouse Button to shoot." valign = 1 autowrap = true @@ -183,9 +264,10 @@ rect_min_size = Vector2( 480, 80 ) [node name="TextureRect" type="TextureRect" parent="VBoxContainer2/Control5"] anchor_top = 0.15 -anchor_right = 0.4 +anchor_right = 0.5 anchor_bottom = 0.85 -margin_bottom = 24.0 +margin_top = -13.0 +margin_bottom = 11.0 texture = ExtResource( 5 ) stretch_mode = 4 @@ -193,6 +275,8 @@ stretch_mode = 4 anchor_left = 0.4 anchor_right = 1.0 anchor_bottom = 1.0 +margin_right = 214.0 +theme = ExtResource( 8 ) text = "Press Escape to Pause the game" valign = 1 autowrap = true @@ -205,9 +289,12 @@ rect_min_size = Vector2( 480, 80 ) [node name="TextureRect" type="TextureRect" parent="VBoxContainer2/Control6"] anchor_top = 0.15 -anchor_right = 0.4 +anchor_right = 0.5 anchor_bottom = 0.85 -margin_bottom = 24.0 +margin_left = 2.0 +margin_top = -14.0 +margin_right = 2.0 +margin_bottom = 10.0 texture = ExtResource( 6 ) stretch_mode = 4 @@ -215,6 +302,8 @@ stretch_mode = 4 anchor_left = 0.4 anchor_right = 1.0 anchor_bottom = 1.0 +margin_right = 293.0 +theme = ExtResource( 8 ) text = "Press Tab to see your current score" valign = 1 autowrap = true -- cgit From 8ae54459a5d47bfd0f795a6ec79060d6fdf5d700 Mon Sep 17 00:00:00 2001 From: David Date: Sun, 17 Jul 2022 16:42:33 +0200 Subject: fix fonts --- godot/scenes/Menu.tscn | 65 +++++++++++++++++++++--------------- godot/scenes/objects/Scoreboard.tscn | 50 +++++++++++++-------------- 2 files changed, 64 insertions(+), 51 deletions(-) (limited to 'godot/scenes') 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 -- cgit From 97ec14041a61b10287489120d755770d4d61f444 Mon Sep 17 00:00:00 2001 From: David Date: Sun, 17 Jul 2022 16:46:59 +0200 Subject: 500ms before we are still --- godot/scenes/Die.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'godot/scenes') 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 -- cgit