diff --git a/scenes/hud.tscn b/scenes/hud.tscn index abcdec4..5997a9f 100644 --- a/scenes/hud.tscn +++ b/scenes/hud.tscn @@ -1,18 +1,29 @@ -[gd_scene load_steps=10 format=3 uid="uid://cgk66f6rg03mj"] +[gd_scene load_steps=14 format=3 uid="uid://cgk66f6rg03mj"] [ext_resource type="Script" uid="uid://delou5bqioyxe" path="res://scripts/hud_manager.gd" id="1_6vdxc"] -[ext_resource type="Texture2D" uid="uid://hendpftbt4iw" path="res://sprites/population_icon.png" id="2_28oy1"] -[ext_resource type="Texture2D" uid="uid://jk3mremfu7lm" path="res://sprites/electricity_icon.png" id="3_2u5bk"] +[ext_resource type="Texture2D" uid="uid://dour774ndxwyw" path="res://sprites/UI/Group 386.png" id="2_5pdws"] +[ext_resource type="Texture2D" uid="uid://bf57ngjubst77" path="res://sprites/UI/iconFriends.png" id="4_5pdws"] [ext_resource type="FontFile" uid="uid://d0cxd77jybrcn" path="res://fonts/lilita_one_regular.ttf" id="4_qfmf5"] -[ext_resource type="Texture2D" uid="uid://bng0d1sou7c8a" path="res://sprites/coin.png" id="5_vd1bj"] -[ext_resource type="Texture2D" uid="uid://cgpwknjrqnuae" path="res://sprites/help_icon.png" id="6_i1y88"] -[ext_resource type="Texture2D" uid="uid://hx3maksi7ma" path="res://sprites/unmuted.png" id="7_80m3c"] +[ext_resource type="Texture2D" uid="uid://bbllo67mdcs4a" path="res://sprites/UI/iconStreak.png" id="5_5pdws"] +[ext_resource type="Texture2D" uid="uid://dv24uyern6qg0" path="res://sprites/UI/buttonSound-on.png" id="6_5pdws"] +[ext_resource type="Texture2D" uid="uid://susaiduvwqc5" path="res://sprites/UI/buttonHelp-primary.png" id="7_5pdws"] +[ext_resource type="Texture2D" uid="uid://bktcydqta33pv" path="res://sprites/UI/buttonMissions primary.png" id="8_hd3ao"] +[ext_resource type="Texture2D" uid="uid://d1r8pkrwo3dc4" path="res://sprites/UI/buttonMissions hover.png" id="9_0i1j5"] [sub_resource type="LabelSettings" id="LabelSettings_q176i"] font = ExtResource("4_qfmf5") font_size = 24 shadow_color = Color(0, 0, 0, 0.392157) +[sub_resource type="StyleBoxLine" id="StyleBoxLine_5pdws"] +color = Color(0.0823529, 0.152941, 0.415686, 1) +thickness = 2 +vertical = true + +[sub_resource type="StyleBoxLine" id="StyleBoxLine_hd3ao"] +color = Color(0.0823529, 0.152941, 0.415686, 1) +vertical = true + [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7b8hq"] bg_color = Color(0.0784314, 0.0784314, 0.0784314, 0.588235) border_width_left = 1 @@ -42,7 +53,7 @@ anchor_right = 1.0 offset_left = 20.0 offset_top = 24.0 offset_right = -20.0 -offset_bottom = 84.0 +offset_bottom = 96.0 grow_horizontal = 2 scale = Vector2(0.8, 0.8) mouse_filter = 0 @@ -55,7 +66,7 @@ theme_override_constants/separation = 8 [node name="CashIcon" type="TextureRect" parent="HBoxContainer/CashItem"] layout_mode = 2 -texture = ExtResource("5_vd1bj") +texture = ExtResource("2_5pdws") expand_mode = 3 stretch_mode = 5 @@ -67,6 +78,7 @@ label_settings = SubResource("LabelSettings_q176i") [node name="Separator1" type="VSeparator" parent="HBoxContainer"] layout_mode = 2 theme_override_constants/separation = 10 +theme_override_styles/separator = SubResource("StyleBoxLine_5pdws") [node name="PopulationItem" type="HBoxContainer" parent="HBoxContainer"] layout_mode = 2 @@ -75,7 +87,7 @@ theme_override_constants/separation = 8 [node name="PopulationIcon" type="TextureRect" parent="HBoxContainer/PopulationItem"] layout_mode = 2 -texture = ExtResource("2_28oy1") +texture = ExtResource("4_5pdws") expand_mode = 3 stretch_mode = 5 @@ -87,6 +99,7 @@ label_settings = SubResource("LabelSettings_q176i") [node name="Separator2" type="VSeparator" parent="HBoxContainer"] layout_mode = 2 theme_override_constants/separation = 10 +theme_override_styles/separator = SubResource("StyleBoxLine_hd3ao") [node name="ElectricityItem" type="HBoxContainer" parent="HBoxContainer"] layout_mode = 2 @@ -95,7 +108,7 @@ theme_override_constants/separation = 8 [node name="ElectricityIcon" type="TextureRect" parent="HBoxContainer/ElectricityItem"] layout_mode = 2 -texture = ExtResource("3_2u5bk") +texture = ExtResource("5_5pdws") expand_mode = 3 stretch_mode = 5 @@ -119,6 +132,7 @@ color = Color(1, 0, 0, 1) [node name="Separator3" type="VSeparator" parent="HBoxContainer"] layout_mode = 2 theme_override_constants/separation = 10 +theme_override_styles/separator = SubResource("StyleBoxLine_hd3ao") [node name="SoundItem" type="HBoxContainer" parent="HBoxContainer"] layout_mode = 2 @@ -130,13 +144,13 @@ custom_minimum_size = Vector2(40, 40) layout_mode = 2 size_flags_vertical = 4 mouse_default_cursor_shape = 2 -texture_normal = ExtResource("7_80m3c") -ignore_texture_size = true +texture_normal = ExtResource("6_5pdws") stretch_mode = 5 [node name="Separator4" type="VSeparator" parent="HBoxContainer"] layout_mode = 2 theme_override_constants/separation = 10 +theme_override_styles/separator = SubResource("StyleBoxLine_hd3ao") [node name="HelpItem" type="HBoxContainer" parent="HBoxContainer"] layout_mode = 2 @@ -148,25 +162,24 @@ custom_minimum_size = Vector2(40, 40) layout_mode = 2 size_flags_vertical = 4 mouse_default_cursor_shape = 2 -texture_normal = ExtResource("6_i1y88") -ignore_texture_size = true +texture_normal = ExtResource("7_5pdws") stretch_mode = 5 [node name="Separator5" type="VSeparator" parent="HBoxContainer"] layout_mode = 2 theme_override_constants/separation = 10 +theme_override_styles/separator = SubResource("StyleBoxLine_hd3ao") [node name="MissionSelectItem" type="HBoxContainer" parent="HBoxContainer"] layout_mode = 2 mouse_filter = 0 theme_override_constants/separation = 8 -[node name="MissionSelectButton" type="Button" parent="HBoxContainer/MissionSelectItem"] -custom_minimum_size = Vector2(120, 40) +[node name="MissionSelectButton" type="TextureButton" parent="HBoxContainer/MissionSelectItem"] layout_mode = 2 -size_flags_vertical = 4 -mouse_default_cursor_shape = 2 -text = "Missions" +texture_normal = ExtResource("8_hd3ao") +texture_hover = ExtResource("9_0i1j5") +stretch_mode = 5 [node name="PopulationTooltip" type="Control" parent="."] visible = false @@ -224,4 +237,3 @@ autowrap_mode = 3 [connection signal="mouse_exited" from="HBoxContainer/ElectricityItem/ElectricityIcon" to="." method="_on_electricity_icon_mouse_exited"] [connection signal="pressed" from="HBoxContainer/SoundItem/SoundButton" to="." method="_on_sound_button_pressed"] [connection signal="pressed" from="HBoxContainer/HelpItem/HelpButton" to="." method="_on_help_button_pressed"] -[connection signal="pressed" from="HBoxContainer/MissionSelectItem/MissionSelectButton" to="." method="_on_mission_select_button_pressed"] diff --git a/scenes/main-environment.tres b/scenes/main-environment.tres index ad35da4..0e1a52c 100644 --- a/scenes/main-environment.tres +++ b/scenes/main-environment.tres @@ -11,7 +11,7 @@ sky_material = SubResource("ProceduralSkyMaterial_lg8b7") [resource] background_mode = 1 -background_color = Color(0.219333, 0.21, 0.35, 1) +background_color = Color(0.0941176, 0.129412, 0.329412, 1) sky = SubResource("Sky_7bk1c") ambient_light_source = 3 ambient_light_color = Color(0.36875, 0.741929, 0.801344, 1) diff --git a/scenes/main.tscn b/scenes/main.tscn index fff11d6..ee332ea 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -17,7 +17,7 @@ [ext_resource type="PackedScene" uid="uid://dmsy06s02tcw4" path="res://scenes/generic_text_panel.tscn" id="13_7i6dj"] [ext_resource type="Resource" uid="uid://bh65eqgid4kxy" path="res://structures/building-small-c.tres" id="13_kf5aa"] [ext_resource type="Script" uid="uid://ctqqmg4ydlbse" path="res://scripts/mission/mission_ui.gd" id="13_xvw5w"] -[ext_resource type="Script" uid="uid://n26k1k7243dd" path="res://resources/generic_text_panel.resource.gd" id="14_76jlq"] +[ext_resource type="Script" uid="uid://bt3emc1vt40gq" path="res://resources/generic_text_panel.resource.gd" id="14_76jlq"] [ext_resource type="Script" uid="uid://dnquivpg0ead" path="res://scripts/mission/learning_panel.gd" id="14_q2ymb"] [ext_resource type="Resource" uid="uid://dqqe3iofnleup" path="res://structures/pavement-fountain.tres" id="14_t5ykj"] [ext_resource type="Resource" uid="uid://dveu4dnue0d54" path="res://structures/road-intersection.tres" id="15_e755i"] diff --git a/scripts/hud_manager.gd b/scripts/hud_manager.gd index fd6897d..e4bb638 100644 --- a/scripts/hud_manager.gd +++ b/scripts/hud_manager.gd @@ -15,7 +15,7 @@ var total_kW_production: float = 0.0 # References var mission_select_menu: Control -var mission_select_button: Button +var mission_select_button: TextureButton var building_construction_manager var population_label: Label var electricity_label: Label