diff --git a/source/levels/trinity_site/trinity_site_level.tscn b/source/levels/trinity_site/trinity_site_level.tscn index d9f85ef..8f9ab25 100644 --- a/source/levels/trinity_site/trinity_site_level.tscn +++ b/source/levels/trinity_site/trinity_site_level.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=16 format=2] +[gd_scene load_steps=17 format=2] [ext_resource path="res://source/assets/scripts/server_handlers/trinity_site_level.gd" type="Script" id=1] [ext_resource path="res://source/assets/scripts/ui_element_handlers/UI.gd" type="Script" id=2] [ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout_level_design_z_index_0.svg" type="Texture" id=3] +[ext_resource path="res://source/assets/scripts/ui_element_handlers/win_lose.gd" type="Script" id=4] [ext_resource path="res://source/assets/scripts/ui_element_handlers/game_UI.gd" type="Script" id=6] [ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout_level_design_z_index_4.svg" type="Texture" id=7] [ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout_level_design_z_index_3.svg" type="Texture" id=8] @@ -145,6 +146,7 @@ script = ExtResource( 6 ) [node name="win_lose_screen" parent="game_UI" instance=ExtResource( 12 )] position = Vector2( 0, 360 ) +script = ExtResource( 4 ) [node name="win_timer" type="Timer" parent="game_UI/win_lose_screen"] wait_time = 4.0 @@ -182,3 +184,5 @@ anchor_left = 0.5 anchor_right = 0.5 margin_left = -225.0 margin_right = 225.0 + +[connection signal="timeout" from="game_UI/win_lose_screen/win_timer" to="game_UI/win_lose_screen" method="_on_win_timer_timeout"] diff --git a/source/scenes/OVERLAY/elements/user_input.tscn b/source/scenes/OVERLAY/elements/user_input.tscn index c55d335..ef6aa1f 100644 --- a/source/scenes/OVERLAY/elements/user_input.tscn +++ b/source/scenes/OVERLAY/elements/user_input.tscn @@ -2,6 +2,7 @@ [ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/background_panel.svg" type="Texture" id=1] [ext_resource path="res://source/fonts/oxygen/Oxygen-Regular.ttf" type="DynamicFontData" id=2] +[ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/line_active.svg" type="Texture" id=3] [ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/hyperbol_active.svg" type="Texture" id=4] [ext_resource path="res://source/assets/sprites/GUI/in_game/trajectories/sin_active.svg" type="Texture" id=6] [ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button_pressedsvg.svg" type="Texture" id=7] @@ -87,12 +88,7 @@ region_rect = Rect2( 0, 0, 100, 100 ) size = 14 use_mipmaps = true use_filter = true -font_data = ExtResource( 15 ) - -[sub_resource type="DynamicFont" id=16] -use_mipmaps = true -use_filter = true -font_data = ExtResource( 15 ) +font_data = ExtResource( 2 ) [sub_resource type="StyleBoxFlat" id=11] bg_color = Color( 0.333333, 0.431373, 0.807843, 1 ) @@ -453,26 +449,8 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Label2" type="Label" parent="controls/hyperbol/hyperbol_panel"] -anchor_left = 0.5 -anchor_top = 1.0 -anchor_right = 0.5 -anchor_bottom = 1.0 -margin_left = -39.0 -margin_top = -19.7071 -margin_right = 39.0 -margin_bottom = 1.29288 -custom_fonts/font = SubResource( 16 ) -custom_colors/font_color = Color( 0, 0, 0, 1 ) -text = "sine" -align = 1 -valign = 1 -uppercase = true -__meta__ = { -"_edit_use_anchors_": false -} - [node name="sin" type="Control" parent="controls"] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 __meta__ = { @@ -501,7 +479,7 @@ anchor_top = 1.0 anchor_right = 0.5 anchor_bottom = 1.0 margin_left = -39.0 -margin_top = -19.7071 +margin_top = -19.0 margin_right = 39.0 custom_fonts/font = SubResource( 10 ) custom_colors/font_color = Color( 0, 0, 0, 1 )