diff --git a/Characters/Player/UI/UI.tscn b/Characters/Player/UI/UI.tscn index bc0e2af..2cea79b 100644 --- a/Characters/Player/UI/UI.tscn +++ b/Characters/Player/UI/UI.tscn @@ -1,7 +1,9 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://Characters/Player/UI/UI.gd" type="Script" id=1] -[ext_resource path="res://Resources/Textures/pillLevel_fill.png" type="Texture" id=2] +[ext_resource path="res://Resources/Fonts/MainFont.tres" type="DynamicFont" id=2] +[ext_resource path="res://Resources/Textures/pillLevel_fill.png" type="Texture" id=3] +[ext_resource path="res://Resources/Textures/crosshair.png" type="Texture" id=4] [node name="HUD" type="Control"] anchor_right = 1.0 @@ -12,11 +14,18 @@ script = ExtResource( 1 ) [node name="PressInteract" type="Label" parent="."] visible = false -margin_left = 453.005 -margin_top = 515.582 -margin_right = 569.005 -margin_bottom = 529.582 -text = "Press E to interact" +modulate = Color( 0, 0, 0, 1 ) +self_modulate = Color( 0, 0, 0, 1 ) +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +margin_left = -104.0 +margin_top = -58.8594 +margin_right = 104.0 +margin_bottom = -34.8594 +custom_fonts/font = ExtResource( 2 ) +text = "Press 'E' to interact" [node name="InventoryContainer" type="GridContainer" parent="."] margin_left = 868.0 @@ -36,4 +45,27 @@ margin_bottom = 64.7845 max_value = 7.0 step = 0.1 value = 6.0 -texture_progress = ExtResource( 2 ) +texture_progress = ExtResource( 3 ) + +[node name="CrossHair" type="Control" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -20.0 +margin_top = -20.0 +margin_right = 20.0 +margin_bottom = 20.0 + +[node name="Circle" type="TextureRect" parent="CrossHair"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -20.0 +margin_top = -20.0 +margin_right = 20.0 +margin_bottom = 20.0 +texture = ExtResource( 4 ) +expand = true +stretch_mode = 4 diff --git a/Resources/Fonts/MainFont.tres b/Resources/Fonts/MainFont.tres new file mode 100644 index 0000000..0afb3e0 --- /dev/null +++ b/Resources/Fonts/MainFont.tres @@ -0,0 +1,8 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://Resources/Fonts/Beon-Regular.otf" type="DynamicFontData" id=1] + +[resource] +size = 20 +use_filter = true +font_data = ExtResource( 1 ) diff --git a/Resources/Textures/crosshair.png b/Resources/Textures/crosshair.png new file mode 100644 index 0000000..51eec67 Binary files /dev/null and b/Resources/Textures/crosshair.png differ diff --git a/Resources/Textures/crosshair.png.import b/Resources/Textures/crosshair.png.import new file mode 100644 index 0000000..b7242b4 --- /dev/null +++ b/Resources/Textures/crosshair.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/crosshair.png-c7de222b7acab8c49b51b4103f9b53aa.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Resources/Textures/crosshair.png" +dest_files=[ "res://.import/crosshair.png-c7de222b7acab8c49b51b4103f9b53aa.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/UI/MainMenu.tscn b/UI/MainMenu.tscn index 99d8501..0c59eda 100644 --- a/UI/MainMenu.tscn +++ b/UI/MainMenu.tscn @@ -1,22 +1,19 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://Resources/Fonts/Beon-Regular.otf" type="DynamicFontData" id=1] -[ext_resource path="res://UI/PlayButton.gd" type="Script" id=2] -[ext_resource path="res://UI/ExitButton.gd" type="Script" id=3] +[ext_resource path="res://Resources/Fonts/MainFont.tres" type="DynamicFont" id=1] +[ext_resource path="res://Resources/Fonts/Beon-Regular.otf" type="DynamicFontData" id=2] +[ext_resource path="res://UI/PlayButton.gd" type="Script" id=3] +[ext_resource path="res://UI/ExitButton.gd" type="Script" id=4] [sub_resource type="DynamicFont" id=1] -size = 120 -font_data = ExtResource( 1 ) +size = 32 +font_data = ExtResource( 2 ) [sub_resource type="DynamicFont" id=2] size = 32 -font_data = ExtResource( 1 ) +font_data = ExtResource( 2 ) -[sub_resource type="DynamicFont" id=3] -size = 32 -font_data = ExtResource( 1 ) - -[sub_resource type="Animation" id=4] +[sub_resource type="Animation" id=3] resource_name = "Text" length = 3.0 tracks/0/type = "value" @@ -73,7 +70,7 @@ margin_bottom = 400.0 margin_left = 1.0 margin_right = 1025.0 margin_bottom = 400.0 -custom_fonts/font = SubResource( 1 ) +custom_fonts/font = ExtResource( 1 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) custom_colors/font_color_shadow = Color( 1, 0, 0, 1 ) custom_constants/shadow_offset_x = 4 @@ -97,26 +94,26 @@ margin_left = 380.0 margin_top = 410.0 margin_right = 620.0 margin_bottom = 470.0 -custom_fonts/font = SubResource( 2 ) +custom_fonts/font = SubResource( 1 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) custom_colors/font_color_hover = Color( 0.980392, 0.839216, 0.619608, 1 ) text = "Embark" flat = true -script = ExtResource( 2 ) +script = ExtResource( 3 ) [node name="ExitButton" type="Button" parent="."] margin_left = 380.0 margin_top = 470.0 margin_right = 620.0 margin_bottom = 530.0 -custom_fonts/font = SubResource( 3 ) +custom_fonts/font = SubResource( 2 ) custom_colors/font_color = Color( 1, 1, 1, 1 ) text = "Disembark" flat = true -script = ExtResource( 3 ) +script = ExtResource( 4 ) [node name="AnimateForeground" type="AnimationPlayer" parent="."] autoplay = "Text" -anims/Text = SubResource( 4 ) +anims/Text = SubResource( 3 ) [connection signal="pressed" from="PlayButton" to="PlayButton" method="_on_PlayButton_pressed"] [connection signal="pressed" from="ExitButton" to="ExitButton" method="_on_ExitButton_pressed"]