From 45c5994af1040508666b9717bc1022309e590879 Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Mon, 27 Feb 2023 11:45:23 -0500 Subject: Change default_theme.theme to default_theme.tres Makes it a text resource Remove Button font data from default_theme Fixes erroneous theme updates Centralize Label_Checksum font_color into default_theme --- game/default_theme.theme | Bin 96231 -> 0 bytes game/default_theme.tres | 230 ++++++++++++++++++++++++++++++++++++++++ game/src/MainMenu/MainMenu.tscn | 6 +- 3 files changed, 233 insertions(+), 3 deletions(-) delete mode 100644 game/default_theme.theme create mode 100644 game/default_theme.tres diff --git a/game/default_theme.theme b/game/default_theme.theme deleted file mode 100644 index 2782dba..0000000 Binary files a/game/default_theme.theme and /dev/null differ diff --git a/game/default_theme.tres b/game/default_theme.tres new file mode 100644 index 0000000..8685f3e --- /dev/null +++ b/game/default_theme.tres @@ -0,0 +1,230 @@ +[gd_resource type="Theme" load_steps=23 format=3 uid="uid://cr4lh0vraucx7"] + +[ext_resource type="Texture2D" uid="uid://c0p34i3d3b0pw" path="res://theme_assets/main_menu_button.png" id="1_dwmy4"] +[ext_resource type="StyleBox" uid="uid://4ypja147f4mb" path="res://theme_assets/main_menu_button_normal.stylebox" id="2_8nk80"] +[ext_resource type="Script" path="res://src/Utility/StyleBoxWithSound.gd" id="3_0667r"] +[ext_resource type="AudioStream" uid="uid://bsldcs3l8s7ug" path="res://addons/kenney_ui_audio/click3.wav" id="4_3ej5v"] +[ext_resource type="Script" path="res://src/Utility/StyleBoxCombinedTexture.gd" id="5_lricc"] +[ext_resource type="Script" path="res://src/Utility/TextureSetting.gd" id="6_oq58n"] +[ext_resource type="Texture2D" uid="uid://dapuqgpjs56bs" path="res://theme_assets/main_menu_background.png" id="7_ioley"] +[ext_resource type="Texture2D" uid="uid://q25s41oavuxw" path="res://theme_assets/main_menu_border_paper.png" id="8_pqg86"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_mgyot"] +content_margin_left = 4.0 +content_margin_top = 4.0 +content_margin_right = 4.0 +content_margin_bottom = 4.0 +bg_color = Color(0.1, 0.1, 0.1, 0.3) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 +corner_detail = 5 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_35106"] +content_margin_left = 4.0 +content_margin_top = 4.0 +content_margin_right = 4.0 +content_margin_bottom = 4.0 +bg_color = Color(1, 1, 1, 0.75) +draw_center = false +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 +corner_detail = 5 +expand_margin_left = 2.0 +expand_margin_top = 2.0 +expand_margin_right = 2.0 +expand_margin_bottom = 2.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_jxhab"] +content_margin_left = 4.0 +content_margin_top = 4.0 +content_margin_right = 4.0 +content_margin_bottom = 4.0 +bg_color = Color(0.225, 0.225, 0.225, 0.6) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 +corner_detail = 5 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_yorb8"] +content_margin_left = 4.0 +content_margin_top = 4.0 +content_margin_right = 4.0 +content_margin_bottom = 4.0 +bg_color = Color(0.1, 0.1, 0.1, 0.6) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 +corner_detail = 5 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ufyfw"] +content_margin_left = 4.0 +content_margin_top = 4.0 +content_margin_right = 4.0 +content_margin_bottom = 4.0 +bg_color = Color(0, 0, 0, 0.6) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 +corner_detail = 5 + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_dd2b8"] +content_margin_left = 20.0 +content_margin_top = 10.0 +content_margin_right = 20.0 +content_margin_bottom = 14.0 +texture = ExtResource("1_dwmy4") +modulate_color = Color(0.817521, 0.817521, 0.817521, 0.784314) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2txce"] +draw_center = false +border_width_left = 10 +border_width_top = 15 +border_width_right = 10 +border_width_bottom = 15 +border_color = Color(0, 0, 0, 0.584314) +border_blend = true +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 +corner_detail = 20 + +[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_wrcgq"] +load_path = "res://.godot/imported/main_menu_button.png-c10c48e0a8cab217f3c5b89e1e5b8b32.ctex" + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_3efxh"] +content_margin_left = 20.0 +content_margin_top = 10.0 +content_margin_right = 20.0 +content_margin_bottom = 14.0 +texture = SubResource("CompressedTexture2D_wrcgq") +modulate_color = Color(0.588235, 0.588235, 0.588235, 1) + +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_l2rw3"] +content_margin_left = 20.0 +content_margin_top = 10.0 +content_margin_right = 20.0 +content_margin_bottom = 14.0 +texture = SubResource("CompressedTexture2D_wrcgq") +modulate_color = Color(0.85098, 0.85098, 0.85098, 1) + +[sub_resource type="StyleBox" id="StyleBox_uuspe"] +resource_local_to_scene = false +resource_name = "" +content_margin_left = -1.0 +content_margin_top = -1.0 +content_margin_right = -1.0 +content_margin_bottom = -1.0 +script = ExtResource("3_0667r") +style_box = SubResource("StyleBoxTexture_l2rw3") +sound = ExtResource("4_3ej5v") + +[sub_resource type="Resource" id="Resource_hxpog"] +script = ExtResource("6_oq58n") +texture = ExtResource("7_ioley") +draw_center = true +texture_margin_left = 0.0 +texture_margin_top = 0.0 +texture_margin_right = 0.0 +texture_margin_bottom = 0.0 +expand_margin_left = 0.0 +expand_margin_top = 0.0 +expand_margin_right = 0.0 +expand_margin_bottom = 0.0 +axis_stretch_horizontal = 0 +axis_stretch_vertical = 0 +region_rect = Rect2(0, 0, 0, 0) +modulate_color = Color(1, 1, 1, 1) +content_margin_left = -1.0 +content_margin_top = -1.0 +content_margin_right = -1.0 +content_margin_bottom = -1.0 + +[sub_resource type="Resource" id="Resource_c0k5l"] +script = ExtResource("6_oq58n") +texture = ExtResource("8_pqg86") +draw_center = true +texture_margin_left = 0.0 +texture_margin_top = 0.0 +texture_margin_right = 0.0 +texture_margin_bottom = 0.0 +expand_margin_left = 0.0 +expand_margin_top = 0.0 +expand_margin_right = 0.0 +expand_margin_bottom = 0.0 +axis_stretch_horizontal = 0 +axis_stretch_vertical = 0 +region_rect = Rect2(0, 0, 0, 0) +modulate_color = Color(1, 1, 1, 1) +content_margin_left = -1.0 +content_margin_top = -1.0 +content_margin_right = -1.0 +content_margin_bottom = -1.0 + +[sub_resource type="StyleBox" id="StyleBox_rvlty"] +resource_local_to_scene = false +resource_name = "" +content_margin_left = -1.0 +content_margin_top = -1.0 +content_margin_right = -1.0 +content_margin_bottom = -1.0 +script = ExtResource("5_lricc") +texture_settings = Array[ExtResource("6_oq58n")]([SubResource("Resource_hxpog"), SubResource("Resource_c0k5l")]) + +[resource] +Button/colors/font_color = Color(0.87451, 0.87451, 0.87451, 1) +Button/colors/font_disabled_color = Color(0.875, 0.875, 0.875, 0.5) +Button/colors/font_focus_color = Color(0.95, 0.95, 0.95, 1) +Button/colors/font_hover_color = Color(0.95, 0.95, 0.95, 1) +Button/colors/font_hover_pressed_color = Color(1, 1, 1, 1) +Button/colors/font_outline_color = Color(1, 1, 1, 1) +Button/colors/font_pressed_color = Color(1, 1, 1, 1) +Button/colors/icon_disabled_color = Color(1, 1, 1, 0.4) +Button/colors/icon_focus_color = Color(1, 1, 1, 1) +Button/colors/icon_hover_color = Color(1, 1, 1, 1) +Button/colors/icon_hover_pressed_color = Color(1, 1, 1, 1) +Button/colors/icon_normal_color = Color(1, 1, 1, 1) +Button/colors/icon_pressed_color = Color(1, 1, 1, 1) +Button/constants/h_separation = 2 +Button/constants/outline_size = 0 +Button/font_sizes/font_size = 16 +Button/styles/disabled = SubResource("StyleBoxFlat_mgyot") +Button/styles/focus = SubResource("StyleBoxFlat_35106") +Button/styles/hover = SubResource("StyleBoxFlat_jxhab") +Button/styles/normal = SubResource("StyleBoxFlat_yorb8") +Button/styles/pressed = SubResource("StyleBoxFlat_ufyfw") +Button_MainMenu/base_type = &"Button" +Button_MainMenu/colors/font_color = Color(0.87451, 0.87451, 0.87451, 1) +Button_MainMenu/colors/font_disabled_color = Color(0.875, 0.875, 0.875, 0.5) +Button_MainMenu/colors/font_focus_color = Color(0.95, 0.95, 0.95, 1) +Button_MainMenu/colors/font_hover_color = Color(0.95, 0.95, 0.95, 1) +Button_MainMenu/colors/font_hover_pressed_color = Color(1, 1, 1, 1) +Button_MainMenu/colors/font_outline_color = Color(1, 1, 1, 1) +Button_MainMenu/colors/font_pressed_color = Color(1, 1, 1, 1) +Button_MainMenu/colors/icon_disabled_color = Color(1, 1, 1, 0.4) +Button_MainMenu/colors/icon_focus_color = Color(1, 1, 1, 1) +Button_MainMenu/colors/icon_hover_color = Color(1, 1, 1, 1) +Button_MainMenu/colors/icon_hover_pressed_color = Color(1, 1, 1, 1) +Button_MainMenu/colors/icon_normal_color = Color(1, 1, 1, 1) +Button_MainMenu/colors/icon_pressed_color = Color(1, 1, 1, 1) +Button_MainMenu/font_sizes/font_size = 16 +Button_MainMenu/styles/disabled = SubResource("StyleBoxTexture_dd2b8") +Button_MainMenu/styles/focus = SubResource("StyleBoxFlat_2txce") +Button_MainMenu/styles/hover = SubResource("StyleBoxTexture_3efxh") +Button_MainMenu/styles/normal = ExtResource("2_8nk80") +Button_MainMenu/styles/pressed = SubResource("StyleBox_uuspe") +Label_Checksum/base_type = &"Label" +Label_Checksum/colors/font_color = Color(0.247059, 0.392157, 1, 1) +Panel_MainMenu/base_type = &"Panel" +Panel_MainMenu/styles/panel = SubResource("StyleBox_rvlty") diff --git a/game/src/MainMenu/MainMenu.tscn b/game/src/MainMenu/MainMenu.tscn index f306c63..237f1e6 100644 --- a/game/src/MainMenu/MainMenu.tscn +++ b/game/src/MainMenu/MainMenu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://dvoin538iby54"] -[ext_resource type="Theme" uid="uid://1xrgnmmnrnce" path="res://default_theme.theme" id="1_6d448"] +[ext_resource type="Theme" uid="uid://cr4lh0vraucx7" path="res://default_theme.tres" id="1_dfm41"] [ext_resource type="Script" path="res://src/MainMenu/MainMenu.gd" id="2_nm1fq"] [node name="MainMenu" type="Control" node_paths=PackedStringArray("_new_game_button", "_checksum_label")] @@ -10,7 +10,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -theme = ExtResource("1_6d448") +theme = ExtResource("1_dfm41") script = ExtResource("2_nm1fq") _new_game_button = NodePath("Panel/VBox/Margin/ButtonList/NewGameButton") _checksum_label = NodePath("Panel/VBox/Margin2/VersionChecksumBox/ChecksumLabel") @@ -130,7 +130,7 @@ text = "v0.01" layout_mode = 2 tooltip_text = "Checksum 00000000" mouse_filter = 1 -theme_override_colors/font_color = Color(0.247059, 0.392157, 1, 1) +theme_type_variation = &"Label_Checksum" text = "(0000)" [connection signal="pressed" from="Panel/VBox/Margin/ButtonList/NewGameButton" to="." method="_on_new_game_button_pressed"] -- cgit v1.2.3-56-ga3b1