diff --git a/UI/MainMenu.tscn b/UI/MainMenu.tscn index b8b217c..68991e5 100644 --- a/UI/MainMenu.tscn +++ b/UI/MainMenu.tscn @@ -31,7 +31,7 @@ tracks/0/keys = { "values": [ Vector2( 0, 0 ), Vector2( 0, -200 ) ] } tracks/1/type = "value" -tracks/1/path = NodePath("ForegroundGoesLeft:rect_size") +tracks/1/path = NodePath("VBoxContainer/CenterContainer2/GameTitle/ForegroundGoesLeft:rect_size") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/imported = false @@ -40,7 +40,7 @@ tracks/1/keys = { "times": PoolRealArray( 0, 2.99 ), "transitions": PoolRealArray( 1, 1 ), "update": 0, -"values": [ Vector2( 1024, 400 ), Vector2( 345, 400 ) ] +"values": [ Vector2( 800, 200 ), Vector2( 220, 200 ) ] } tracks/2/type = "value" tracks/2/path = NodePath("ForegroundGoesUp:rect_rotation") @@ -55,7 +55,7 @@ tracks/2/keys = { "values": [ 0.0, -30.0 ] } tracks/3/type = "value" -tracks/3/path = NodePath("ForegroundGoesLeft:visible") +tracks/3/path = NodePath("VBoxContainer/CenterContainer2/GameTitle/ForegroundGoesLeft:visible") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/imported = false @@ -71,20 +71,38 @@ tracks/3/keys = { anchor_right = 1.0 anchor_bottom = 1.0 -[node name="BackgroundColorRed" type="ColorRect" parent="."] -margin_right = 1024.0 +[node name="BackgroundColorWhite" type="ColorRect" parent="."] +margin_right = 1600.0 margin_bottom = 600.0 +rect_min_size = Vector2( 1600, 600 ) +size_flags_horizontal = 2 +size_flags_vertical = 10 + +[node name="BackgroundColorRed" type="ColorRect" parent="."] +margin_top = 600.0 +margin_right = 1600.0 +margin_bottom = 900.0 +rect_min_size = Vector2( 1600, 300 ) color = Color( 1, 0, 0, 1 ) -[node name="BackgroundColorWhite" type="ColorRect" parent="BackgroundColorRed"] -margin_right = 1024.0 -margin_bottom = 400.0 +[node name="VBoxContainer" type="VBoxContainer" parent="."] +margin_right = 1600.0 +margin_bottom = 900.0 -[node name="GameTitle" type="Label" parent="."] -margin_left = 1.0 -margin_top = -1.16635 -margin_right = 1025.0 -margin_bottom = 398.834 +[node name="CenterContainer2" type="CenterContainer" parent="VBoxContainer"] +margin_right = 1600.0 +margin_bottom = 596.0 +rect_min_size = Vector2( 1600, 0 ) +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="GameTitle" type="Label" parent="VBoxContainer/CenterContainer2"] +margin_left = 404.0 +margin_top = 190.0 +margin_right = 1195.0 +margin_bottom = 406.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 custom_fonts/font = SubResource( 1 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) custom_colors/font_color_shadow = Color( 1, 0, 0, 1 ) @@ -93,23 +111,26 @@ text = "Retrace" align = 1 valign = 1 -[node name="ForegroundGoesUp" type="ColorRect" parent="."] -visible = false -margin_left = -240.0 -margin_right = 784.0 -margin_bottom = 400.0 -rect_rotation = -30.0 +[node name="ForegroundGoesLeft" type="ColorRect" parent="VBoxContainer/CenterContainer2/GameTitle"] +margin_right = 220.0 +margin_bottom = 200.0 -[node name="ForegroundGoesLeft" type="ColorRect" parent="."] -visible = false -margin_right = 345.0 -margin_bottom = 400.0 +[node name="CenterContainer" type="CenterContainer" parent="VBoxContainer"] +margin_top = 600.0 +margin_right = 1600.0 +margin_bottom = 900.0 -[node name="PlayButton" type="Button" parent="."] -margin_left = 380.0 -margin_top = 410.0 -margin_right = 620.0 -margin_bottom = 470.0 +[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/CenterContainer"] +margin_right = 1600.0 +margin_bottom = 300.0 +rect_min_size = Vector2( 0, 300 ) +size_flags_horizontal = 0 +size_flags_vertical = 0 + +[node name="PlayButton" type="Button" parent="VBoxContainer/CenterContainer/VBoxContainer"] +margin_right = 1600.0 +margin_bottom = 100.0 +rect_min_size = Vector2( 0, 100 ) custom_fonts/font = SubResource( 2 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) custom_colors/font_color_hover = Color( 0.980392, 0.839216, 0.619608, 1 ) @@ -117,19 +138,27 @@ text = "Embark" flat = true script = ExtResource( 2 ) -[node name="ExitButton" type="Button" parent="."] -margin_left = 380.0 -margin_top = 470.0 -margin_right = 620.0 -margin_bottom = 530.0 +[node name="ExitButton" type="Button" parent="VBoxContainer/CenterContainer/VBoxContainer"] +margin_top = 104.0 +margin_right = 1600.0 +margin_bottom = 204.0 +rect_min_size = Vector2( 0, 100 ) custom_fonts/font = SubResource( 3 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) +custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) text = "Disembark" flat = true script = ExtResource( 3 ) +[node name="ForegroundGoesUp" type="ColorRect" parent="."] +visible = false +margin_left = -240.0 +margin_right = 784.0 +margin_bottom = 400.0 +rect_rotation = -30.0 + [node name="AnimateForeground" type="AnimationPlayer" parent="."] autoplay = "Text" anims/Text = SubResource( 4 ) -[connection signal="pressed" from="PlayButton" to="PlayButton" method="_on_PlayButton_pressed"] -[connection signal="pressed" from="ExitButton" to="ExitButton" method="_on_ExitButton_pressed"] +[connection signal="pressed" from="VBoxContainer/CenterContainer/VBoxContainer/PlayButton" to="VBoxContainer/CenterContainer/VBoxContainer/PlayButton" method="_on_PlayButton_pressed"] +[connection signal="pressed" from="VBoxContainer/CenterContainer/VBoxContainer/ExitButton" to="VBoxContainer/CenterContainer/VBoxContainer/ExitButton" method="_on_ExitButton_pressed"] diff --git a/UI/PlayButton.gd b/UI/PlayButton.gd index 70ce177..310410d 100644 --- a/UI/PlayButton.gd +++ b/UI/PlayButton.gd @@ -5,4 +5,4 @@ func _ready(): func _on_PlayButton_pressed(): - get_tree().change_scene("res://Level/World.tscn") + get_tree().change_scene("res://Level/OutsideWorld.tscn")