From e7259b0da81e0828a3a3afc7436f96beb791087b Mon Sep 17 00:00:00 2001 From: Marco Date: Fri, 14 Mar 2025 10:57:16 +0100 Subject: [PATCH] Changed scaling mode --- Dialogue/Styles/Textbox_style.tres | 3 +-- Dialogue/Styles/VN.tres | 4 ++-- Resources/Credits.tres | 10 ++++++++-- Resources/Styles/DebugMenuButtons.tres | 4 ++-- Resources/Styles/Hud_Text_Style.tres | 3 +-- Resources/Styles/Title_Text_Style.tres | 4 ++-- Scenes/HUD/HUD.tscn | 2 ++ Scenes/HUD/TitleCrystal.tscn | 14 +++++++------- Scenes/HUD/debug_menu.tscn | 3 --- Scenes/MainMenu.tscn | 21 ++++++++------------- project.godot | 2 +- 11 files changed, 34 insertions(+), 36 deletions(-) diff --git a/Dialogue/Styles/Textbox_style.tres b/Dialogue/Styles/Textbox_style.tres index 26e1c088..9a830bcd 100644 --- a/Dialogue/Styles/Textbox_style.tres +++ b/Dialogue/Styles/Textbox_style.tres @@ -16,7 +16,7 @@ script = ExtResource("1_5pbjb") scene = ExtResource("1_4vo3k") overrides = { "global_font": "\"res://fonts/at01.ttf\"", -"global_font_size": "12.0" +"global_font_size": "16.0" } [sub_resource type="Resource" id="Resource_fuhfn"] @@ -37,7 +37,6 @@ overrides = { "box_panel": "\"res://Dialogue/Styles/square_stylebox.tres\"", "box_size": "Vector2(300, 70)", "name_label_custom_size": "10.0", -"name_label_use_global_size": "false", "text_custom_size": "6.0" } diff --git a/Dialogue/Styles/VN.tres b/Dialogue/Styles/VN.tres index bb4489d0..071b38b1 100644 --- a/Dialogue/Styles/VN.tres +++ b/Dialogue/Styles/VN.tres @@ -15,7 +15,7 @@ script = ExtResource("1_47mos") overrides = { "global_font": "\"res://fonts/at01.ttf\"", -"global_font_size": "12.0" +"global_font_size": "16.0" } [sub_resource type="Resource" id="Resource_5h7h2"] @@ -82,4 +82,4 @@ layer_info = { } base_overrides = {} layers = Array[ExtResource("1_47mos")]([]) -metadata/_latest_layer = "13" +metadata/_latest_layer = "" diff --git a/Resources/Credits.tres b/Resources/Credits.tres index 870a9b8a..3a12ba63 100644 --- a/Resources/Credits.tres +++ b/Resources/Credits.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="CreditsCollection" load_steps=20 format=3 uid="uid://cojsc1rtf41i1"] +[gd_resource type="Resource" script_class="CreditsCollection" load_steps=21 format=3 uid="uid://cojsc1rtf41i1"] [ext_resource type="Script" uid="uid://buq8eurx510ps" path="res://Scripts/Resources/CreditsCollection.cs" id="1_0bwsf"] [ext_resource type="Script" uid="uid://bc4f4ggvk3ktf" path="res://Scripts/Resources/CreditsEntry.cs" id="1_aaqha"] @@ -105,7 +105,13 @@ Name = "Alexander Nikopoulos" Contribution = "VFEZ" metadata/_custom_type_script = "uid://bc4f4ggvk3ktf" +[sub_resource type="Resource" id="Resource_n6vk1"] +script = ExtResource("1_aaqha") +Name = "Neoqueto" +Contribution = "Fonts" +metadata/_custom_type_script = "uid://bc4f4ggvk3ktf" + [resource] script = ExtResource("1_0bwsf") -Credits = Array[ExtResource("1_aaqha")]([SubResource("Resource_ep84i"), SubResource("Resource_ianh3"), SubResource("Resource_m7fsk"), SubResource("Resource_ans3w"), SubResource("Resource_1cmaw"), SubResource("Resource_vda0h"), SubResource("Resource_daaek"), SubResource("Resource_8vv0q"), SubResource("Resource_321dv"), SubResource("Resource_j7pkh"), SubResource("Resource_aaqha"), SubResource("Resource_gr2tg"), SubResource("Resource_b8hlh"), SubResource("Resource_gbaov"), SubResource("Resource_jkmrk"), SubResource("Resource_ivgyk"), null]) +Credits = Array[ExtResource("1_aaqha")]([SubResource("Resource_ep84i"), SubResource("Resource_ianh3"), SubResource("Resource_m7fsk"), SubResource("Resource_ans3w"), SubResource("Resource_1cmaw"), SubResource("Resource_vda0h"), SubResource("Resource_daaek"), SubResource("Resource_8vv0q"), SubResource("Resource_321dv"), SubResource("Resource_j7pkh"), SubResource("Resource_aaqha"), SubResource("Resource_gr2tg"), SubResource("Resource_b8hlh"), SubResource("Resource_gbaov"), SubResource("Resource_jkmrk"), SubResource("Resource_ivgyk"), SubResource("Resource_n6vk1")]) metadata/_custom_type_script = "uid://buq8eurx510ps" diff --git a/Resources/Styles/DebugMenuButtons.tres b/Resources/Styles/DebugMenuButtons.tres index 8a39e449..f83160fc 100644 --- a/Resources/Styles/DebugMenuButtons.tres +++ b/Resources/Styles/DebugMenuButtons.tres @@ -5,7 +5,7 @@ [resource] default_font = ExtResource("1_87kc4") -default_font_size = 12 +default_font_size = 16 Button/colors/font_color = Color(0, 0.588235, 0, 1) Button/colors/font_disabled_color = Color(0, 0.12549, 0, 1) Button/colors/font_focus_color = Color(0, 0.882353, 0, 1) @@ -23,7 +23,7 @@ Button/constants/align_to_largest_stylebox = 0 Button/constants/h_separation = 0 Button/constants/icon_max_width = 0 Button/constants/outline_size = 0 -Button/font_sizes/font_size = 10 +Button/font_sizes/font_size = 16 Button/fonts/font = ExtResource("1_87kc4") Button/styles/disabled = ExtResource("2_p2o70") Button/styles/focus = ExtResource("2_p2o70") diff --git a/Resources/Styles/Hud_Text_Style.tres b/Resources/Styles/Hud_Text_Style.tres index 6803e22c..9a7542b1 100644 --- a/Resources/Styles/Hud_Text_Style.tres +++ b/Resources/Styles/Hud_Text_Style.tres @@ -5,6 +5,5 @@ [resource] line_spacing = 1.0 font = ExtResource("1_foybo") -font_size = 14 -outline_size = 3 +outline_size = 4 outline_color = Color(0, 0, 0, 1) diff --git a/Resources/Styles/Title_Text_Style.tres b/Resources/Styles/Title_Text_Style.tres index a5dab745..bab65ba3 100644 --- a/Resources/Styles/Title_Text_Style.tres +++ b/Resources/Styles/Title_Text_Style.tres @@ -1,11 +1,11 @@ [gd_resource type="LabelSettings" load_steps=2 format=3 uid="uid://wr7cb2qa6w71"] -[ext_resource type="FontFile" uid="uid://ccm3u37q1hvux" path="res://fonts/Xolonium-Regular.ttf" id="1_1ljef"] +[ext_resource type="FontFile" uid="uid://cyk27h5aox1n7" path="res://fonts/sector_034.ttf" id="1_1ljef"] [resource] line_spacing = 0.0 font = ExtResource("1_1ljef") -font_size = 34 +font_size = 20 outline_size = 8 outline_color = Color(0, 0, 0, 1) shadow_size = 9 diff --git a/Scenes/HUD/HUD.tscn b/Scenes/HUD/HUD.tscn index 68ebacba..159e2189 100644 --- a/Scenes/HUD/HUD.tscn +++ b/Scenes/HUD/HUD.tscn @@ -151,6 +151,7 @@ show_percentage = false layout_mode = 2 text = "100/100" label_settings = ExtResource("2_x7kl7") +vertical_alignment = 1 [node name="ShieldBarContainer" type="HBoxContainer" parent="VBoxContainer"] layout_mode = 2 @@ -168,6 +169,7 @@ show_percentage = false layout_mode = 2 text = "100/100" label_settings = ExtResource("2_x7kl7") +vertical_alignment = 1 [node name="ItemsContainer" type="VBoxContainer" parent="VBoxContainer"] layout_mode = 2 diff --git a/Scenes/HUD/TitleCrystal.tscn b/Scenes/HUD/TitleCrystal.tscn index a219b2d9..be3fa9ec 100644 --- a/Scenes/HUD/TitleCrystal.tscn +++ b/Scenes/HUD/TitleCrystal.tscn @@ -3,9 +3,9 @@ [ext_resource type="Texture2D" uid="uid://p242xo3qxwve" path="res://Sprites/UI/Crystal3.png" id="1_0eskd"] [ext_resource type="Script" uid="uid://w85hem1ec8cq" path="res://Scripts/Tools/AnimatedTextureRect.gd" id="1_n84ak"] -[sub_resource type="AtlasTexture" id="AtlasTexture_y7grm"] +[sub_resource type="AtlasTexture" id="AtlasTexture_a22na"] atlas = ExtResource("1_0eskd") -region = Rect2(640, 0, 32, 16) +region = Rect2(160, 0, 32, 16) [sub_resource type="AtlasTexture" id="AtlasTexture_rs5p5"] atlas = ExtResource("1_0eskd") @@ -27,10 +27,6 @@ region = Rect2(96, 0, 32, 16) atlas = ExtResource("1_0eskd") region = Rect2(128, 0, 32, 16) -[sub_resource type="AtlasTexture" id="AtlasTexture_a22na"] -atlas = ExtResource("1_0eskd") -region = Rect2(160, 0, 32, 16) - [sub_resource type="AtlasTexture" id="AtlasTexture_hbsma"] atlas = ExtResource("1_0eskd") region = Rect2(192, 0, 32, 16) @@ -87,6 +83,10 @@ region = Rect2(576, 0, 32, 16) atlas = ExtResource("1_0eskd") region = Rect2(608, 0, 32, 16) +[sub_resource type="AtlasTexture" id="AtlasTexture_y7grm"] +atlas = ExtResource("1_0eskd") +region = Rect2(640, 0, 32, 16) + [sub_resource type="AtlasTexture" id="AtlasTexture_ayuam"] atlas = ExtResource("1_0eskd") region = Rect2(672, 0, 32, 16) @@ -222,6 +222,6 @@ animations = [{ }] [node name="TitleCrystal" type="TextureRect"] -texture = SubResource("AtlasTexture_y7grm") +texture = SubResource("AtlasTexture_a22na") script = ExtResource("1_n84ak") Frames = SubResource("SpriteFrames_xxm62") diff --git a/Scenes/HUD/debug_menu.tscn b/Scenes/HUD/debug_menu.tscn index 806be8ae..fcd675bf 100644 --- a/Scenes/HUD/debug_menu.tscn +++ b/Scenes/HUD/debug_menu.tscn @@ -26,13 +26,11 @@ layout_mode = 2 [node name="CheckBox" type="CheckBox" parent="HBoxContainer"] layout_mode = 2 theme = ExtResource("2_wqb8e") -theme_override_font_sizes/font_size = 14 text = "Skip Dialogues" [node name="God Mode" type="CheckBox" parent="HBoxContainer"] layout_mode = 2 theme = ExtResource("2_wqb8e") -theme_override_font_sizes/font_size = 14 text = "God Mode " @@ -57,7 +55,6 @@ size_flags_vertical = 3 [node name="BackButton" type="Button" parent="ScrollContainer/Level Select"] layout_mode = 2 theme = ExtResource("2_wqb8e") -theme_override_font_sizes/font_size = 10 text = "Back" icon = ExtResource("5_1xl3a") diff --git a/Scenes/MainMenu.tscn b/Scenes/MainMenu.tscn index f1d3224e..8d5333d3 100644 --- a/Scenes/MainMenu.tscn +++ b/Scenes/MainMenu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=21 format=3 uid="uid://5xajclchk3my"] +[gd_scene load_steps=20 format=3 uid="uid://5xajclchk3my"] [ext_resource type="Script" uid="uid://dql102fvubniv" path="res://Scripts/MainMenu.cs" id="1_702nk"] [ext_resource type="PackedScene" uid="uid://c84shrj84g4t2" path="res://Scenes/HUD/MusicRoom.tscn" id="2_if7li"] @@ -14,20 +14,16 @@ [ext_resource type="PackedScene" uid="uid://b3tyacxxw88lx" path="res://Scenes/Utils/StreamPlayerWithName.tscn" id="8_koqhg"] [ext_resource type="PackedScene" uid="uid://bmj8t4pou6608" path="res://Scenes/HUD/TitleCrystal.tscn" id="8_riqfo"] [ext_resource type="PackedScene" uid="uid://bemu3l6b1e84y" path="res://Scenes/HUD/debug_menu.tscn" id="9_nwlsr"] -[ext_resource type="Texture2D" uid="uid://p242xo3qxwve" path="res://Sprites/UI/Crystal3.png" id="9_riqfo"] [ext_resource type="Texture2D" uid="uid://cv1fmski5dvhk" path="res://Sprites/Briefing/Intro/robot pov/l1_robot pov1.png" id="12_7467j"] [ext_resource type="Resource" uid="uid://byo74ews118nl" path="res://Resources/Music/No_Reason.tres" id="13_fh7cp"] - -[sub_resource type="AtlasTexture" id="AtlasTexture_cy8ro"] -atlas = ExtResource("9_riqfo") -region = Rect2(96, 0, 32, 16) +[ext_resource type="FontFile" uid="uid://cyk27h5aox1n7" path="res://fonts/sector_034.ttf" id="14_yxkem"] [sub_resource type="Theme" id="Theme_c7h4d"] [sub_resource type="LabelSettings" id="LabelSettings_htmja"] line_spacing = 2.0 -font = ExtResource("3_bl0se") -font_size = 12 +font = ExtResource("14_yxkem") +font_size = 7 outline_size = 4 outline_color = Color(0, 0, 0, 1) @@ -61,11 +57,10 @@ texture = ExtResource("2_j4e6a") [node name="TitleCrystal" parent="." instance=ExtResource("8_riqfo")] offset_left = 160.36 -offset_top = 48.765 +offset_top = 44.855 offset_right = 192.36 -offset_bottom = 64.765 +offset_bottom = 60.855 rotation = 3.14159 -texture = SubResource("AtlasTexture_cy8ro") [node name="MarginContainer" type="MarginContainer" parent="."] anchors_preset = 15 @@ -136,7 +131,7 @@ layout_mode = 2 size_flags_horizontal = 3 theme_override_constants/separation = -9 -[node name="Label" type="Label" parent="MarginContainer/GridContainer/Title/VBoxContainer"] +[node name="Title" type="Label" parent="MarginContainer/GridContainer/Title/VBoxContainer"] layout_mode = 2 theme = SubResource("Theme_c7h4d") theme_override_fonts/font = ExtResource("3_bl0se") @@ -145,7 +140,7 @@ text = "CIRNO" label_settings = ExtResource("7_loo7a") horizontal_alignment = 1 -[node name="Label2" type="Label" parent="MarginContainer/GridContainer/Title/VBoxContainer"] +[node name="SubTitle" type="Label" parent="MarginContainer/GridContainer/Title/VBoxContainer"] layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 0 diff --git a/project.godot b/project.godot index 74b99970..0c4c2539 100644 --- a/project.godot +++ b/project.godot @@ -108,7 +108,7 @@ window/size/viewport_width=320 window/size/viewport_height=160 window/size/window_width_override=1920 window/size/window_height_override=1080 -window/stretch/mode="canvas_items" +window/stretch/mode="viewport" window/stretch/scale_mode="integer" [dotnet]