fix

source/levels/trinity_site/trinity_site_level.tscn

@@ -1,30 +1,21 @@
-[gd_scene load_steps=18 format=2]
+[gd_scene load_steps=16 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/fonts/roboto/Roboto-Regular.ttf" type="DynamicFontData" id=4]
-[ext_resource path="res://source/assets/scripts/ui_element_handlers/winner.gd" type="Script" id=5]
 [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]
 [ext_resource path="res://source/entities/grass/grass_node.tscn" type="PackedScene" id=9]
 [ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout_level_design_z_index_2.svg" type="Texture" id=10]
 [ext_resource path="res://source/levels/trinity_site/images/trinity_site_level_layout_level_design_z_index_1.svg" type="Texture" id=11]
+[ext_resource path="res://source/scenes/OVERLAY/elements/win_lose_screen.tscn" type="PackedScene" id=12]
 [ext_resource path="res://source/scenes/OVERLAY/elements/menu_button.tscn" type="PackedScene" id=13]
 [ext_resource path="res://source/scenes/OVERLAY/elements/trajectory_control.tscn" type="PackedScene" id=14]
 [ext_resource path="res://source/scenes/OVERLAY/elements/user_input.tscn" type="PackedScene" id=15]
 [ext_resource path="res://source/scenes/OVERLAY/elements/timer.tscn" type="PackedScene" id=16]
 [ext_resource path="res://source/assets/scripts/trinity_site_body_handler.gd" type="Script" id=46]
 
-[sub_resource type="DynamicFont" id=1]
-size = 120
-outline_size = 7
-outline_color = Color( 0, 0, 0, 1 )
-use_mipmaps = true
-use_filter = true
-font_data = ExtResource( 4 )
-
 [node name="trinity-site" type="Node2D"]
 script = ExtResource( 1 )
 
@@ -152,50 +143,12 @@ script = ExtResource( 2 )
 [node name="game_UI" type="CanvasLayer" parent="."]
 script = ExtResource( 6 )
 
-[node name="winner" type="Label" parent="game_UI"]
+[node name="win_lose_screen" parent="game_UI" instance=ExtResource( 12 )]
-anchor_top = 0.5
+position = Vector2( 496.709, 925.167 )
-anchor_right = 1.0
-anchor_bottom = 0.5
-margin_left = 2.37842
-margin_top = -35.5
-margin_right = 2.37842
-margin_bottom = 106.5
-custom_colors/font_color_shadow = Color( 0, 0, 0, 1 )
-custom_constants/shadow_offset_x = 6
-custom_constants/shadow_offset_y = 6
-custom_fonts/font = SubResource( 1 )
-text = "You are the winner"
-align = 1
-valign = 1
-script = ExtResource( 5 )
-__meta__ = {
-"_edit_lock_": true,
-"_edit_use_anchors_": false
-}
 
-[node name="win_timer" type="Timer" parent="game_UI/winner"]
+[node name="win_timer" type="Timer" parent="game_UI/win_lose_screen"]
 wait_time = 4.0
 
-[node name="loser" type="Label" parent="game_UI"]
-anchor_top = 0.5
-anchor_right = 1.0
-anchor_bottom = 0.5
-margin_left = 2.37842
-margin_top = -35.5
-margin_right = 2.37842
-margin_bottom = 106.5
-custom_colors/font_color_shadow = Color( 0, 0, 0, 1 )
-custom_constants/shadow_offset_x = 6
-custom_constants/shadow_offset_y = 6
-custom_fonts/font = SubResource( 1 )
-text = "You lost"
-align = 1
-valign = 1
-__meta__ = {
-"_edit_lock_": true,
-"_edit_use_anchors_": false
-}
-
 [node name="controls" type="Control" parent="."]
 margin_left = -2.1189
 margin_right = 1917.88
@@ -229,5 +182,3 @@ anchor_left = 0.5
 anchor_right = 0.5
 margin_left = -225.0
 margin_right = 225.0
-
-[connection signal="timeout" from="game_UI/winner/win_timer" to="game_UI/winner" method="_on_win_timer_timeout"]

source/scenes/OVERLAY/elements/user_input.tscn

@@ -1,10 +1,8 @@
-[gd_scene load_steps=30 format=2]
+[gd_scene load_steps=26 format=2]
 
 [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/parabol_active.svg" type="Texture" id=5]
 [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]
 [ext_resource path="res://source/assets/sprites/GUI/in_game/user_input/skip_button/skip_button_hover.svg" type="Texture" id=8]
@@ -21,38 +19,12 @@
 texture = ExtResource( 1 )
 region_rect = Rect2( 0, 0, 480, 156 )
 
-[sub_resource type="StyleBoxTexture" id=4]
+[sub_resource type="StyleBoxFlat" id=4]
-texture = ExtResource( 3 )
-region_rect = Rect2( 0, 0, 100, 100 )
-
-[sub_resource type="DynamicFont" id=5]
-size = 14
-use_mipmaps = true
-use_filter = true
-font_data = ExtResource( 2 )
-
-[sub_resource type="StyleBoxFlat" id=6]
 bg_color = Color( 0.333333, 0.431373, 0.807843, 1 )
 border_color = Color( 1, 1, 1, 0 )
 
-[sub_resource type="Theme" id=7]
-default_font = ExtResource( 17 )
-LineEdit/colors/clear_button_color = Color( 0.88, 0.88, 0.88, 1 )
-LineEdit/colors/clear_button_color_pressed = Color( 1, 1, 1, 1 )
-LineEdit/colors/cursor_color = Color( 0.94, 0.94, 0.94, 1 )
-LineEdit/colors/font_color = Color( 0.88, 0.88, 0.88, 1 )
-LineEdit/colors/font_color_selected = Color( 0, 0, 0, 1 )
-LineEdit/colors/font_color_uneditable = Color( 0.88, 0.88, 0.88, 0.5 )
-LineEdit/colors/selection_color = Color( 0.49, 0.49, 0.49, 1 )
-LineEdit/constants/minimum_spaces = 12
-LineEdit/fonts/font = null
-LineEdit/icons/clear = null
-LineEdit/styles/focus = null
-LineEdit/styles/normal = SubResource( 6 )
-LineEdit/styles/read_only = null
-
 [sub_resource type="StyleBoxTexture" id=8]
-texture = ExtResource( 5 )
+texture = ExtResource( 4 )
 region_rect = Rect2( 0, 0, 100, 100 )
 
 [sub_resource type="DynamicFont" id=9]
@@ -62,32 +34,37 @@ use_filter = true
 font_data = ExtResource( 2 )
 
 [sub_resource type="StyleBoxTexture" id=10]
-texture = ExtResource( 4 )
-region_rect = Rect2( 0, 0, 100, 100 )
-
-[sub_resource type="DynamicFont" id=11]
-size = 14
-use_mipmaps = true
-use_filter = true
-font_data = ExtResource( 2 )
-
-[sub_resource type="StyleBoxTexture" id=12]
 texture = ExtResource( 6 )
 region_rect = Rect2( 0, 0, 100, 100 )
 
-[sub_resource type="DynamicFont" id=13]
+[sub_resource type="DynamicFont" id=11]
 size = 32
 use_mipmaps = true
 use_filter = true
 font_data = ExtResource( 15 )
 
-[sub_resource type="DynamicFont" id=2]
+[sub_resource type="DynamicFont" id=16]
+use_mipmaps = true
+use_filter = true
+font_data = ExtResource( 15 )
+
+[sub_resource type="StyleBoxTexture" id=17]
+texture = ExtResource( 6 )
+region_rect = Rect2( 0, 0, 100, 100 )
+
+[sub_resource type="DynamicFont" id=13]
 size = 22
 use_mipmaps = true
 use_filter = true
 font_data = ExtResource( 2 )
 
-[sub_resource type="DynamicFont" id=3]
+[sub_resource type="DynamicFont" id=14]
+size = 22
+use_mipmaps = true
+use_filter = true
+font_data = ExtResource( 2 )
+
+[sub_resource type="DynamicFont" id=15]
 size = 22
 use_mipmaps = true
 use_filter = true
@@ -147,7 +124,6 @@ anchor_bottom = 1.0
 margin_left = -39.0
 margin_top = -19.0
 margin_right = 39.0
-custom_fonts/font = SubResource( 5 )
 custom_colors/font_color = Color( 0, 0, 0, 1 )
 text = "line"
 align = 1
@@ -187,7 +163,6 @@ margin_left = -75.0
 margin_top = -17.0
 margin_right = 75.0
 margin_bottom = 17.0
-theme = SubResource( 7 )
 custom_icons/updown = ExtResource( 16 )
 min_value = -15.0
 max_value = 15.0
@@ -215,7 +190,6 @@ anchor_bottom = 0.5
 margin_top = -17.0
 margin_right = 160.0
 margin_bottom = 17.0
-theme = SubResource( 7 )
 custom_icons/updown = ExtResource( 16 )
 min_value = -15.0
 max_value = 15.0
@@ -237,7 +211,6 @@ anchor_bottom = 0.5
 margin_left = -140.0
 margin_top = -17.0
 margin_bottom = 17.0
-theme = SubResource( 7 )
 custom_icons/updown = ExtResource( 16 )
 min_value = -15.0
 max_value = 15.0
@@ -300,7 +273,6 @@ anchor_bottom = 0.5
 margin_top = -17.0
 margin_right = 150.0
 margin_bottom = 17.0
-theme = SubResource( 7 )
 custom_icons/updown = ExtResource( 16 )
 min_value = -15.0
 max_value = 15.0
@@ -321,7 +293,6 @@ anchor_bottom = 0.5
 margin_left = -150.0
 margin_top = -17.0
 margin_bottom = 17.0
-theme = SubResource( 7 )
 custom_icons/updown = ExtResource( 16 )
 min_value = -15.0
 max_value = 15.0
@@ -368,8 +339,26 @@ __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__ = {
@@ -386,7 +375,7 @@ margin_left = -265.0
 margin_top = -50.0
 margin_right = -165.0
 margin_bottom = 50.0
-custom_styles/panel = SubResource( 12 )
+custom_styles/panel = SubResource( 17 )
 __meta__ = {
 "_edit_lock_": true,
 "_edit_use_anchors_": false
@@ -398,9 +387,10 @@ anchor_top = 1.0
 anchor_right = 0.5
 anchor_bottom = 1.0
 margin_left = -39.0
-margin_top = -19.0
+margin_top = -19.7071
 margin_right = 39.0
-custom_fonts/font = SubResource( 11 )
+margin_bottom = 1.29288
+custom_fonts/font = SubResource( 16 )
 custom_colors/font_color = Color( 0, 0, 0, 1 )
 text = "sine"
 align = 1
@@ -418,7 +408,6 @@ anchor_bottom = 0.5
 margin_top = -17.0
 margin_right = 150.0
 margin_bottom = 17.0
-theme = SubResource( 7 )
 custom_icons/updown = ExtResource( 16 )
 min_value = -15.0
 max_value = 15.0
@@ -439,7 +428,6 @@ anchor_bottom = 0.5
 margin_left = -150.0
 margin_top = -17.0
 margin_bottom = 17.0
-theme = SubResource( 7 )
 custom_icons/updown = ExtResource( 16 )
 min_value = -15.0
 max_value = 15.0
@@ -479,7 +467,7 @@ __meta__ = {
 [node name="Label" type="Label" parent="controls/ready_button"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-custom_fonts/font = SubResource( 2 )
+custom_fonts/font = SubResource( 14 )
 text = "Ready"
 align = 1
 valign = 1
@@ -503,7 +491,7 @@ __meta__ = {
 [node name="Label" type="Label" parent="controls/skip_button"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-custom_fonts/font = SubResource( 3 )
+custom_fonts/font = SubResource( 15 )
 text = "Skip"
 align = 1
 valign = 1